cc/output/gl_renderer.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: cc/output/gl_renderer.cc

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

Patch Set: Minor cleanup 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

Index: cc/output/gl_renderer.cc

diff --git a/cc/output/gl_renderer.cc b/cc/output/gl_renderer.cc

index c9b6c582cc0f9a938e3bbb5f3d7c9b2cc57c1dfd..63d8ea8e8faa55ca969debfbd0276dad50ee60de 100644

--- a/cc/output/gl_renderer.cc

+++ b/cc/output/gl_renderer.cc

@@ -1705,7 +1705,7 @@ void GLRenderer::DrawPictureQuad(const DrawingFrame* frame,

ResourceProvider::TextureUsageAny);

}

- SkDevice device(on_demand_tile_raster_bitmap_);

+ SkBitmapDevice device(on_demand_tile_raster_bitmap_);

SkCanvas canvas(&device);

quad->picture_pile->RasterToBitmap(&canvas, quad->content_rect,

@@ -3114,7 +3114,7 @@ void GLRenderer::ReinitializeGrCanvas() {

skia::RefPtr<GrSurface> surface(

skia::AdoptRef(gr_context_->wrapBackendRenderTarget(desc)));

- skia::RefPtr<SkDevice> device(

+ skia::RefPtr<SkBaseDevice> device(

skia::AdoptRef(SkGpuDevice::Create(surface.get())));

sk_canvas_ = skia::AdoptRef(new SkCanvas(device.get()));

}

« no previous file with comments | « cc/layers/picture_layer_impl_unittest.cc ('k') | cc/output/software_output_device.h » ('j') | cc/output/software_output_device.h » ('J')