third_party/WebKit/Source/platform/graphics/DeferredImageDecoder.cpp - Issue 2547053003: s/ passed(...) / WTF::passed(...) / to avoid future ambiguity w/ base::Passed.

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

Issue 2547053003: s/ passed(...) / WTF::passed(...) / to avoid future ambiguity w/ base::Passed. (Closed)

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

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

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

index c706acb42f2e0d811cd82ed0d922aa0a343c0dd8..cc9d27d796482b121ec230af57446b5fc02b0575 100644

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

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

@@ -81,7 +81,7 @@ std::unique_ptr<DeferredImageDecoder> DeferredImageDecoder::create(

std::unique_ptr<DeferredImageDecoder> DeferredImageDecoder::createForTesting(

std::unique_ptr<ImageDecoder> actualDecoder) {

- return wrapUnique(new DeferredImageDecoder(std::move(actualDecoder)));

+ return WTF::wrapUnique(new DeferredImageDecoder(std::move(actualDecoder)));

}

DeferredImageDecoder::DeferredImageDecoder(

@@ -159,7 +159,7 @@ void DeferredImageDecoder::setDataInternal(PassRefPtr<SharedBuffer> passData,

if (m_frameGenerator) {

if (!m_rwBuffer)

- m_rwBuffer = wrapUnique(new SkRWBuffer(data->size()));

+ m_rwBuffer = WTF::wrapUnique(new SkRWBuffer(data->size()));

const char* segment = 0;

for (size_t length = data->getSomeData(segment, m_rwBuffer->size()); length;