diff options
| author | joth@chromium.org <joth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-12 06:02:00 +0000 |
|---|---|---|
| committer | joth@chromium.org <joth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-12 06:02:00 +0000 |
| commit | 45a2adac0540de76f2b16bbe6f2408f943a54366 (patch) | |
| tree | 15876f0c3181e055ac30e359ee38de71f27c7ada /android_webview | |
| parent | 3985bc158abafb260f387f3d6add0d4477bd6137 (diff) | |
| download | chromium_src-45a2adac0540de76f2b16bbe6f2408f943a54366.zip chromium_src-45a2adac0540de76f2b16bbe6f2408f943a54366.tar.gz chromium_src-45a2adac0540de76f2b16bbe6f2408f943a54366.tar.bz2 | |
[Android WebView] Remove use of obsolete clip
Follow up to https://codereview.chromium.org/20234002/ - the old
representation is no longer set so remove use of it.
TBR=boliu@chromium.org
BUG=
Review URL: https://chromiumcodereview.appspot.com/22778004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@216949 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview')
| -rw-r--r-- | android_webview/browser/in_process_view_renderer.cc | 7 | ||||
| -rw-r--r-- | android_webview/public/browser/draw_sw.h | 2 |
2 files changed, 1 insertions, 8 deletions
diff --git a/android_webview/browser/in_process_view_renderer.cc b/android_webview/browser/in_process_view_renderer.cc index bca50c0..39614d3 100644 --- a/android_webview/browser/in_process_view_renderer.cc +++ b/android_webview/browser/in_process_view_renderer.cc @@ -497,12 +497,7 @@ bool InProcessViewRenderer::RenderViaAuxilaryBitmapIfNeeded( SkCanvas canvas(&device); canvas.setMatrix(matrix); - if (pixels->clip_region) { - SkRegion clip_region; - size_t bytes_read = clip_region.readFromMemory(pixels->clip_region); - DCHECK_EQ(pixels->clip_region_size, bytes_read); - canvas.setClipRegion(clip_region); - } else if (pixels->clip_rect_count) { + if (pixels->clip_rect_count) { SkRegion clip; for (int i = 0; i < pixels->clip_rect_count; ++i) { clip.op(SkIRect::MakeXYWH(pixels->clip_rects[i + 0], diff --git a/android_webview/public/browser/draw_sw.h b/android_webview/public/browser/draw_sw.h index 632b970..463f59c 100644 --- a/android_webview/public/browser/draw_sw.h +++ b/android_webview/public/browser/draw_sw.h @@ -35,8 +35,6 @@ struct AwPixelInfo { float matrix[9]; // The matrix currently in effect on the canvas. int clip_rect_count; // Number of rects in |clip_rects|. int* clip_rects; // Clip area: 4 ints per rect in {x,y,w,h} format. - void* clip_region; // TODO(joth): remove clip_region and clip_region_size. - size_t clip_region_size; // NOTE: If you add more members, bump kAwPixelInfoVersion. }; |