Index: Source/platform/graphics/Canvas2DLayerBridge.cpp |
diff --git a/Source/platform/graphics/Canvas2DLayerBridge.cpp b/Source/platform/graphics/Canvas2DLayerBridge.cpp |
index 034c6ceff7f4c4a62b46a84a7fc6cb5f55741076..f88c27805e4cc712875e7739b143abb1300888af 100644 |
--- a/Source/platform/graphics/Canvas2DLayerBridge.cpp |
+++ b/Source/platform/graphics/Canvas2DLayerBridge.cpp |
@@ -39,9 +39,6 @@ |
#include "public/platform/WebGraphicsContext3DProvider.h" |
#include "wtf/RefCountedLeakCounter.h" |
-using blink::WebExternalTextureLayer; |
-using blink::WebGraphicsContext3D; |
- |
namespace { |
enum { |
InvalidMailboxIndex = -1, |
@@ -64,7 +61,7 @@ static PassRefPtr<SkSurface> createSkSurface(GrContext* gr, const IntSize& size, |
PassRefPtr<Canvas2DLayerBridge> Canvas2DLayerBridge::create(const IntSize& size, OpacityMode opacityMode, int msaaSampleCount) |
{ |
TRACE_EVENT_INSTANT0("test_gpu", "Canvas2DLayerBridgeCreation"); |
- OwnPtr<blink::WebGraphicsContext3DProvider> contextProvider = adoptPtr(blink::Platform::current()->createSharedOffscreenGraphicsContext3DProvider()); |
+ OwnPtr<WebGraphicsContext3DProvider> contextProvider = adoptPtr(Platform::current()->createSharedOffscreenGraphicsContext3DProvider()); |
if (!contextProvider) |
return nullptr; |
RefPtr<SkSurface> surface(createSkSurface(contextProvider->grContext(), size, msaaSampleCount)); |
@@ -76,7 +73,7 @@ PassRefPtr<Canvas2DLayerBridge> Canvas2DLayerBridge::create(const IntSize& size, |
return layerBridge.release(); |
} |
-Canvas2DLayerBridge::Canvas2DLayerBridge(PassOwnPtr<blink::WebGraphicsContext3DProvider> contextProvider, PassOwnPtr<SkDeferredCanvas> canvas, PassRefPtr<SkSurface> surface, int msaaSampleCount, OpacityMode opacityMode) |
+Canvas2DLayerBridge::Canvas2DLayerBridge(PassOwnPtr<WebGraphicsContext3DProvider> contextProvider, PassOwnPtr<SkDeferredCanvas> canvas, PassRefPtr<SkSurface> surface, int msaaSampleCount, OpacityMode opacityMode) |
: m_canvas(canvas) |
, m_surface(surface) |
, m_contextProvider(contextProvider) |
@@ -100,7 +97,7 @@ Canvas2DLayerBridge::Canvas2DLayerBridge(PassOwnPtr<blink::WebGraphicsContext3DP |
ASSERT(m_contextProvider); |
// Used by browser tests to detect the use of a Canvas2DLayerBridge. |
TRACE_EVENT_INSTANT0("test_gpu", "Canvas2DLayerBridgeCreation"); |
- m_layer = adoptPtr(blink::Platform::current()->compositorSupport()->createExternalTextureLayer(this)); |
+ m_layer = adoptPtr(Platform::current()->compositorSupport()->createExternalTextureLayer(this)); |
m_layer->setOpaque(opacityMode == Opaque); |
m_layer->setBlendBackgroundColor(opacityMode != Opaque); |
GraphicsLayer::registerContentsLayer(m_layer->layer()); |
@@ -329,7 +326,7 @@ void Canvas2DLayerBridge::freeReleasedMailbox() |
Canvas2DLayerManager::get().layerTransientResourceAllocationChanged(this); |
} |
-blink::WebGraphicsContext3D* Canvas2DLayerBridge::context() |
+WebGraphicsContext3D* Canvas2DLayerBridge::context() |
{ |
// Check on m_layer is necessary because context() may be called during |
// the destruction of m_layer |
@@ -360,13 +357,13 @@ bool Canvas2DLayerBridge::restoreSurface() |
return false; |
ASSERT(m_layer && !m_isSurfaceValid); |
- blink::WebGraphicsContext3D* sharedContext = 0; |
+ WebGraphicsContext3D* sharedContext = 0; |
// We must clear the mailboxes before calling m_layer->clearTexture() to prevent |
// re-entry via mailboxReleased from operating on defunct GrContext objects. |
m_mailboxes.clear(); |
m_releasedMailboxInfoIndex = InvalidMailboxIndex; |
m_layer->clearTexture(); |
- m_contextProvider = adoptPtr(blink::Platform::current()->createSharedOffscreenGraphicsContext3DProvider()); |
+ m_contextProvider = adoptPtr(Platform::current()->createSharedOffscreenGraphicsContext3DProvider()); |
if (m_contextProvider) |
sharedContext = m_contextProvider->context3d(); |
@@ -384,7 +381,7 @@ bool Canvas2DLayerBridge::restoreSurface() |
return m_isSurfaceValid; |
} |
-bool Canvas2DLayerBridge::prepareMailbox(blink::WebExternalTextureMailbox* outMailbox, blink::WebExternalBitmap* bitmap) |
+bool Canvas2DLayerBridge::prepareMailbox(WebExternalTextureMailbox* outMailbox, WebExternalBitmap* bitmap) |
{ |
if (m_destructionInProgress) { |
// It can be hit in the following sequence. |
@@ -406,7 +403,7 @@ bool Canvas2DLayerBridge::prepareMailbox(blink::WebExternalTextureMailbox* outMa |
if (!checkSurfaceValid()) |
return false; |
- blink::WebGraphicsContext3D* webContext = context(); |
+ WebGraphicsContext3D* webContext = context(); |
// Release to skia textures that were previouosly released by the |
// compositor. We do this before acquiring the next snapshot in |
@@ -486,7 +483,7 @@ Canvas2DLayerBridge::MailboxInfo* Canvas2DLayerBridge::createMailboxInfo() { |
return mailboxInfo; |
} |
-void Canvas2DLayerBridge::mailboxReleased(const blink::WebExternalTextureMailbox& mailbox, bool lostResource) |
+void Canvas2DLayerBridge::mailboxReleased(const WebExternalTextureMailbox& mailbox, bool lostResource) |
{ |
freeReleasedMailbox(); // Never have more than one mailbox in the released state. |
bool contextLost = !m_isSurfaceValid || m_contextProvider->context3d()->isContextLost(); |
@@ -539,7 +536,7 @@ void Canvas2DLayerBridge::mailboxReleased(const blink::WebExternalTextureMailbox |
} |
} |
-blink::WebLayer* Canvas2DLayerBridge::layer() const |
+WebLayer* Canvas2DLayerBridge::layer() const |
{ |
ASSERT(!m_destructionInProgress); |
ASSERT(m_layer); |
@@ -576,4 +573,4 @@ Canvas2DLayerBridge::MailboxInfo::MailboxInfo(const MailboxInfo& other) { |
m_status = other.m_status; |
} |
-} |
+} // namespace blink |