summaryrefslogtreecommitdiff
path: root/core/fxge/skia/fx_skia_device.h
diff options
context:
space:
mode:
authordsinclair <dsinclair@chromium.org>2016-11-15 07:44:27 -0800
committerCommit bot <commit-bot@chromium.org>2016-11-15 07:44:27 -0800
commitf16f6b8b52277348f5d571b7641bb0bbd5239589 (patch)
treeb321dc4ed2a4d032d36a8b5f532a904c77021817 /core/fxge/skia/fx_skia_device.h
parent5d223298b26c9b2b6284cba9a51521d3873b6e58 (diff)
downloadpdfium-f16f6b8b52277348f5d571b7641bb0bbd5239589.tar.xz
Revert of Create a subset of skia support for paths only (patchset #10 id:180001 of https://codereview.chromium.org/2491693002/ )
Reason for revert: Breaking the chrome roll. https://build.chromium.org/p/tryserver.chromium.mac/builders/mac_chromium_compile_dbg_ng/builds/306015/steps/generate_build_files%20%28with%20patch%29/logs/stdio Original issue's description: > Create a subset of skia support for paths only > > This is a continuation of https://codereview.chromium.org/2346483006/ > > This removes the need for agg, without providing > full Skia support. > > It doesn't work yet, but it does compile and run > for simple PDFs. > > R=dsinclair@google.com > > Committed: https://pdfium.googlesource.com/pdfium/+/5d223298b26c9b2b6284cba9a51521d3873b6e58 TBR=dsinclair@google.com,caryclark@google.com # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true Review-Url: https://codereview.chromium.org/2503883003
Diffstat (limited to 'core/fxge/skia/fx_skia_device.h')
-rw-r--r--core/fxge/skia/fx_skia_device.h17
1 files changed, 1 insertions, 16 deletions
diff --git a/core/fxge/skia/fx_skia_device.h b/core/fxge/skia/fx_skia_device.h
index ca5707c41a..199e76689a 100644
--- a/core/fxge/skia/fx_skia_device.h
+++ b/core/fxge/skia/fx_skia_device.h
@@ -5,7 +5,7 @@
#ifndef CORE_FXGE_SKIA_FX_SKIA_DEVICE_H_
#define CORE_FXGE_SKIA_FX_SKIA_DEVICE_H_
-#if defined _SKIA_SUPPORT_ || defined _SKIA_SUPPORT_PATHS_
+#if defined(_SKIA_SUPPORT_)
#include "core/fxge/cfx_pathdata.h"
#include "core/fxge/ifx_renderdevicedriver.h"
@@ -25,10 +25,8 @@ class CFX_SkiaDeviceDriver : public IFX_RenderDeviceDriver {
bool bRgbByteOrder,
CFX_DIBitmap* pOriDevice,
bool bGroupKnockout);
-#ifdef _SKIA_SUPPORT_
explicit CFX_SkiaDeviceDriver(SkPictureRecorder* recorder);
CFX_SkiaDeviceDriver(int size_x, int size_y);
-#endif
~CFX_SkiaDeviceDriver() override;
/** Options */
@@ -86,17 +84,12 @@ class CFX_SkiaDeviceDriver : public IFX_RenderDeviceDriver {
int dest_left,
int dest_top,
int blend_type) override;
-#ifdef _SKIA_SUPPORT_
bool SetBitsWithMask(const CFX_DIBSource* pBitmap,
const CFX_DIBSource* pMask,
int dest_left,
int dest_top,
int bitmap_alpha,
int blend_type) override;
-#else
- void SetClipMask(const FX_RECT& clipBox, const SkPath& skClipPath);
-#endif
-
bool StretchDIBits(const CFX_DIBSource* pBitmap,
uint32_t color,
int dest_left,
@@ -132,13 +125,11 @@ class CFX_SkiaDeviceDriver : public IFX_RenderDeviceDriver {
FX_FLOAT font_size,
uint32_t color) override;
-#ifdef _SKIA_SUPPORT_
bool DrawShading(const CPDF_ShadingPattern* pPattern,
const CFX_Matrix* pMatrix,
const FX_RECT& clip_rect,
int alpha,
bool bAlphaMode) override;
-#endif
virtual uint8_t* GetBuffer() const;
@@ -161,12 +152,6 @@ class CFX_SkiaDeviceDriver : public IFX_RenderDeviceDriver {
SkCanvas* m_pCanvas;
SkPictureRecorder* const m_pRecorder;
std::unique_ptr<SkiaState> m_pCache;
-#ifndef _SKIA_SUPPORT_
- std::unique_ptr<CFX_ClipRgn> m_pClipRgn;
- std::vector<std::unique_ptr<CFX_ClipRgn>> m_StateStack;
- int m_FillFlags;
- bool m_bRgbByteOrder;
-#endif
bool m_bGroupKnockout;
};
#endif // defined(_SKIA_SUPPORT_)