Move rendering/RenderBox to layout/LayoutBox.

Source/core/dom/Element.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Peter Kelly (pmk@post.com)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  *           (C) 2007 David Smith (catfish.man@gmail.com)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012, 2013 Apple Inc. All rights reserved.
  *           (C) 2007 Eric Seidel (eric@webkit.org)
  *
  * This library is free software; you can redistribute it and/or
@@ skipping 546 matching lines @@
     document().updateLayoutIgnorePendingStylesheets();
     if (LayoutObject* renderer = this->renderer())
         return renderer->offsetParent();
     return nullptr;
 }
 
 int Element::clientLeft()
 {
     document().updateLayoutIgnorePendingStylesheets();
 
-    if (RenderBox* renderer = renderBox())
+    if (LayoutBox* renderer = layoutBox())
         return adjustLayoutUnitForAbsoluteZoom(roundToInt(renderer->clientLeft()), *renderer);
     return 0;
 }
 
 int Element::clientTop()
 {
     document().updateLayoutIgnorePendingStylesheets();
 
-    if (RenderBox* renderer = renderBox())
+    if (LayoutBox* renderer = layoutBox())
         return adjustLayoutUnitForAbsoluteZoom(roundToInt(renderer->clientTop()), *renderer);
     return 0;
 }
 
 int Element::clientWidth()
 {
     document().updateLayoutIgnorePendingStylesheets();
 
     // When in strict mode, clientWidth for the document element should return the width of the containing frame.
     // When in quirks mode, clientWidth for the body element should return the width of the containing frame.
     bool inQuirksMode = document().inQuirksMode();
     if ((!inQuirksMode && document().documentElement() == this)
         || (inQuirksMode && isHTMLElement() && document().body() == this)) {
         if (FrameView* view = document().view()) {
             if (RenderView* renderView = document().renderView())
                 return adjustLayoutUnitForAbsoluteZoom(view->layoutSize().width(), *renderView);
         }
     }
 
-    if (RenderBox* renderer = renderBox())
+    if (LayoutBox* renderer = layoutBox())
         return adjustLayoutUnitForAbsoluteZoom(renderer->pixelSnappedClientWidth(), *renderer).round();
     return 0;
 }
 
 int Element::clientHeight()
 {
     document().updateLayoutIgnorePendingStylesheets();
 
     // When in strict mode, clientHeight for the document element should return the height of the containing frame.
     // When in quirks mode, clientHeight for the body element should return the height of the containing frame.
     bool inQuirksMode = document().inQuirksMode();
 
     if ((!inQuirksMode && document().documentElement() == this)
         || (inQuirksMode && isHTMLElement() && document().body() == this)) {
         if (FrameView* view = document().view()) {
             if (RenderView* renderView = document().renderView())
                 return adjustLayoutUnitForAbsoluteZoom(view->layoutSize().height(), *renderView);
         }
     }
 
-    if (RenderBox* renderer = renderBox())
+    if (LayoutBox* renderer = layoutBox())
         return adjustLayoutUnitForAbsoluteZoom(renderer->pixelSnappedClientHeight(), *renderer).round();
     return 0;
 }
 
 double Element::scrollLeft()
 {
     document().updateLayoutIgnorePendingStylesheets();
 
     if (document().documentElement() != this) {
-        if (RenderBox* rend = renderBox())
-            return adjustScrollForAbsoluteZoom(rend->scrollLeft(), *rend);
+        if (LayoutBox* box = layoutBox())
+            return adjustScrollForAbsoluteZoom(box->scrollLeft(), *box);
         return 0;
     }
 
     if (RuntimeEnabledFeatures::scrollTopLeftInteropEnabled()) {
         if (document().inQuirksMode())
             return 0;
 
         if (LocalDOMWindow* window = document().domWindow())
             return window->scrollX();
     }
 
     return 0;
 }
 
 double Element::scrollTop()
 {
     document().updateLayoutIgnorePendingStylesheets();
 
     if (document().documentElement() != this) {
-        if (RenderBox* rend = renderBox())
-            return adjustScrollForAbsoluteZoom(rend->scrollTop(), *rend);
+        if (LayoutBox* box = layoutBox())
+            return adjustScrollForAbsoluteZoom(box->scrollTop(), *box);
         return 0;
     }
 
     if (RuntimeEnabledFeatures::scrollTopLeftInteropEnabled()) {
         if (document().inQuirksMode())
             return 0;
 
         if (LocalDOMWindow* window = document().domWindow())
             return window->scrollY();
     }
 
     return 0;
 }
 
 void Element::setScrollLeft(double newLeft)
 {
     document().updateLayoutIgnorePendingStylesheets();
 
     if (std::isnan(newLeft))
         return;
 
     if (document().documentElement() != this) {
-        RenderBox* rend = renderBox();
-        if (rend)
-            rend->setScrollLeft(LayoutUnit::fromFloatRound(newLeft * rend->style()->effectiveZoom()));
+        LayoutBox* box = layoutBox();
+        if (box)
+            box->setScrollLeft(LayoutUnit::fromFloatRound(newLeft * box->style()->effectiveZoom()));
         return;
     }
 
     if (RuntimeEnabledFeatures::scrollTopLeftInteropEnabled()) {
         if (document().inQuirksMode())
             return;
 
         if (LocalDOMWindow* window = document().domWindow())
             window->scrollTo(newLeft, window->scrollY());
     }
 }
 
 void Element::setScrollTop(double newTop)
 {
     document().updateLayoutIgnorePendingStylesheets();
 
     if (std::isnan(newTop))
         return;
 
     if (document().documentElement() != this) {
-        RenderBox* rend = renderBox();
-        if (rend)
-            rend->setScrollTop(LayoutUnit::fromFloatRound(newTop * rend->style()->effectiveZoom()));
+        LayoutBox* box = layoutBox();
+        if (box)
+            box->setScrollTop(LayoutUnit::fromFloatRound(newTop * box->style()->effectiveZoom()));
         return;
     }
 
     if (RuntimeEnabledFeatures::scrollTopLeftInteropEnabled()) {
         if (document().inQuirksMode())
             return;
 
         if (LocalDOMWindow* window = document().domWindow())
             window->scrollTo(window->scrollX(), newTop);
     }
 }
 
 int Element::scrollWidth()
 {
     document().updateLayoutIgnorePendingStylesheets();
-    if (RenderBox* rend = renderBox())
-        return adjustLayoutUnitForAbsoluteZoom(rend->scrollWidth(), *rend).toDouble();
+    if (LayoutBox* box = layoutBox())
+        return adjustLayoutUnitForAbsoluteZoom(box->scrollWidth(), *box).toDouble();
     return 0;
 }
 
 int Element::scrollHeight()
 {
     document().updateLayoutIgnorePendingStylesheets();
-    if (RenderBox* rend = renderBox())
-        return adjustLayoutUnitForAbsoluteZoom(rend->scrollHeight(), *rend).toDouble();
+    if (LayoutBox* box = layoutBox())
+        return adjustLayoutUnitForAbsoluteZoom(box->scrollHeight(), *box).toDouble();
     return 0;
 }
 
 void Element::scrollBy(double x, double y)
 {
     ScrollToOptions scrollToOptions;
     scrollToOptions.setLeft(x);
     scrollToOptions.setTop(y);
     scrollBy(scrollToOptions);
 }
 
 void Element::scrollBy(const ScrollToOptions& scrollToOptions)
 {
     // FIXME: This should be removed once scroll updates are processed only after
     // the compositing update. See http://crbug.com/420741.
     document().updateLayoutIgnorePendingStylesheets();
 
     if (document().documentElement() != this) {
-        scrollRenderBoxBy(scrollToOptions);
+        scrollLayoutBoxBy(scrollToOptions);
         return;
     }
 
     if (RuntimeEnabledFeatures::scrollTopLeftInteropEnabled()) {
         if (document().inQuirksMode())
             return;
         scrollFrameBy(scrollToOptions);
     }
 }
 
 void Element::scrollTo(double x, double y)
 {
     ScrollToOptions scrollToOptions;
     scrollToOptions.setLeft(x);
     scrollToOptions.setTop(y);
     scrollTo(scrollToOptions);
 }
 
 void Element::scrollTo(const ScrollToOptions& scrollToOptions)
 {
     // FIXME: This should be removed once scroll updates are processed only after
     // the compositing update. See http://crbug.com/420741.
     document().updateLayoutIgnorePendingStylesheets();
 
     if (document().documentElement() != this) {
-        scrollRenderBoxTo(scrollToOptions);
+        scrollLayoutBoxTo(scrollToOptions);
         return;
     }
 
     if (RuntimeEnabledFeatures::scrollTopLeftInteropEnabled()) {
         if (document().inQuirksMode())
             return;
         scrollFrameTo(scrollToOptions);
     }
 }
 
