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

Unified Diff: third_party/WebKit/Source/platform/graphics/Canvas2DLayerBridge.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/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 99c10e624e1c9ab499ccfcb1f60068fb29f6e3ca..023b5a5c6854d8f530e231b0d1413780ad31a1f8 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(
sk_sp<SkColorSpace> colorSpace,
SkColorType colorType)
: m_contextProvider(std::move(contextProvider)),
- m_logger(wrapUnique(new Logger)),
+ m_logger(WTF::wrapUnique(new Logger)),
m_weakPtrFactory(this),
m_imageBuffer(0),
m_msaaSampleCount(msaaSampleCount),
@@ -170,7 +170,7 @@ Canvas2DLayerBridge::~Canvas2DLayerBridge() {
void Canvas2DLayerBridge::startRecording() {
DCHECK(m_isDeferralEnabled);
- m_recorder = wrapUnique(new SkPictureRecorder);
+ m_recorder = WTF::wrapUnique(new SkPictureRecorder);
SkCanvas* canvas =
m_recorder->beginRecording(m_size.width(), m_size.height(), nullptr);
// Always save an initial frame, to support resetting the top level matrix
@@ -847,7 +847,7 @@ bool Canvas2DLayerBridge::restoreSurface() {
gpu::gles2::GLES2Interface* sharedGL = nullptr;
m_layer->clearTexture();
- m_contextProvider = wrapUnique(
+ m_contextProvider = WTF::wrapUnique(
Platform::current()->createSharedOffscreenGraphicsContext3DProvider());
if (m_contextProvider)
sharedGL = m_contextProvider->contextGL();

Powered by Google App Engine
This is Rietveld 408576698