Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1024)

Unified Diff: third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.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
Index: third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.cpp
diff --git a/third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.cpp b/third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.cpp
index 7ea80ad0484aa98d78bfe695e090660ba34346fe..e9ed5ab552682b79ae4995856c696a8af07b6515 100644
--- a/third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.cpp
+++ b/third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.cpp
@@ -582,8 +582,8 @@ static void createContextProviderOnMainThread(
ContextProviderCreationInfo* creationInfo,
WaitableEvent* waitableEvent) {
ASSERT(isMainThread());
- creationInfo->createdContextProvider =
- wrapUnique(Platform::current()->createOffscreenGraphicsContext3DProvider(
+ creationInfo->createdContextProvider = WTF::wrapUnique(
+ Platform::current()->createOffscreenGraphicsContext3DProvider(
creationInfo->contextAttributes, creationInfo->url, 0,
creationInfo->glInfo));
waitableEvent->signal();
@@ -627,7 +627,7 @@ WebGLRenderingContextBase::createContextProviderInternal(
const auto& url = canvas ? canvas->document().topDocument().url()
: scriptState->getExecutionContext()->url();
if (isMainThread()) {
- contextProvider = wrapUnique(
+ contextProvider = WTF::wrapUnique(
Platform::current()->createOffscreenGraphicsContext3DProvider(
contextAttributes, url, 0, &glInfo));
} else {
@@ -754,7 +754,7 @@ PassRefPtr<Image> WebGLRenderingContextBase::getImage(
OpacityMode opacityMode =
creationAttributes().hasAlpha() ? NonOpaque : Opaque;
std::unique_ptr<AcceleratedImageBufferSurface> surface =
- makeUnique<AcceleratedImageBufferSurface>(size, opacityMode);
+ WTF::makeUnique<AcceleratedImageBufferSurface>(size, opacityMode);
if (!surface->isValid())
return nullptr;
std::unique_ptr<ImageBuffer> buffer = ImageBuffer::create(std::move(surface));
@@ -5152,7 +5152,7 @@ void WebGLRenderingContextBase::texImageHelperHTMLVideoElement(
// Try using an accelerated image buffer, this allows YUV conversion to be
// done on the GPU.
std::unique_ptr<ImageBufferSurface> surface =
- wrapUnique(new AcceleratedImageBufferSurface(
+ WTF::wrapUnique(new AcceleratedImageBufferSurface(
IntSize(video->videoWidth(), video->videoHeight())));
if (surface->isValid()) {
std::unique_ptr<ImageBuffer> imageBuffer(
@@ -7402,7 +7402,7 @@ void WebGLRenderingContextBase::maybeRestoreContext(TimerBase*) {
? canvas()->document().topDocument().url()
: getOffscreenCanvas()->getExecutionContext()->url();
if (isMainThread()) {
- contextProvider = wrapUnique(
+ contextProvider = WTF::wrapUnique(
Platform::current()->createOffscreenGraphicsContext3DProvider(
attributes, url, 0, &glInfo));
} else {

Powered by Google App Engine
This is Rietveld 408576698