content/browser/android/in_process/synchronous_compositor_output_surface.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/android/in_process/synchronous_compositor_output_surface.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

Index: content/browser/android/in_process/synchronous_compositor_output_surface.cc

diff --git a/content/browser/android/in_process/synchronous_compositor_output_surface.cc b/content/browser/android/in_process/synchronous_compositor_output_surface.cc

index 1faed9e1e8100164e09de6d90d0938f36ec6c301..1919d73bf1918a3a52291e2ec322780526038c88 100644

--- a/content/browser/android/in_process/synchronous_compositor_output_surface.cc

+++ b/content/browser/android/in_process/synchronous_compositor_output_surface.cc

@@ -15,8 +15,8 @@

#include "content/browser/android/in_process/synchronous_compositor_impl.h"

#include "content/public/browser/browser_thread.h"

#include "gpu/command_buffer/client/gl_in_process_context.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 "ui/gfx/rect_conversions.h"

#include "ui/gfx/skia_util.h"

#include "ui/gfx/transform.h"

@@ -96,7 +96,7 @@ class SynchronousCompositorOutputSurface::SoftwareDevice

private:

SynchronousCompositorOutputSurface* surface_;

- SkDevice null_device_;

+ SkBitmapDevice null_device_;

SkCanvas null_canvas_;

DISALLOW_COPY_AND_ASSIGN(SoftwareDevice);

« no previous file with comments | « chrome/renderer/printing/print_web_view_helper_win.cc ('k') | content/browser/aura/software_output_device_win.cc » ('j') | no next file with comments »