| Index: printing/metafile_skia_wrapper.cc
|
| diff --git a/printing/metafile_skia_wrapper.cc b/printing/metafile_skia_wrapper.cc
|
| index cc7fa0880417fac2f3dfc066bfae97f04d72e272..d7222bef8793078c3d12e5dfa7d1f6508a7ed401 100644
|
| --- a/printing/metafile_skia_wrapper.cc
|
| +++ b/printing/metafile_skia_wrapper.cc
|
| @@ -2,8 +2,8 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "base/logging.h"
|
| #include "printing/metafile_skia_wrapper.h"
|
| +#include "skia/ext/platform_device.h"
|
| #include "third_party/skia/include/core/SkCanvas.h"
|
| #include "third_party/skia/include/core/SkDevice.h"
|
| #include "third_party/skia/include/core/SkMetaData.h"
|
| @@ -12,34 +12,25 @@ namespace printing {
|
|
|
| namespace {
|
|
|
| -const char* kDraftModeKey = "CrDraftMode";
|
| const char* kMetafileKey = "CrMetafile";
|
|
|
| -SkMetaData& getMetaData(SkCanvas* canvas) {
|
| - DCHECK(canvas != NULL);
|
| -
|
| - SkDevice* device = canvas->getDevice();
|
| - DCHECK(device != NULL);
|
| - return device->getMetaData();
|
| -}
|
| -
|
| } // namespace
|
|
|
| // static
|
| -void MetafileSkiaWrapper::SetMetafileOnCanvas(SkCanvas* canvas,
|
| +void MetafileSkiaWrapper::SetMetafileOnCanvas(const SkCanvas* canvas,
|
| Metafile* metafile) {
|
| MetafileSkiaWrapper* wrapper = NULL;
|
| if (metafile)
|
| wrapper = new MetafileSkiaWrapper(metafile);
|
|
|
| - SkMetaData& meta = getMetaData(canvas);
|
| + SkMetaData& meta = skia::getMetaData(canvas);
|
| meta.setRefCnt(kMetafileKey, wrapper);
|
| SkSafeUnref(wrapper);
|
| }
|
|
|
| // static
|
| -Metafile* MetafileSkiaWrapper::GetMetafileFromCanvas(SkCanvas* canvas) {
|
| - SkMetaData& meta = getMetaData(canvas);
|
| +Metafile* MetafileSkiaWrapper::GetMetafileFromCanvas(const SkCanvas* canvas) {
|
| + SkMetaData& meta = skia::getMetaData(canvas);
|
| SkRefCnt* value;
|
| if (!meta.findRefCnt(kMetafileKey, &value) || !value)
|
| return NULL;
|
| @@ -47,21 +38,6 @@ Metafile* MetafileSkiaWrapper::GetMetafileFromCanvas(SkCanvas* canvas) {
|
| return static_cast<MetafileSkiaWrapper*>(value)->metafile_;
|
| }
|
|
|
| -// static
|
| -void MetafileSkiaWrapper::SetDraftMode(SkCanvas* canvas, bool draft_mode) {
|
| - SkMetaData& meta = getMetaData(canvas);
|
| - meta.setBool(kDraftModeKey, draft_mode);
|
| -}
|
| -
|
| -// static
|
| -bool MetafileSkiaWrapper::GetDraftMode(SkCanvas* canvas) {
|
| - SkMetaData& meta = getMetaData(canvas);
|
| - bool draft_mode;
|
| - if (!meta.findBool(kDraftModeKey, &draft_mode))
|
| - draft_mode = false;
|
| - return draft_mode;
|
| -}
|
| -
|
| MetafileSkiaWrapper::MetafileSkiaWrapper(Metafile* metafile)
|
| : metafile_(metafile) {
|
| }
|
|
|