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

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

Issue 930183002: Move and rename RenderEmbeddedObject and RenderIFrame. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rename properly to LayoutIFrame in test expectations. Created 5 years, 10 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
« no previous file with comments | « Source/core/layout/LayoutPart.h ('k') | Source/core/layout/compositing/LayerCompositor.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/layout/compositing/CompositedLayerMapping.cpp
diff --git a/Source/core/layout/compositing/CompositedLayerMapping.cpp b/Source/core/layout/compositing/CompositedLayerMapping.cpp
index 4997f726877b03fe602dee446160af88d94d89e6..410240fa30e13f039a0ae66b4c2f259ff5b4814d 100644
--- a/Source/core/layout/compositing/CompositedLayerMapping.cpp
+++ b/Source/core/layout/compositing/CompositedLayerMapping.cpp
@@ -40,6 +40,7 @@
#include "core/inspector/InspectorNodeIds.h"
#include "core/layout/FilterEffectRenderer.h"
#include "core/layout/LayerStackingNodeIterator.h"
+#include "core/layout/LayoutEmbeddedObject.h"
#include "core/layout/LayoutImage.h"
#include "core/layout/LayoutPart.h"
#include "core/layout/LayoutVideo.h"
@@ -53,7 +54,6 @@
#include "core/paint/ScrollableAreaPainter.h"
#include "core/paint/TransformRecorder.h"
#include "core/plugins/PluginView.h"
-#include "core/rendering/RenderEmbeddedObject.h"
#include "core/rendering/RenderView.h"
#include "platform/LengthFunctions.h"
#include "platform/RuntimeEnabledFeatures.h"
@@ -141,7 +141,7 @@ static WebLayer* platformLayerForPlugin(LayoutObject* renderer)
{
if (!renderer->isEmbeddedObject())
return 0;
- Widget* widget = toRenderEmbeddedObject(renderer)->widget();
+ Widget* widget = toLayoutEmbeddedObject(renderer)->widget();
if (!widget || !widget->isPluginView())
return 0;
return toPluginView(widget)->platformLayer();
@@ -151,7 +151,7 @@ static WebLayer* platformLayerForPlugin(LayoutObject* renderer)
static inline bool isAcceleratedContents(LayoutObject* renderer)
{
return isAcceleratedCanvas(renderer)
- || (renderer->isEmbeddedObject() && toRenderEmbeddedObject(renderer)->requiresAcceleratedCompositing())
+ || (renderer->isEmbeddedObject() && toLayoutEmbeddedObject(renderer)->requiresAcceleratedCompositing())
|| renderer->isVideo();
}
@@ -1775,7 +1775,7 @@ bool CompositedLayerMapping::paintsChildren() const
static bool isCompositedPlugin(LayoutObject* renderer)
{
- return renderer->isEmbeddedObject() && toRenderEmbeddedObject(renderer)->requiresAcceleratedCompositing();
+ return renderer->isEmbeddedObject() && toLayoutEmbeddedObject(renderer)->requiresAcceleratedCompositing();
}
bool CompositedLayerMapping::hasVisibleNonCompositingDescendant(Layer* parent)
« no previous file with comments | « Source/core/layout/LayoutPart.h ('k') | Source/core/layout/compositing/LayerCompositor.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698