third_party/WebKit/Source/platform/graphics/RecordingImageBufferSurface.cpp - Issue 1823133002: Use sk_sp-based picture recording APIs in Blink

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/RecordingImageBufferSurface.cpp

Issue 1823133002: Use sk_sp-based picture recording APIs in Blink (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: review comments Created 4 years, 9 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 | « third_party/WebKit/Source/platform/graphics/PictureSnapshot.cpp ('k') | third_party/WebKit/Source/platform/graphics/paint/DisplayItemListTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 406f0cb2fb5533b4c7ba2ee522af0427c252457a..c3666f29afcd29d958a2758febfe78996539eefd 100644

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

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

@@ -87,8 +87,7 @@ void RecordingImageBufferSurface::fallBackToRasterCanvas(FallbackReason reason)

}

if (m_currentFrame) {

- RefPtr<SkPicture> currentPicture = adoptRef(m_currentFrame->endRecording());

- currentPicture->playback(m_fallbackSurface->canvas());

+ m_currentFrame->finishRecordingAsPicture()->playback(m_fallbackSurface->canvas());

m_currentFrame.clear();

}

@@ -229,7 +228,7 @@ void RecordingImageBufferSurface::willOverwriteCanvas()

m_previousFramePixelCount = 0;

if (m_didRecordDrawCommandsInCurrentFrame) {

// Discard previous draw commands

- adoptRef(m_currentFrame->endRecording());

+ m_currentFrame->finishRecordingAsPicture();

initializeCurrentFrame();

}

@@ -252,7 +251,7 @@ bool RecordingImageBufferSurface::finalizeFrameInternal(FallbackReason* fallback

if (!m_imageBuffer->isDirty()) {

if (!m_previousFrame) {

// Create an initial blank frame

- m_previousFrame = adoptRef(m_currentFrame->endRecording());

+ m_previousFrame = fromSkSp(m_currentFrame->finishRecordingAsPicture());

initializeCurrentFrame();

}

return m_currentFrame;

@@ -268,7 +267,7 @@ bool RecordingImageBufferSurface::finalizeFrameInternal(FallbackReason* fallback

return false;

}

- m_previousFrame = adoptRef(m_currentFrame->endRecording());

+ m_previousFrame = fromSkSp(m_currentFrame->finishRecordingAsPicture());

m_previousFrameHasExpensiveOp = m_currentFrameHasExpensiveOp;

m_previousFramePixelCount = m_currentFramePixelCount;

initializeCurrentFrame();