-void Element::scrollRenderBoxBy(const ScrollToOptions& scrollToOptions)
+void Element::scrollLayoutBoxBy(const ScrollToOptions& scrollToOptions)
 {
     double left = scrollToOptions.hasLeft() ? scrollToOptions.left() : 0.0;
     double top = scrollToOptions.hasTop() ? scrollToOptions.top() : 0.0;
     if (std::isnan(left) || std::isnan(top))
         return;
 
     ScrollBehavior scrollBehavior = ScrollBehaviorAuto;
     ScrollableArea::scrollBehaviorFromString(scrollToOptions.behavior(), scrollBehavior);
-    RenderBox* rend = renderBox();
-    if (rend) {
-        double currentScaledLeft = rend->scrollLeft();
-        double currentScaledTop = rend->scrollTop();
-        double newScaledLeft = left * rend->style()->effectiveZoom() + currentScaledLeft;
-        double newScaledTop = top * rend->style()->effectiveZoom() + currentScaledTop;
-        rend->scrollToOffset(DoubleSize(newScaledLeft, newScaledTop), scrollBehavior);
+    LayoutBox* box = layoutBox();
+    if (box) {
+        double currentScaledLeft = box->scrollLeft();
+        double currentScaledTop = box->scrollTop();
+        double newScaledLeft = left * box->style()->effectiveZoom() + currentScaledLeft;
+        double newScaledTop = top * box->style()->effectiveZoom() + currentScaledTop;
+        box->scrollToOffset(DoubleSize(newScaledLeft, newScaledTop), scrollBehavior);
     }
 }
 
-void Element::scrollRenderBoxTo(const ScrollToOptions& scrollToOptions)
+void Element::scrollLayoutBoxTo(const ScrollToOptions& scrollToOptions)
 {
     if ((scrollToOptions.hasLeft() && std::isnan(scrollToOptions.left()))
         || (scrollToOptions.hasTop() && std::isnan(scrollToOptions.top())))
         return;
 
     ScrollBehavior scrollBehavior = ScrollBehaviorAuto;
     ScrollableArea::scrollBehaviorFromString(scrollToOptions.behavior(), scrollBehavior);
 
-    RenderBox* rend = renderBox();
-    if (rend) {
-        double scaledLeft = rend->scrollLeft();
-        double scaledTop = rend->scrollTop();
+    LayoutBox* box = layoutBox();
+    if (box) {
+        double scaledLeft = box->scrollLeft();
+        double scaledTop = box->scrollTop();
         if (scrollToOptions.hasLeft())
-            scaledLeft = scrollToOptions.left() * rend->style()->effectiveZoom();
+            scaledLeft = scrollToOptions.left() * box->style()->effectiveZoom();
         if (scrollToOptions.hasTop())
-            scaledTop = scrollToOptions.top() * rend->style()->effectiveZoom();
-        rend->scrollToOffset(DoubleSize(scaledLeft, scaledTop), scrollBehavior);
+            scaledTop = scrollToOptions.top() * box->style()->effectiveZoom();
+        box->scrollToOffset(DoubleSize(scaledLeft, scaledTop), scrollBehavior);
     }
 }
 
 void Element::scrollFrameBy(const ScrollToOptions& scrollToOptions)
 {
     double left = scrollToOptions.hasLeft() ? scrollToOptions.left() : 0.0;
     double top = scrollToOptions.hasTop() ? scrollToOptions.top() : 0.0;
     if (std::isnan(left) || std::isnan(top))
         return;
 
@@ skipping 2556 matching lines @@
 {
 #if ENABLE(OILPAN)
     if (hasRareData())
         visitor->trace(elementRareData());
     visitor->trace(m_elementData);
 #endif
     ContainerNode::trace(visitor);
 }
 
 } // namespace blink