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

Unified Diff: Source/core/rendering/RenderFullScreen.cpp

Issue 899163003: Move rendering/RenderObject to layout/LayoutObject. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: 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/rendering/RenderFullScreen.h ('k') | Source/core/rendering/RenderGeometryMap.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/RenderFullScreen.cpp
diff --git a/Source/core/rendering/RenderFullScreen.cpp b/Source/core/rendering/RenderFullScreen.cpp
index 5d7082481ebb80caaf09c1164b4e71c228054c6e..36894b135ade455659c5bcdab69fe0474de42f5e 100644
--- a/Source/core/rendering/RenderFullScreen.cpp
+++ b/Source/core/rendering/RenderFullScreen.cpp
@@ -45,7 +45,7 @@ public:
setDocumentForAnonymous(&owner->document());
}
private:
- virtual bool isOfType(RenderObjectType type) const override { return type == RenderObjectRenderFullScreenPlaceholder || RenderBlockFlow::isOfType(type); }
+ virtual bool isOfType(LayoutObjectType type) const override { return type == LayoutObjectRenderFullScreenPlaceholder || RenderBlockFlow::isOfType(type); }
virtual void willBeDestroyed() override;
RenderFullScreen* m_owner;
};
@@ -79,7 +79,7 @@ void RenderFullScreen::willBeDestroyed()
ASSERT(!m_placeholder);
}
- // RenderObjects are unretained, so notify the document (which holds a pointer to a RenderFullScreen)
+ // LayoutObjects are unretained, so notify the document (which holds a pointer to a RenderFullScreen)
// if its RenderFullScreen is destroyed.
Fullscreen& fullscreen = Fullscreen::from(document());
if (fullscreen.fullScreenRenderer() == this)
@@ -120,7 +120,7 @@ void RenderFullScreen::updateStyle()
setStyle(fullscreenStyle);
}
-RenderObject* RenderFullScreen::wrapRenderer(RenderObject* object, RenderObject* parent, Document* document)
+LayoutObject* RenderFullScreen::wrapRenderer(LayoutObject* object, LayoutObject* parent, Document* document)
{
// FIXME: We should not modify the structure of the render tree during
// layout. crbug.com/370459
@@ -135,7 +135,7 @@ RenderObject* RenderFullScreen::wrapRenderer(RenderObject* object, RenderObject*
if (object) {
// |object->parent()| can be null if the object is not yet attached
// to |parent|.
- if (RenderObject* parent = object->parent()) {
+ if (LayoutObject* parent = object->parent()) {
RenderBlock* containingBlock = object->containingBlock();
ASSERT(containingBlock);
// Since we are moving the |object| to a new parent |fullscreenRenderer|,
@@ -167,7 +167,7 @@ void RenderFullScreen::unwrapRenderer()
DeprecatedDisableModifyRenderTreeStructureAsserts disabler;
if (parent()) {
- for (RenderObject* child = firstChild(); child; child = firstChild()) {
+ for (LayoutObject* child = firstChild(); child; child = firstChild()) {
// We have to clear the override size, because as a flexbox, we
// may have set one on the child, and we don't want to leave that
// lying around on the child.
« no previous file with comments | « Source/core/rendering/RenderFullScreen.h ('k') | Source/core/rendering/RenderGeometryMap.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698