Changeset 95573 in webkit

Timestamp:

Sep 20, 2011 3:23:41 PM (13 years ago)

Author:

hyatt@apple.com

Message:

​https://bugs.webkit.org/show_bug.cgi?id=68480

De-virtualize containingBlock() and make RenderView return 0 instead
of itself to make the construction of normal loops that terminate via
a null-check possible.

Fix the only two places in the tree that needed null checks.

Eliminating RenderTableCell::containingBlock() is fine since the base class
does the same thing anyway.

Reviewed by Simon Fraser.

• editing/VisiblePosition.cpp:

(WebCore::VisiblePosition::lineDirectionPointForBlockDirectionNavigation):

• rendering/RenderObject.cpp:

(WebCore::RenderObject::containingBlock):

• rendering/RenderObject.h:
• rendering/RenderTableCell.cpp:
• rendering/RenderTableCell.h:
• rendering/RenderTreeAsText.cpp:

(WebCore::RenderTreeAsText::writeRenderObject):

• rendering/RenderView.cpp:
• rendering/RenderView.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• editing/VisiblePosition.cpp (modified) (1 diff)
• rendering/RenderObject.cpp (modified) (1 diff)
• rendering/RenderObject.h (modified) (1 diff)
• rendering/RenderTableCell.cpp (modified) (1 diff)
• rendering/RenderTableCell.h (modified) (1 diff)
• rendering/RenderTreeAsText.cpp (modified) (1 diff)
• rendering/RenderView.cpp (modified) (1 diff)
• rendering/RenderView.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-09-20  David Hyatt  <hyatt@apple.com>
+
+        https://bugs.webkit.org/show_bug.cgi?id=68480
+        
+        De-virtualize containingBlock() and make RenderView return 0 instead
+        of itself to make the construction of normal loops that terminate via
+        a null-check possible.
+
+        Fix the only two places in the tree that needed null checks.
+
+        Eliminating RenderTableCell::containingBlock() is fine since the base class
+        does the same thing anyway.
+
+        Reviewed by Simon Fraser.
+
+        * editing/VisiblePosition.cpp:
+        (WebCore::VisiblePosition::lineDirectionPointForBlockDirectionNavigation):
+        * rendering/RenderObject.cpp:
+        (WebCore::RenderObject::containingBlock):
+        * rendering/RenderObject.h:
+        * rendering/RenderTableCell.cpp:
+        * rendering/RenderTableCell.h:
+        * rendering/RenderTreeAsText.cpp:
+        (WebCore::RenderTreeAsText::writeRenderObject):
+        * rendering/RenderView.cpp:
+        * rendering/RenderView.h:
+
 2011-09-20  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebCore/editing/VisiblePosition.cpp

@@ -608 +608 @@
     // relative to the text, not absolute 'up'.
     FloatPoint caretPoint = renderer->localToAbsolute(localRect.location());
-    return renderer->containingBlock()->isHorizontalWritingMode() ? caretPoint.x() : caretPoint.y();
+    RenderObject* containingBlock = renderer->containingBlock();
+    if (!containingBlock)
+        containingBlock = renderer; // Just use ourselves to determine the writing mode if we have no containing block.
+    return containingBlock->isHorizontalWritingMode() ? caretPoint.x() : caretPoint.y();
 }
 

trunk/Source/WebCore/rendering/RenderObject.cpp

@@ -637 +637 @@
 RenderBlock* RenderObject::containingBlock() const
 {
-    ASSERT(!isTableCell());
-    ASSERT(!isRenderView());
-
     RenderObject* o = parent();
     if (!isText() && m_style->position() == FixedPosition) {

trunk/Source/WebCore/rendering/RenderObject.h

@@ -601 +601 @@
 
     // returns the containing block level element for this element.
-    virtual RenderBlock* containingBlock() const;
+    RenderBlock* containingBlock() const;
 
     // Convert the given local point to absolute coordinates

trunk/Source/WebCore/rendering/RenderTableCell.cpp

@@ -320 +320 @@
 }
 
-RenderBlock* RenderTableCell::containingBlock() const
-{
-    if (parent() && section())
-        return table();
-    return 0;
-}
-
 // The following rules apply for resolving conflicts and figuring out which border
 // to use.

trunk/Source/WebCore/rendering/RenderTableCell.h

@@ -138 +138 @@
     virtual bool isTableCell() const { return true; }
 
-    virtual RenderBlock* containingBlock() const;
-
     virtual void willBeDestroyed();
 

trunk/Source/WebCore/rendering/RenderTreeAsText.cpp

@@ -247 +247 @@
     }
     
-    bool adjustForTableCells = o.containingBlock()->isTableCell();
+    RenderBlock* cb = o.containingBlock();
+    bool adjustForTableCells = cb ? cb->isTableCell() : false;
 
     IntRect r;

trunk/Source/WebCore/rendering/RenderView.cpp

@@ -266 +266 @@
 }
 
-RenderBlock* RenderView::containingBlock() const
-{
-    return const_cast<RenderView*>(this);
-}
-
 void RenderView::repaintViewRectangle(const IntRect& ur, bool immediate)
 {

trunk/Source/WebCore/rendering/RenderView.h

@@ -194 +194 @@
 private:
     bool shouldRepaint(const IntRect& r) const;
-    
-    virtual RenderBlock* containingBlock() const;
 
     // These functions may only be accessed by LayoutStateMaintainer.