third_party/WebKit/Source/platform/graphics/AcceleratedStaticBitmapImage.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/AcceleratedStaticBitmapImage.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/geometry/FloatPolygonTest.cpp ('k') | third_party/WebKit/Source/platform/graphics/BitmapImage.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 0b34859663144a5450d66ec483b86d6a726c227c..ea19b6614f563d0b09745ddfd1be2fd0af724a1c 100644

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

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

@@ -39,7 +39,7 @@ AcceleratedStaticBitmapImage::createFromWebGLContextImage(

AcceleratedStaticBitmapImage::AcceleratedStaticBitmapImage(

sk_sp<SkImage> image) {

- m_textureHolder = wrapUnique(new SkiaTextureHolder(std::move(image)));

+ m_textureHolder = WTF::wrapUnique(new SkiaTextureHolder(std::move(image)));

m_threadChecker.DetachFromThread();

}

@@ -49,7 +49,7 @@ AcceleratedStaticBitmapImage::AcceleratedStaticBitmapImage(

unsigned textureId,

WeakPtr<WebGraphicsContext3DProviderWrapper> contextProvider,

IntSize mailboxSize) {

- m_textureHolder = wrapUnique(new MailboxTextureHolder(

+ m_textureHolder = WTF::wrapUnique(new MailboxTextureHolder(

mailbox, syncToken, textureId, contextProvider, mailboxSize));

m_threadChecker.DetachFromThread();

}

@@ -132,7 +132,7 @@ void AcceleratedStaticBitmapImage::createImageFromMailboxIfNeeded() {

if (m_textureHolder->isSkiaTextureHolder())

return;

m_textureHolder =

- wrapUnique(new SkiaTextureHolder(std::move(m_textureHolder)));

+ WTF::wrapUnique(new SkiaTextureHolder(std::move(m_textureHolder)));

}

void AcceleratedStaticBitmapImage::ensureMailbox() {

@@ -140,7 +140,7 @@ void AcceleratedStaticBitmapImage::ensureMailbox() {

return;

m_textureHolder =

- wrapUnique(new MailboxTextureHolder(std::move(m_textureHolder)));

+ WTF::wrapUnique(new MailboxTextureHolder(std::move(m_textureHolder)));

}

void AcceleratedStaticBitmapImage::transfer() {