cc/resources/pixel_buffer_raster_worker_pool.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/resources/pixel_buffer_raster_worker_pool.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/resources/pixel_buffer_raster_worker_pool.cc

diff --git a/cc/resources/pixel_buffer_raster_worker_pool.cc b/cc/resources/pixel_buffer_raster_worker_pool.cc

index b0e74c1eb2d2805c7534089489c0a5970e2e9fdd..5685b609a1920cbc3bcf4c5bb5486fea41a01539 100644

--- a/cc/resources/pixel_buffer_raster_worker_pool.cc

+++ b/cc/resources/pixel_buffer_raster_worker_pool.cc

@@ -9,7 +9,7 @@

#include "base/values.h"

#include "cc/debug/traced_value.h"

#include "cc/resources/resource.h"

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

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

#if defined(OS_ANDROID)

#include "base/android/sys_utils.h"

@@ -46,7 +46,7 @@ class PixelBufferWorkerPoolTaskImpl : public internal::WorkerPoolTask {

task_->resource()->size().width(),

task_->resource()->size().height());

bitmap.setPixels(buffer_);

- SkDevice device(bitmap);

+ SkBitmapDevice device(bitmap);

needs_upload_ = task_->RunOnWorkerThread(&device, thread_index);

}

virtual void CompleteOnOriginThread() OVERRIDE {

« cc/output/software_output_device.h ('K') | « cc/resources/image_raster_worker_pool.cc ('k') | cc/resources/raster_worker_pool.h » ('j') | cc/resources/raster_worker_pool.h » ('J')