content/renderer/gpu/compositor_software_output_device.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/renderer/gpu/compositor_software_output_device.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/renderer_host/render_widget_host_view_browsertest.cc ('k') | content/renderer/skia_benchmarking_extension.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/gpu/compositor_software_output_device.cc

diff --git a/content/renderer/gpu/compositor_software_output_device.cc b/content/renderer/gpu/compositor_software_output_device.cc

index 948e3e7359b8884799f2167f95861522f113d650..6132590ecee239a9399e337d7868c829a5738a7d 100644

--- a/content/renderer/gpu/compositor_software_output_device.cc

+++ b/content/renderer/gpu/compositor_software_output_device.cc

@@ -7,8 +7,8 @@

#include "base/logging.h"

#include "cc/output/software_frame_data.h"

#include "content/renderer/render_process.h"

+#include "third_party/skia/include/core/SkBitmapDevice.h"

#include "third_party/skia/include/core/SkCanvas.h"

-#include "third_party/skia/include/core/SkDevice.h"

#include "third_party/skia/include/core/SkPixelRef.h"

#include "third_party/skia/include/core/SkRegion.h"

#include "ui/gfx/skia_util.h"

@@ -147,7 +147,7 @@ SkCanvas* CompositorSoftwareOutputDevice::BeginPaint(gfx::Rect damage_rect) {

viewport_size_.width(),

viewport_size_.height());

bitmap_.setPixels(current->memory());

- device_ = skia::AdoptRef(new SkDevice(bitmap_));

+ device_ = skia::AdoptRef(new SkBitmapDevice(bitmap_));

canvas_ = skia::AdoptRef(new SkCanvas(device_.get()));

if (!previous) {