third_party/WebKit/Source/platform/image-decoders/bmp/BMPImageDecoder.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/image-decoders/bmp/BMPImageDecoder.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/image-decoders/ImageDecoder.cpp ('k') | third_party/WebKit/Source/platform/image-decoders/gif/GIFImageDecoder.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/platform/image-decoders/bmp/BMPImageDecoder.cpp

diff --git a/third_party/WebKit/Source/platform/image-decoders/bmp/BMPImageDecoder.cpp b/third_party/WebKit/Source/platform/image-decoders/bmp/BMPImageDecoder.cpp

index 01815ab3e8f37bd59ba21217f2cc68abac9b35fa..87a8028172b3e2eb63a657e783f9881fdf96f406 100644

--- a/third_party/WebKit/Source/platform/image-decoders/bmp/BMPImageDecoder.cpp

+++ b/third_party/WebKit/Source/platform/image-decoders/bmp/BMPImageDecoder.cpp

@@ -54,7 +54,7 @@ void BMPImageDecoder::onSetData(SegmentReader* data)

bool BMPImageDecoder::setFailed()

{

- m_reader.clear();

+ m_reader.reset();

return ImageDecoder::setFailed();

}

@@ -70,7 +70,7 @@ void BMPImageDecoder::decode(bool onlySize)

// If we're done decoding the image, we don't need the BMPImageReader

// anymore. (If we failed, |m_reader| has already been cleared.)

else if (!m_frameBufferCache.isEmpty() && (m_frameBufferCache.first().getStatus() == ImageFrame::FrameComplete))

- m_reader.clear();

+ m_reader.reset();

}

bool BMPImageDecoder::decodeHelper(bool onlySize)