diff options
| author | robertphillips@google.com <robertphillips@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-30 14:54:59 +0000 |
|---|---|---|
| committer | robertphillips@google.com <robertphillips@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-30 14:54:59 +0000 |
| commit | 1dfaafff161e63028306aeccd15bb95e64ab275e (patch) | |
| tree | 0c3445793646d9f21c14e761ee250e1cdd4500a5 /android_webview/browser/browser_view_renderer.cc | |
| parent | bc912d62c56a24662004cc46461d04609fd2c162 (diff) | |
| download | chromium_src-1dfaafff161e63028306aeccd15bb95e64ab275e.zip chromium_src-1dfaafff161e63028306aeccd15bb95e64ab275e.tar.gz chromium_src-1dfaafff161e63028306aeccd15bb95e64ab275e.tar.bz2 | |
Fixing Chromium Android build's reliance on old SkPicture recording API
Skia is moving to an API where SkPicture can no longer invoke beginRecording/endRecording on itself. This functionality is deferred to a separate SkPictureRecorder object to clarify when SkPictures are complete (and make them immutable). This CL updates webview to the new interface.
torne for OWNER review
fmalita for skia-side review
Review URL: https://codereview.chromium.org/251843005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@267210 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview/browser/browser_view_renderer.cc')
| -rw-r--r-- | android_webview/browser/browser_view_renderer.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/android_webview/browser/browser_view_renderer.cc b/android_webview/browser/browser_view_renderer.cc index 937ed13..9e9711d 100644 --- a/android_webview/browser/browser_view_renderer.cc +++ b/android_webview/browser/browser_view_renderer.cc @@ -17,6 +17,7 @@ #include "third_party/skia/include/core/SkBitmap.h" #include "third_party/skia/include/core/SkCanvas.h" #include "third_party/skia/include/core/SkPicture.h" +#include "third_party/skia/include/core/SkPictureRecorder.h" #include "ui/gfx/vector2d_conversions.h" using base::android::AttachCurrentThread; @@ -146,9 +147,8 @@ skia::RefPtr<SkPicture> BrowserViewRenderer::CapturePicture(int width, TRACE_EVENT0("android_webview", "BrowserViewRenderer::CapturePicture"); // Return empty Picture objects for empty SkPictures. - skia::RefPtr<SkPicture> picture = skia::AdoptRef(new SkPicture); if (width <= 0 || height <= 0) { - return picture; + return skia::AdoptRef(new SkPicture); } // Reset scroll back to the origin, will go back to the old @@ -156,11 +156,11 @@ skia::RefPtr<SkPicture> BrowserViewRenderer::CapturePicture(int width, AutoResetWithLock scroll_reset( &scroll_offset_dip_, gfx::Vector2dF(), scroll_offset_dip_lock_); - SkCanvas* rec_canvas = picture->beginRecording(width, height, 0); + SkPictureRecorder recorder; + SkCanvas* rec_canvas = recorder.beginRecording(width, height, NULL, 0); if (has_compositor_) CompositeSW(rec_canvas); - picture->endRecording(); - return picture; + return skia::AdoptRef(recorder.endRecording()); } void BrowserViewRenderer::EnableOnNewPicture(bool enabled) { |