Changeset 93071 in webkit

Timestamp:

Aug 15, 2011 4:51:21 PM (13 years ago)

Author:

eae@chromium.org

Message:

Switch Element/Node to to new layout types
​https://bugs.webkit.org/show_bug.cgi?id=66260

Reviewed by Eric Seidel.

Convert Element, Node, ElementRareData and ContainerNode to new layout
abstraction as a part of the ongoing conversion work.

No new tests, no new functionality.

• dom/ContainerNode.cpp:

(WebCore::ContainerNode::getLowerRightCorner):
(WebCore::ContainerNode::getRect):

• dom/ContainerNode.h:
• dom/Element.cpp:

(WebCore::Element::scrollIntoView):
(WebCore::Element::scrollIntoViewIfNeeded):
(WebCore::adjustForLocalZoom):
(WebCore::Element::boundsInWindowSpace):
(WebCore::Element::getClientRects):
(WebCore::Element::getBoundingClientRect):
(WebCore::Element::screenRect):
(WebCore::Element::minimumSizeForResizing):
(WebCore::Element::setMinimumSizeForResizing):

• dom/Element.h:
• dom/ElementRareData.h:
• dom/Node.cpp:

(WebCore::Node::getRect):
(WebCore::Node::renderRect):
(WebCore::Node::hasNonEmptyBoundingBox):

• dom/Node.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/ContainerNode.cpp (modified) (3 diffs)
• dom/ContainerNode.h (modified) (1 diff)
• dom/Element.cpp (modified) (11 diffs)
• dom/Element.h (modified) (3 diffs)
• dom/ElementRareData.h (modified) (1 diff)
• dom/Node.cpp (modified) (3 diffs)
• dom/Node.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-08-15  Emil A Eklund  <eae@chromium.org>
+
+        Switch Element/Node to to new layout types
+        https://bugs.webkit.org/show_bug.cgi?id=66260
+
+        Reviewed by Eric Seidel.
+
+        Convert Element, Node, ElementRareData and ContainerNode to new layout
+        abstraction as a part of the ongoing conversion work.
+
+        No new tests, no new functionality.
+
+        * dom/ContainerNode.cpp:
+        (WebCore::ContainerNode::getLowerRightCorner):
+        (WebCore::ContainerNode::getRect):
+        * dom/ContainerNode.h:
+        * dom/Element.cpp:
+        (WebCore::Element::scrollIntoView):
+        (WebCore::Element::scrollIntoViewIfNeeded):
+        (WebCore::adjustForLocalZoom):
+        (WebCore::Element::boundsInWindowSpace):
+        (WebCore::Element::getClientRects):
+        (WebCore::Element::getBoundingClientRect):
+        (WebCore::Element::screenRect):
+        (WebCore::Element::minimumSizeForResizing):
+        (WebCore::Element::setMinimumSizeForResizing):
+        * dom/Element.h:
+        * dom/ElementRareData.h:
+        * dom/Node.cpp:
+        (WebCore::Node::getRect):
+        (WebCore::Node::renderRect):
+        (WebCore::Node::hasNonEmptyBoundingBox):
+        * dom/Node.h:
+
 2011-08-15  Alexey Proskuryakov  <ap@apple.com>
 

trunk/Source/WebCore/dom/ContainerNode.cpp

@@ -948 +948 @@
             if (o->isText()) {
                 RenderText* text = toRenderText(o);
-                IntRect linesBox = text->linesBoundingBox();
+                LayoutRect linesBox = text->linesBoundingBox();
                 if (!linesBox.maxX() && !linesBox.maxY())
                     continue;
@@ -963 +963 @@
 }
 
-IntRect ContainerNode::getRect() const
+LayoutRect ContainerNode::getRect() const
 {
     FloatPoint  upperLeft, lowerRight;
@@ -978 +978 @@
     } 
 
-    return enclosingIntRect(FloatRect(upperLeft, lowerRight.expandedTo(upperLeft) - upperLeft));
+    return enclosingLayoutRect(FloatRect(upperLeft, lowerRight.expandedTo(upperLeft) - upperLeft));
 }
 

trunk/Source/WebCore/dom/ContainerNode.h

@@ -61 +61 @@
     virtual void detach();
     virtual void willRemove();
-    virtual IntRect getRect() const;
+    virtual LayoutRect getRect() const;
     virtual void setFocus(bool = true);
     virtual void setActive(bool active = true, bool pause = false);

trunk/Source/WebCore/dom/Element.cpp

@@ -282 +282 @@
         return;
 
-    IntRect bounds = getRect();    
+    LayoutRect bounds = getRect();
     // Align to the top / bottom and to the closest edge.
     if (alignToTop)
@@ -297 +297 @@
         return;
 
-    IntRect bounds = getRect();    
+    LayoutRect bounds = getRect();
     if (centerIfNeeded)
         renderer()->enclosingLayer()->scrollRectToVisible(bounds, ScrollAlignment::alignCenterIfNeeded, ScrollAlignment::alignCenterIfNeeded);
@@ -355 +355 @@
 }
 
-static int adjustForLocalZoom(int value, RenderObject* renderer)
+static LayoutUnit adjustForLocalZoom(LayoutUnit value, RenderObject* renderer)
 {
     float zoomFactor = localZoomForRenderer(renderer);
@@ -363 +363 @@
     if (zoomFactor > 1)
         value++;
-    return static_cast<int>(value / zoomFactor);
+    return static_cast<LayoutUnit>(value / zoomFactor);
 }
 
