summaryrefslogtreecommitdiffstats
path: root/skia/ext
diff options
context:
space:
mode:
authorrobertphillips@google.com <robertphillips@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-24 01:02:25 +0000
committerrobertphillips@google.com <robertphillips@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-24 01:02:25 +0000
commitde14c2cabf18b1ffa957ef054f63b25a188cafb4 (patch)
tree474c793e445ef4206d40aa169b122090e44f2201 /skia/ext
parent40815c8f23b107d2033ab13c0f9fbe326efd6e20 (diff)
downloadchromium_src-de14c2cabf18b1ffa957ef054f63b25a188cafb4.zip
chromium_src-de14c2cabf18b1ffa957ef054f63b25a188cafb4.tar.gz
chromium_src-de14c2cabf18b1ffa957ef054f63b25a188cafb4.tar.bz2
Update Chromium to new Skia headers & beginRecording signature
As of Skia r14295 the SkPictureRecorder class resides in its own header (SkPictureRecorder.h) and beginRecording takes an additional (factory) parameter. Temporarily the new signature doesn't allow default parameters so as to avoid compiler confusion with the deprecated signature. The SkTileGridPicture has been replaced by the SkTileGridFactory which is now passed into beginRecording. Note: this cannot be landed until Skia r14295 is rolled into Chromium (presumably this morning). enne : cc fmalita: skia Review URL: https://codereview.chromium.org/246753009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@265803 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia/ext')
-rw-r--r--skia/ext/pixel_ref_utils_unittest.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/skia/ext/pixel_ref_utils_unittest.cc b/skia/ext/pixel_ref_utils_unittest.cc
index 8ff3272..ab8f7b0 100644
--- a/skia/ext/pixel_ref_utils_unittest.cc
+++ b/skia/ext/pixel_ref_utils_unittest.cc
@@ -11,6 +11,7 @@
#include "third_party/skia/include/core/SkBitmap.h"
#include "third_party/skia/include/core/SkCanvas.h"
#include "third_party/skia/include/core/SkFlattenableBuffers.h"
+#include "third_party/skia/include/core/SkPictureRecorder.h"
#include "third_party/skia/include/core/SkPixelRef.h"
#include "third_party/skia/include/core/SkPoint.h"
#include "third_party/skia/include/core/SkShader.h"
@@ -82,6 +83,7 @@ SkCanvas* StartRecording(SkPictureRecorder* recorder, gfx::Rect layer_rect) {
SkCanvas* canvas = recorder->beginRecording(
layer_rect.width(),
layer_rect.height(),
+ NULL,
SkPicture::kUsePathBoundsForClip_RecordingFlag);
canvas->save();