From 095d346ff71ebe0385dfe7fa77baad6a1ce91fcb Mon Sep 17 00:00:00 2001 From: weili Date: Tue, 21 Jun 2016 11:24:24 -0700 Subject: Move ifx_renderdevicedriver to a separate file to share Move ifx_renderdevicedriver class to its own file to share with multiple devices to reduce code duplication. Review-Url: https://codereview.chromium.org/2078783002 --- core/fxge/skia/fx_skia_device.cpp | 84 +-------------------------------------- core/fxge/skia/fx_skia_device.h | 4 +- 2 files changed, 4 insertions(+), 84 deletions(-) (limited to 'core/fxge/skia') diff --git a/core/fxge/skia/fx_skia_device.cpp b/core/fxge/skia/fx_skia_device.cpp index f253b06c6d..ad7bd2d291 100644 --- a/core/fxge/skia/fx_skia_device.cpp +++ b/core/fxge/skia/fx_skia_device.cpp @@ -620,7 +620,7 @@ FX_BOOL CFX_SkiaDeviceDriver::DrawDeviceText(int nChars, return TRUE; } -int CFX_SkiaDeviceDriver::GetDeviceCaps(int caps_id) { +int CFX_SkiaDeviceDriver::GetDeviceCaps(int caps_id) const { switch (caps_id) { case FXDC_DEVICE_CLASS: return FXDC_DISPLAY; @@ -1182,86 +1182,4 @@ void CFX_FxgeDevice::PreMultiply() { (static_cast(GetDeviceDriver()))->PreMultiply(); } -IFX_RenderDeviceDriver::~IFX_RenderDeviceDriver() {} - -CFX_Matrix IFX_RenderDeviceDriver::GetCTM() const { - return CFX_Matrix(); -} - -FX_BOOL IFX_RenderDeviceDriver::StartRendering() { - return TRUE; -} - -void IFX_RenderDeviceDriver::EndRendering() {} - -FX_BOOL IFX_RenderDeviceDriver::SetClip_PathStroke( - const CFX_PathData* pPathData, - const CFX_Matrix* pObject2Device, - const CFX_GraphStateData* pGraphState) { - return FALSE; -} - -FX_BOOL IFX_RenderDeviceDriver::SetPixel(int x, int y, uint32_t color) { - return FALSE; -} - -FX_BOOL IFX_RenderDeviceDriver::FillRectWithBlend(const FX_RECT* pRect, - uint32_t fill_color, - int blend_type) { - return FALSE; -} - -FX_BOOL IFX_RenderDeviceDriver::DrawCosmeticLine(FX_FLOAT x1, - FX_FLOAT y1, - FX_FLOAT x2, - FX_FLOAT y2, - uint32_t color, - int blend_type) { - return FALSE; -} - -FX_BOOL IFX_RenderDeviceDriver::GetDIBits(CFX_DIBitmap* pBitmap, - int left, - int top) { - return FALSE; -} -CFX_DIBitmap* IFX_RenderDeviceDriver::GetBackDrop() { - return nullptr; -} - -FX_BOOL IFX_RenderDeviceDriver::ContinueDIBits(void* handle, - IFX_Pause* pPause) { - return FALSE; -} - -void IFX_RenderDeviceDriver::CancelDIBits(void* handle) {} - -FX_BOOL IFX_RenderDeviceDriver::DrawDeviceText(int nChars, - const FXTEXT_CHARPOS* pCharPos, - CFX_Font* pFont, - CFX_FontCache* pCache, - const CFX_Matrix* pObject2Device, - FX_FLOAT font_size, - uint32_t color) { - return FALSE; -} - -void* IFX_RenderDeviceDriver::GetPlatformSurface() const { - return nullptr; -} - -int IFX_RenderDeviceDriver::GetDriverType() const { - return 0; -} - -void IFX_RenderDeviceDriver::ClearDriver() {} - -FX_BOOL IFX_RenderDeviceDriver::DrawShading(const CPDF_ShadingPattern* pPattern, - const CFX_Matrix* pMatrix, - const FX_RECT& clip_rect, - int alpha, - FX_BOOL bAlphaMode) { - return false; -} - #endif diff --git a/core/fxge/skia/fx_skia_device.h b/core/fxge/skia/fx_skia_device.h index 5ad66f79b3..4ea1ad1218 100644 --- a/core/fxge/skia/fx_skia_device.h +++ b/core/fxge/skia/fx_skia_device.h @@ -7,6 +7,8 @@ #if defined(_SKIA_SUPPORT_) +#include "core/fxge/include/ifx_renderdevicedriver.h" + class SkCanvas; class SkMatrix; class SkPaint; @@ -25,7 +27,7 @@ class CFX_SkiaDeviceDriver : public IFX_RenderDeviceDriver { ~CFX_SkiaDeviceDriver() override; /** Options */ - int GetDeviceCaps(int caps_id) override; + int GetDeviceCaps(int caps_id) const override; /** Save and restore all graphic states */ void SaveState() override; -- cgit v1.2.3