content/browser/aura/software_output_device_win.cc - Issue 22796028: Updating Chromium to Skia SkBaseDevice/SkBitmapDevice split

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/aura/software_output_device_win.cc

Issue 22796028: Updating Chromium to Skia SkBaseDevice/SkBitmapDevice split (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Added TODOs Created 7 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « content/browser/android/in_process/synchronous_compositor_output_surface.cc ('k') | content/browser/renderer_host/render_widget_host_view_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/aura/software_output_device_win.cc

diff --git a/content/browser/aura/software_output_device_win.cc b/content/browser/aura/software_output_device_win.cc

index 1a5af467b4e7cb200c1a8a5ac3a15ad28868d859..47eac503f114b2280a9e2449828ad666de04915d 100644

--- a/content/browser/aura/software_output_device_win.cc

+++ b/content/browser/aura/software_output_device_win.cc

@@ -85,7 +85,7 @@ void SoftwareOutputDeviceWin::EndPaint(cc::SoftwareFrameData* frame_data) {

RGB(0xFF, 0xFF, 0xFF), &blend, ULW_ALPHA);

skia::EndPlatformPaint(canvas);

} else {

- SkDevice* device = canvas->getDevice();

+ SkBaseDevice* device = canvas->getDevice();

const SkBitmap& bitmap = device->accessBitmap(false);

HDC hdc = ::GetDC(hwnd_);

gfx::StretchDIBits(hdc,

@@ -102,7 +102,7 @@ void SoftwareOutputDeviceWin::EndPaint(cc::SoftwareFrameData* frame_data) {

void SoftwareOutputDeviceWin::CopyToBitmap(

gfx::Rect rect, SkBitmap* output) {

DCHECK(contents_);

- SkDevice* device = contents_->sk_canvas()->getDevice();

+ SkBaseDevice* device = contents_->sk_canvas()->getDevice();

const SkBitmap& bitmap = device->accessBitmap(false);

bitmap.extractSubset(output, gfx::RectToSkIRect(rect));

}