content/browser/compositor/software_output_device_ozone_unittest.cc - Issue 1432443004: Remove SkDevice and SkBaseDevice outside skia/ext/

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/compositor/software_output_device_ozone_unittest.cc

Issue 1432443004: Remove SkDevice and SkBaseDevice outside skia/ext/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: pass SkPixmap by pointer to MakeBitmapOpaque Created 5 years, 1 month 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/compositor/software_output_device_ozone.cc ('k') | content/browser/compositor/software_output_device_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/compositor/software_output_device_ozone_unittest.cc

diff --git a/content/browser/compositor/software_output_device_ozone_unittest.cc b/content/browser/compositor/software_output_device_ozone_unittest.cc

index 569d33c1997f0941d1e610a940964cbe273d588b..030d2dee791158fd79141b6f3fb5489731fb07d7 100644

--- a/content/browser/compositor/software_output_device_ozone_unittest.cc

+++ b/content/browser/compositor/software_output_device_ozone_unittest.cc

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

#include "base/thread_task_runner_handle.h"

#include "content/browser/compositor/software_output_device_ozone.h"

#include "testing/gtest/include/gtest/gtest.h"

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

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

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

#include "ui/compositor/compositor.h"

#include "ui/compositor/test/context_factories_for_test.h"

#include "ui/gfx/geometry/size.h"

@@ -125,8 +124,8 @@ TEST_F(SoftwareOutputDeviceOzoneTest, CheckCorrectResizeBehavior) {

output_device_->Resize(size, 1.f);

SkCanvas* canvas = output_device_->BeginPaint(damage);

- gfx::Size canvas_size(canvas->getDeviceSize().width(),

- canvas->getDeviceSize().height());

+ gfx::Size canvas_size(canvas->getBaseLayerSize().width(),

+ canvas->getBaseLayerSize().height());

EXPECT_EQ(size.ToString(), canvas_size.ToString());

size.SetSize(1000, 500);

@@ -134,8 +133,8 @@ TEST_F(SoftwareOutputDeviceOzoneTest, CheckCorrectResizeBehavior) {

output_device_->Resize(size, 1.f);

canvas = output_device_->BeginPaint(damage);

- canvas_size.SetSize(canvas->getDeviceSize().width(),

- canvas->getDeviceSize().height());

+ canvas_size.SetSize(canvas->getBaseLayerSize().width(),

+ canvas->getBaseLayerSize().height());

EXPECT_EQ(size.ToString(), canvas_size.ToString());

}