Changeset 89304 in webkit

Timestamp:

Jun 20, 2011 4:14:23 PM (13 years ago)

Author:

jchaffraix@webkit.org

Message:

2011-06-20 Julien Chaffraix <​jchaffraix@webkit.org>

Reviewed by Darin Adler.

Remove some unsafe static_cast in rendering/
​https://bugs.webkit.org/show_bug.cgi?id=63014

Mechanical refactoring, no test needed.

• rendering/InlineFlowBox.cpp: (WebCore::InlineFlowBox::placeBoxesInBlockDirection): (WebCore::InlineFlowBox::computeOverAnnotationAdjustment):
• rendering/InlineTextBox.cpp: (WebCore::InlineTextBox::getEmphasisMarkPosition):
• rendering/RenderBlockLineLayout.cpp: (WebCore::RenderBlock::LineBreaker::nextLineBreak):
• rendering/RenderLayer.cpp: (WebCore::RenderLayer::destroyScrollbar):
• rendering/RenderRuby.cpp: (WebCore::rubyBeforeBlock): (WebCore::rubyAfterBlock): (WebCore::lastRubyRun): (WebCore::findRubyRunParent):
• rendering/RenderRubyBase.cpp: (WebCore::RenderRubyBase::rubyRun):
• rendering/RenderRubyRun.cpp: (WebCore::RenderRubyRun::removeChild): Use the proper conversion methods at the previous call-sites.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/InlineFlowBox.cpp (modified) (2 diffs)
• rendering/InlineTextBox.cpp (modified) (1 diff)
• rendering/RenderBlockLineLayout.cpp (modified) (2 diffs)
• rendering/RenderLayer.cpp (modified) (1 diff)
• rendering/RenderRuby.cpp (modified) (4 diffs)
• rendering/RenderRubyBase.cpp (modified) (1 diff)
• rendering/RenderRubyRun.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-06-20  Julien Chaffraix  <jchaffraix@webkit.org>
+
+        Reviewed by Darin Adler.
+
+        Remove some unsafe static_cast in rendering/
+        https://bugs.webkit.org/show_bug.cgi?id=63014
+
+        Mechanical refactoring, no test needed.
+
+        * rendering/InlineFlowBox.cpp:
+        (WebCore::InlineFlowBox::placeBoxesInBlockDirection):
+        (WebCore::InlineFlowBox::computeOverAnnotationAdjustment):
+        * rendering/InlineTextBox.cpp:
+        (WebCore::InlineTextBox::getEmphasisMarkPosition):
+        * rendering/RenderBlockLineLayout.cpp:
+        (WebCore::RenderBlock::LineBreaker::nextLineBreak):
+        * rendering/RenderLayer.cpp:
+        (WebCore::RenderLayer::destroyScrollbar):
+        * rendering/RenderRuby.cpp:
+        (WebCore::rubyBeforeBlock):
+        (WebCore::rubyAfterBlock):
+        (WebCore::lastRubyRun):
+        (WebCore::findRubyRunParent):
+        * rendering/RenderRubyBase.cpp:
+        (WebCore::RenderRubyBase::rubyRun):
+        * rendering/RenderRubyRun.cpp:
+        (WebCore::RenderRubyRun::removeChild):
+        Use the proper conversion methods at the previous call-sites.
+
 2011-06-20  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebCore/rendering/InlineFlowBox.cpp

@@ -647 +647 @@
                     hasAnnotationsAfter = true;
 
