third_party/WebKit/Source/platform/graphics/Canvas2DLayerBridge.cpp - Issue 2011783002: Rename OwnPtr::clear() to reset() in platform/.

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

Issue 2011783002: Rename OwnPtr::clear() to reset() in platform/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

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

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

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

index f566abe8b0933798527cd28942d434e003a68a5e..30d56946d68c3acfff79a7d54ab776f3f432700d 100644

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

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

@@ -130,7 +130,7 @@ Canvas2DLayerBridge::~Canvas2DLayerBridge()

clearCHROMIUMImageCache();

#endif // USE_IOSURFACE_FOR_2D_CANVAS

- m_layer.clear();

+ m_layer.reset();

ASSERT(m_mailboxes.size() == 0);

}

@@ -543,7 +543,7 @@ void Canvas2DLayerBridge::disableDeferral(DisableDeferralReason reason)

m_haveRecordedDrawCommands = false;

m_isDeferralEnabled = false;

- m_recorder.clear();

+ m_recorder.reset();

// install the current matrix/clip stack onto the immediate canvas

SkSurface* surface = getOrCreateSurface();

if (m_imageBuffer && surface)

@@ -565,7 +565,7 @@ void Canvas2DLayerBridge::beginDestruction()

if (isHibernating())

m_logger->reportHibernationEvent(HibernationEndedWithTeardown);

m_hibernationImage.clear();

- m_recorder.clear();

+ m_recorder.reset();

m_imageBuffer = nullptr;

m_destructionInProgress = true;

setIsHidden(true);