third_party/WebKit/Source/platform/graphics/RecordingImageBufferSurfaceTest.cpp - Issue 2523673004: [NOT FOR COMMIT] Fully replace SkCanvas uses.

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: third_party/WebKit/Source/platform/graphics/RecordingImageBufferSurfaceTest.cpp

Issue 2523673004: [NOT FOR COMMIT] Fully replace SkCanvas uses.

Patch Set: Support Android build. Created 4 years 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 | « third_party/WebKit/Source/platform/graphics/RecordingImageBufferSurface.cpp ('k') | third_party/WebKit/Source/platform/graphics/ReplayingCanvas.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/platform/graphics/RecordingImageBufferSurfaceTest.cpp

diff --git a/third_party/WebKit/Source/platform/graphics/RecordingImageBufferSurfaceTest.cpp b/third_party/WebKit/Source/platform/graphics/RecordingImageBufferSurfaceTest.cpp

index f630f2d4b1ffdf2a08283741ffa569713610c331..92b475487ca6e0021354e875188b3cf739ac8a8c 100644

--- a/third_party/WebKit/Source/platform/graphics/RecordingImageBufferSurfaceTest.cpp

+++ b/third_party/WebKit/Source/platform/graphics/RecordingImageBufferSurfaceTest.cpp

@@ -16,7 +16,7 @@

#include "testing/gmock/include/gmock/gmock.h"

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

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

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

+#include "skia/ext/cdl_picture_recorder.h"

#include "wtf/PtrUtil.h"

#include "wtf/RefPtr.h"

#include <memory>

@@ -53,7 +53,7 @@ class FakeImageBufferClient : public ImageBufferClient,

m_imageBuffer->finalizeFrame(dirtyRect);

ASSERT_FALSE(m_isDirty);

}

- void restoreCanvasMatrixClipStack(SkCanvas*) const override {}

+ void restoreCanvasMatrixClipStack(CdlCanvas*) const override {}

void fakeDraw() {

if (m_isDirty)

@@ -115,7 +115,7 @@ class RecordingImageBufferSurfaceTest : public Test {

public:

void testEmptyPicture() {

m_testSurface->initializeCurrentFrame();

- sk_sp<SkPicture> picture = m_testSurface->getPicture();

+ sk_sp<CdlPicture> picture = m_testSurface->getPicture();

EXPECT_TRUE((bool)picture.get());

EXPECT_EQ(1, m_fakeImageBufferClient->frameCount());

expectDisplayListEnabled(true);

@@ -202,7 +202,7 @@ class RecordingImageBufferSurfaceTest : public Test {

void testClearRect() {

m_testSurface->initializeCurrentFrame();

m_testSurface->getPicture();

- SkPaint clearPaint;

+ CdlPaint clearPaint;

clearPaint.setBlendMode(SkBlendMode::kClear);

m_imageBuffer->canvas()->drawRect(

SkRect::MakeWH(m_testSurface->size().width(),