diff options
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | printing/native_metafile_skia_wrapper.cc | 16 | ||||
| -rw-r--r-- | skia/skia.gyp | 3 |
3 files changed, 12 insertions, 9 deletions
@@ -12,7 +12,7 @@ vars = { "libjingle_revision": "55", "libvpx_revision": "76510", "ffmpeg_revision": "79854", - "skia_revision": "1005", + "skia_revision": "1033", "v8_revision": "7427", } diff --git a/printing/native_metafile_skia_wrapper.cc b/printing/native_metafile_skia_wrapper.cc index af6f446..38de9df 100644 --- a/printing/native_metafile_skia_wrapper.cc +++ b/printing/native_metafile_skia_wrapper.cc @@ -6,7 +6,7 @@ #include "printing/native_metafile_skia_wrapper.h" #include "third_party/skia/include/core/SkCanvas.h" #include "third_party/skia/include/core/SkDevice.h" -#include "third_party/skia/include/core/SkRefDict.h" +#include "third_party/skia/include/core/SkMetaData.h" namespace printing { @@ -14,12 +14,12 @@ namespace { static const char* kNativeMetafileKey = "CrNativeMetafile"; -SkRefDict& getRefDict(SkCanvas* canvas) { +SkMetaData& getMetaData(SkCanvas* canvas) { DCHECK(canvas != NULL); SkDevice* device = canvas->getDevice(); DCHECK(device != NULL); - return device->getRefDict(); + return device->getMetaData(); } } // namespace @@ -32,17 +32,17 @@ void NativeMetafileSkiaWrapper::SetMetafileOnCanvas(SkCanvas* canvas, if (metafile) wrapper = new NativeMetafileSkiaWrapper(metafile); - SkRefDict& dict = getRefDict(canvas); - dict.set(kNativeMetafileKey, wrapper); + SkMetaData& meta = getMetaData(canvas); + meta.setRefCnt(kNativeMetafileKey, wrapper); SkSafeUnref(wrapper); } // static NativeMetafile* NativeMetafileSkiaWrapper::GetMetafileFromCanvas( SkCanvas* canvas) { - SkRefDict& dict = getRefDict(canvas); - SkRefCnt* value = dict.find(kNativeMetafileKey); - if (!value) + SkMetaData& meta = getMetaData(canvas); + SkRefCnt* value; + if (!meta.findRefCnt(kNativeMetafileKey, &value) || !value) return NULL; return static_cast<NativeMetafileSkiaWrapper*>(value)->metafile_; diff --git a/skia/skia.gyp b/skia/skia.gyp index 55c9500..a505858 100644 --- a/skia/skia.gyp +++ b/skia/skia.gyp @@ -35,7 +35,9 @@ '../third_party/skia/gpu/src/GrMemory.cpp', '../third_party/skia/gpu/src/GrPath.cpp', '../third_party/skia/gpu/src/GrPathRenderer.cpp', + '../third_party/skia/gpu/src/GrPathUtils.cpp', '../third_party/skia/gpu/src/GrRectanizer_fifo.cpp', + '../third_party/skia/gpu/src/GrResource.cpp', '../third_party/skia/gpu/src/GrStencil.cpp', '../third_party/skia/gpu/src/GrTextureCache.cpp', '../third_party/skia/gpu/src/GrTextContext.cpp', @@ -337,6 +339,7 @@ '../third_party/skia/src/core/SkMaskFilter.cpp', '../third_party/skia/src/core/SkMath.cpp', '../third_party/skia/src/core/SkMatrix.cpp', + '../third_party/skia/src/core/SkMetaData.cpp', '../third_party/skia/src/core/SkPackBits.cpp', '../third_party/skia/src/core/SkPaint.cpp', '../third_party/skia/src/core/SkPath.cpp', |