@@ -512 +512 @@
 }
 
-IntRect Element::boundsInWindowSpace()
+LayoutRect Element::boundsInWindowSpace()
 {
     document()->updateLayoutIgnorePendingStylesheets();
@@ -518 +518 @@
     FrameView* view = document()->view();
     if (!view)
-        return IntRect();
+        return LayoutRect();
 
     Vector<FloatQuad> quads;
@@ -537 +537 @@
 
     if (quads.isEmpty())
-        return IntRect();
-
-    IntRect result = quads[0].enclosingBoundingBox();
+        return LayoutRect();
+
+    LayoutRect result = quads[0].enclosingBoundingBox();
     for (size_t i = 1; i < quads.size(); ++i)
         result.unite(quads[i].enclosingBoundingBox());
@@ -568 +568 @@
 
     if (FrameView* view = document()->view()) {
-        IntRect visibleContentRect = view->visibleContentRect();
+        LayoutRect visibleContentRect = view->visibleContentRect();
         for (size_t i = 0; i < quads.size(); ++i) {
             quads[i].move(-visibleContentRect.x(), -visibleContentRect.y());
@@ -608 +608 @@
 
     if (FrameView* view = document()->view()) {
-        IntRect visibleContentRect = view->visibleContentRect();
+        LayoutRect visibleContentRect = view->visibleContentRect();
         result.move(-visibleContentRect.x(), -visibleContentRect.y());
     }
@@ -621 +621 @@
 }
     
-IntRect Element::screenRect() const
+LayoutRect Element::screenRect() const
 {
     if (!renderer())
-        return IntRect();
+        return LayoutRect();
     return renderer()->view()->frameView()->contentsToScreen(renderer()->absoluteBoundingBoxRect());
 }
@@ -1723 +1723 @@
 }
 
-IntSize Element::minimumSizeForResizing() const
+LayoutSize Element::minimumSizeForResizing() const
 {
     return hasRareData() ? rareData()->m_minimumSizeForResizing : defaultMinimumSizeForResizing();
 }
 
-void Element::setMinimumSizeForResizing(const IntSize& size)
+void Element::setMinimumSizeForResizing(const LayoutSize& size)
 {
     if (size == defaultMinimumSizeForResizing() && !hasRareData())

trunk/Source/WebCore/dom/Element.h

@@ -169 +169 @@
     virtual int scrollHeight();
 
-    IntRect boundsInWindowSpace();
+    LayoutRect boundsInWindowSpace();
 
     PassRefPtr<ClientRectList> getClientRects();
@@ -175 +175 @@
     
     // Returns the absolute bounding box translated into screen coordinates:
-    IntRect screenRect() const;
+    LayoutRect screenRect() const;
 
     void removeAttribute(const String& name, ExceptionCode&);
@@ -273 +273 @@
     void updateId(const AtomicString& oldId, const AtomicString& newId);
 
-    IntSize minimumSizeForResizing() const;
-    void setMinimumSizeForResizing(const IntSize&);
+    LayoutSize minimumSizeForResizing() const;
+    void setMinimumSizeForResizing(const LayoutSize&);
 
     // Use Document::registerForDocumentActivationCallbacks() to subscribe to these

trunk/Source/WebCore/dom/ElementRareData.h

@@ -43 +43 @@
     using NodeRareData::setNeedsFocusAppearanceUpdateSoonAfterAttach;
 
-    IntSize m_minimumSizeForResizing;
+    LayoutSize m_minimumSizeForResizing;
     RefPtr<RenderStyle> m_computedStyle;
     ShadowRoot* m_shadowRoot;

trunk/Source/WebCore/dom/Node.cpp

@@ -820 +820 @@
 }
 
-IntRect Node::getRect() const
+LayoutRect Node::getRect() const
 {
     if (renderer())
         return renderer()->absoluteBoundingBoxRect(true);
-    return IntRect();
-}
-    
-IntRect Node::renderRect(bool* isReplaced)
+    return LayoutRect();
+}
+    
+LayoutRect Node::renderRect(bool* isReplaced)
 {    
     RenderObject* hitRenderer = this->renderer();
@@ -839 +839 @@
         renderer = renderer->parent();
     }
-    return IntRect();    
+    return LayoutRect();    
 }
 
@@ -852 +852 @@
         return true;
 
-    Vector<IntRect> rects;
+    Vector<LayoutRect> rects;
     FloatPoint absPos = renderer()->localToAbsolute();
-    renderer()->absoluteRects(rects, flooredIntPoint(absPos));
+    renderer()->absoluteRects(rects, flooredLayoutPoint(absPos));
     size_t n = rects.size();
     for (size_t i = 0; i < n; ++i)

trunk/Source/WebCore/dom/Node.h

@@ -28 +28 @@
 #include "EventTarget.h"
 #include "KURLHash.h"
+#include "LayoutTypes.h"
 #include "RenderStyleConstants.h"
 #include "ScriptWrappable.h"
@@ -344 +345 @@
     bool rendererIsRichlyEditable() const { return rendererIsEditable(RichlyEditable); }
     virtual bool shouldUseInputMethod();
-    virtual IntRect getRect() const;
-    IntRect renderRect(bool* isReplaced);
+    virtual LayoutRect getRect() const;
+    LayoutRect renderRect(bool* isReplaced);
 
     // Returns true if the node has a non-empty bounding box in layout.