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

Unified Diff: Source/core/rendering/compositing/CompositedLayerMapping.cpp

Issue 463123003: Cleanup namespace usage in Source/core/rendering (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase Created 6 years, 4 months 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: Source/core/rendering/compositing/CompositedLayerMapping.cpp
diff --git a/Source/core/rendering/compositing/CompositedLayerMapping.cpp b/Source/core/rendering/compositing/CompositedLayerMapping.cpp
index 9e3335ed6deed3fccde6340ddb091513eddf8b8b..11b0a3edf8532a01940aff56c63065fa261f207e 100644
--- a/Source/core/rendering/compositing/CompositedLayerMapping.cpp
+++ b/Source/core/rendering/compositing/CompositedLayerMapping.cpp
@@ -129,7 +129,7 @@ static bool contentLayerSupportsDirectBackgroundComposition(const RenderObject*
return contentsRect(renderer).contains(backgroundRect(renderer));
}
-static blink::WebLayer* platformLayerForPlugin(RenderObject* renderer)
+static WebLayer* platformLayerForPlugin(RenderObject* renderer)
{
if (!renderer->isEmbeddedObject())
return 0;
@@ -460,10 +460,10 @@ bool CompositedLayerMapping::updateGraphicsLayerConfiguration()
if (isDirectlyCompositedImage())
updateImageContents();
- if (blink::WebLayer* layer = platformLayerForPlugin(renderer)) {
+ if (WebLayer* layer = platformLayerForPlugin(renderer)) {
m_graphicsLayer->setContentsToPlatformLayer(layer);
} else if (renderer->node() && renderer->node()->isFrameOwnerElement() && toHTMLFrameOwnerElement(renderer->node())->contentFrame()) {
- blink::WebLayer* layer = toHTMLFrameOwnerElement(renderer->node())->contentFrame()->remotePlatformLayer();
+ WebLayer* layer = toHTMLFrameOwnerElement(renderer->node())->contentFrame()->remotePlatformLayer();
if (layer)
m_graphicsLayer->setContentsToPlatformLayer(layer);
} else if (renderer->isVideo()) {
@@ -1104,7 +1104,7 @@ void CompositedLayerMapping::updateDrawsContent()
if (hasPaintedContent && isAcceleratedCanvas(renderer())) {
CanvasRenderingContext* context = toHTMLCanvasElement(renderer()->node())->renderingContext();
// Content layer may be null if context is lost.
- if (blink::WebLayer* contentLayer = context->platformLayer()) {
+ if (WebLayer* contentLayer = context->platformLayer()) {
Color bgColor(Color::transparent);
if (contentLayerSupportsDirectBackgroundComposition(renderer())) {
bgColor = rendererBackgroundColor();
@@ -1920,11 +1920,11 @@ bool CompositedLayerMapping::updateRequiresOwnBackingStoreForIntrinsicReasons()
return m_requiresOwnBackingStoreForIntrinsicReasons != previousRequiresOwnBackingStoreForIntrinsicReasons;
}
-void CompositedLayerMapping::setBlendMode(blink::WebBlendMode blendMode)
+void CompositedLayerMapping::setBlendMode(WebBlendMode blendMode)
{
if (m_ancestorClippingLayer) {
m_ancestorClippingLayer->setBlendMode(blendMode);
- m_graphicsLayer->setBlendMode(blink::WebBlendModeNormal);
+ m_graphicsLayer->setBlendMode(WebBlendModeNormal);
} else {
m_graphicsLayer->setBlendMode(blendMode);
}

Powered by Google App Engine
This is Rietveld 408576698