diff options
author | weili <weili@chromium.org> | 2016-06-20 11:41:56 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-06-20 11:41:56 -0700 |
commit | 4701fcddeddfef7bccbceaf0f439dee82c3639f0 (patch) | |
tree | cdad6c0635837c9ff4d4fcfa3ad192640d4dd9d2 /core/fxge/skia | |
parent | bff506d3b5e03891c137d9fe18f65cae112ebf2a (diff) | |
download | pdfium-4701fcddeddfef7bccbceaf0f439dee82c3639f0.tar.xz |
Fix clang_use_chrome_plugin for Mac and Skia builds
These changes are specific to Mac and Skia builds. They are
needed for these builds to compile with clang_use_chrome_plugin.
BUG=pdfium:469
Review-Url: https://codereview.chromium.org/2081523002
Diffstat (limited to 'core/fxge/skia')
-rw-r--r-- | core/fxge/skia/fx_skia_device.cpp | 21 | ||||
-rw-r--r-- | core/fxge/skia/fx_skia_device.h | 13 |
2 files changed, 26 insertions, 8 deletions
diff --git a/core/fxge/skia/fx_skia_device.cpp b/core/fxge/skia/fx_skia_device.cpp index c82b7f3091..f253b06c6d 100644 --- a/core/fxge/skia/fx_skia_device.cpp +++ b/core/fxge/skia/fx_skia_device.cpp @@ -759,6 +759,15 @@ FX_BOOL CFX_SkiaDeviceDriver::DrawPath( return TRUE; } +FX_BOOL CFX_SkiaDeviceDriver::DrawCosmeticLine(FX_FLOAT x1, + FX_FLOAT y1, + FX_FLOAT x2, + FX_FLOAT y2, + uint32_t color, + int blend_type) { + return FALSE; +} + FX_BOOL CFX_SkiaDeviceDriver::FillRectWithBlend(const FX_RECT* pRect, uint32_t fill_color, int blend_type) { @@ -907,6 +916,10 @@ FX_BOOL CFX_SkiaDeviceDriver::DrawShading(const CPDF_ShadingPattern* pPattern, return true; } +uint8_t* CFX_SkiaDeviceDriver::GetBuffer() const { + return m_pBitmap->GetBuffer(); +} + FX_BOOL CFX_SkiaDeviceDriver::GetClipBox(FX_RECT* pRect) { // TODO(caryclark) call m_canvas->getClipDeviceBounds() instead pRect->left = 0; @@ -953,6 +966,10 @@ FX_BOOL CFX_SkiaDeviceDriver::GetDIBits(CFX_DIBitmap* pBitmap, return bRet; } +CFX_DIBitmap* CFX_SkiaDeviceDriver::GetBackDrop() { + return m_pOriDevice; +} + FX_BOOL CFX_SkiaDeviceDriver::SetDIBits(const CFX_DIBSource* pBitmap, uint32_t argb, const FX_RECT* pSrcRect, @@ -1086,6 +1103,10 @@ FX_BOOL CFX_SkiaDeviceDriver::StartDIBits(const CFX_DIBSource* pSource, return TRUE; } +FX_BOOL CFX_SkiaDeviceDriver::ContinueDIBits(void* handle, IFX_Pause* pPause) { + return FALSE; +} + void CFX_SkiaDeviceDriver::PreMultiply() { void* buffer = m_pBitmap->GetBuffer(); if (!buffer) diff --git a/core/fxge/skia/fx_skia_device.h b/core/fxge/skia/fx_skia_device.h index 15f6306cb0..5ad66f79b3 100644 --- a/core/fxge/skia/fx_skia_device.h +++ b/core/fxge/skia/fx_skia_device.h @@ -64,16 +64,14 @@ class CFX_SkiaDeviceDriver : public IFX_RenderDeviceDriver { FX_FLOAT x2, FX_FLOAT y2, uint32_t color, - int blend_type) override { - return FALSE; - } + int blend_type) override; FX_BOOL GetClipBox(FX_RECT* pRect) override; /** Load device buffer into a DIB */ FX_BOOL GetDIBits(CFX_DIBitmap* pBitmap, int left, int top) override; - CFX_DIBitmap* GetBackDrop() override { return m_pOriDevice; } + CFX_DIBitmap* GetBackDrop() override; FX_BOOL SetDIBits(const CFX_DIBSource* pBitmap, uint32_t color, @@ -99,9 +97,7 @@ class CFX_SkiaDeviceDriver : public IFX_RenderDeviceDriver { void*& handle, int blend_type) override; - FX_BOOL ContinueDIBits(void* handle, IFX_Pause* pPause) override { - return FALSE; - } + FX_BOOL ContinueDIBits(void* handle, IFX_Pause* pPause) override; void CancelDIBits(void* handle) override {} @@ -119,7 +115,8 @@ class CFX_SkiaDeviceDriver : public IFX_RenderDeviceDriver { int alpha, FX_BOOL bAlphaMode) override; - virtual uint8_t* GetBuffer() const { return m_pBitmap->GetBuffer(); } + virtual uint8_t* GetBuffer() const; + void PaintStroke(SkPaint* spaint, const CFX_GraphStateData* pGraphState, const SkMatrix& matrix); |