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

Unified Diff: Source/core/layout/Layer.h

Issue 926193003: Move rendering/RenderBox to layout/LayoutBox. (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/layout/HitTestResult.cpp ('k') | Source/core/layout/Layer.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/layout/Layer.h
diff --git a/Source/core/layout/Layer.h b/Source/core/layout/Layer.h
index 488aed00097b3b0dfb337ddedecc048e520219e9..c4d87d205c5fc07177d4624e2ed5e0ec3a7c797f 100644
--- a/Source/core/layout/Layer.h
+++ b/Source/core/layout/Layer.h
@@ -52,7 +52,7 @@
#include "core/layout/LayerScrollableArea.h"
#include "core/layout/LayerStackingNode.h"
#include "core/layout/LayerStackingNodeIterator.h"
-#include "core/rendering/RenderBox.h"
+#include "core/layout/LayoutBox.h"
#include "platform/graphics/CompositingReasons.h"
#include "public/platform/WebBlendMode.h"
#include "wtf/OwnPtr.h"
@@ -94,7 +94,7 @@ public:
String debugName() const;
LayoutBoxModelObject* renderer() const { return m_renderer; }
- RenderBox* renderBox() const { return m_renderer && m_renderer->isBox() ? toRenderBox(m_renderer) : 0; }
+ LayoutBox* layoutBox() const { return m_renderer && m_renderer->isBox() ? toLayoutBox(m_renderer) : 0; }
Layer* parent() const { return m_parent; }
Layer* previousSibling() const { return m_previous; }
Layer* nextSibling() const { return m_next; }
@@ -509,7 +509,7 @@ public:
ShouldRespectOverflowClip = RespectOverflowClip, const LayoutPoint* offsetFromRoot = 0,
const LayoutSize& subPixelAccumulation = LayoutSize(), const LayoutRect* layerBoundingBox = 0);
- LayoutPoint renderBoxLocation() const { return renderer()->isBox() ? toRenderBox(renderer())->location() : LayoutPoint(); }
+ LayoutPoint layoutBoxLocation() const { return renderer()->isBox() ? toLayoutBox(renderer())->location() : LayoutPoint(); }
enum TransparencyClipBoxBehavior {
PaintingTransparencyClipBox,
@@ -583,8 +583,8 @@ private:
void updateReflectionInfo(const LayoutStyle*);
// FIXME: We could lazily allocate our ScrollableArea based on style properties ('overflow', ...)
- // but for now, we are always allocating it for RenderBox as it's safer.
- bool requiresScrollableArea() const { return renderBox(); }
+ // but for now, we are always allocating it for LayoutBox as it's safer.
+ bool requiresScrollableArea() const { return layoutBox(); }
void updateScrollableArea();
void dirtyAncestorChainVisibleDescendantStatus();
« no previous file with comments | « Source/core/layout/HitTestResult.cpp ('k') | Source/core/layout/Layer.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698