-                RenderRubyRun* rubyRun = static_cast<RenderRubyRun*>(curr->renderer());
+                RenderRubyRun* rubyRun = toRenderRubyRun(curr->renderer());
                 if (RenderRubyBase* rubyBase = rubyRun->rubyBase()) {
                     int bottomRubyBaseLeading = (curr->logicalHeight() - rubyBase->logicalBottom()) + rubyBase->logicalHeight() - (rubyBase->lastRootBox() ? rubyBase->lastRootBox()->lineBottom() : 0);
@@ -1309 +1309 @@
         
         if (curr->renderer()->isReplaced() && curr->renderer()->isRubyRun()) {
-            RenderRubyRun* rubyRun = static_cast<RenderRubyRun*>(curr->renderer());
+            RenderRubyRun* rubyRun = toRenderRubyRun(curr->renderer());
             RenderRubyText* rubyText = rubyRun->rubyText();
             if (!rubyText)

trunk/Source/WebCore/rendering/InlineTextBox.cpp

@@ -453 +453 @@
         return true; // Cannot get the ruby text.
 
-    RenderRubyText* rubyText = static_cast<RenderRubyRun*>(containingBlock->parent())->rubyText();
+    RenderRubyText* rubyText = toRenderRubyRun(containingBlock->parent())->rubyText();
 
     // The emphasis marks over are suppressed only if there is a ruby text box and it not empty.

trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp

@@ -2255 +2255 @@
                 if (isSVGText && current.m_pos > 0) {
                     // Force creation of new InlineBoxes for each absolute positioned character (those that start new text chunks).
-                    if (static_cast<RenderSVGInlineText*>(t)->characterStartsNewTextChunk(current.m_pos)) {
+                    if (toRenderSVGInlineText(t)->characterStartsNewTextChunk(current.m_pos)) {
                         addMidpoint(lineMidpointState, InlineIterator(0, current.m_obj, current.m_pos - 1));
                         addMidpoint(lineMidpointState, InlineIterator(0, current.m_obj, current.m_pos));
@@ -2273 +2273 @@
 
                 if (collapseWhiteSpace && currentCharacterIsSpace && !ignoringSpaces)
-                    trailingObjects.setTrailingWhitespace(static_cast<RenderText*>(current.m_obj));
+                    trailingObjects.setTrailingWhitespace(toRenderText(current.m_obj));
                 else if (!current.m_obj->style()->collapseWhiteSpace() || !currentCharacterIsSpace)
                     trailingObjects.clear();

trunk/Source/WebCore/rendering/RenderLayer.cpp

@@ -1904 +1904 @@
     if (scrollbar) {
         if (scrollbar->isCustomScrollbar())
-            static_cast<RenderScrollbar*>(scrollbar.get())->clearOwningRenderer();
+            toRenderScrollbar(scrollbar.get())->clearOwningRenderer();
         else {
             if (orientation == HorizontalScrollbar)

trunk/Source/WebCore/rendering/RenderRuby.cpp

@@ -53 +53 @@
 {
     RenderObject* child = ruby->firstChild();
-    return child && !child->isRubyRun() && child->isRenderBlock() && child->style()->styleType() == BEFORE ? static_cast<RenderBlock*>(child) : 0;
+    return child && !child->isRubyRun() && child->isRenderBlock() && child->style()->styleType() == BEFORE ? toRenderBlock(child) : 0;
 }
 
@@ -59 +59 @@
 {
     RenderObject* child = ruby->lastChild();
-    return child && !child->isRubyRun() && child->isRenderBlock() && child->style()->styleType() == AFTER ? static_cast<RenderBlock*>(child) : 0;
+    return child && !child->isRubyRun() && child->isRenderBlock() && child->style()->styleType() == AFTER ? toRenderBlock(child) : 0;
 }
 
@@ -79 +79 @@
         child = child->previousSibling();
     ASSERT(!child || child->isRubyRun() || child->isBeforeContent() || child == rubyBeforeBlock(ruby));
-    return child && child->isRubyRun() ? static_cast<RenderRubyRun*>(child) : 0;
+    return child && child->isRubyRun() ? toRenderRubyRun(child) : 0;
 }
 
@@ -86 +86 @@
     while (child && !child->isRubyRun())
         child = child->parent();
-    return static_cast<RenderRubyRun*>(child);
+    return toRenderRubyRun(child);
 }
 

trunk/Source/WebCore/rendering/RenderRubyBase.cpp

@@ -192 +192 @@
     ASSERT(parent()->isRubyRun());
 
-    return static_cast<RenderRubyRun*>(parent());
+    return toRenderRubyRun(parent());
 }
 

trunk/Source/WebCore/rendering/RenderRubyRun.cpp

@@ -160 +160 @@
         if (base && rightNeighbour && rightNeighbour->isRubyRun()) {
             // Ruby run without a base can happen only at the first run.
-            RenderRubyRun* rightRun = static_cast<RenderRubyRun*>(rightNeighbour);
+            RenderRubyRun* rightRun = toRenderRubyRun(rightNeighbour);
             if (rightRun->hasRubyBase()) {
                 RenderRubyBase* rightBase = rightRun->rubyBaseSafe();