commit 49b9d95b5e1e66e97137c6d1dfc5fc336a9d2bf7
author eric@webkit.org <eric@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Fri Jul 03 01:29:07 2009 +0000
committer eric@webkit.org <eric@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Fri Jul 03 01:29:07 2009 +0000
tree b73b509694eb828347b494e343cfd2720af23e37
parent 5be043708584ab01d2e0a3afaee47331798dabbf

2009-07-02  Roland Steiner  <rolandsteiner@google.com>

        Reviewed by Eric Seidel.

        RenderBlock and RenderInline have confusingly named object creation methods:
        RenderBlock::createRootBox/createRootInlineBox
        RenderInline::createFlowBox/createInlineFlowBox
        where the 2nd method in both cases just calls the first and then appends the created object.
        I therefore renamed those methods to something IMHO more informative:

        createRootBox()         -> createRootInlineBox()
        createRootInlineBox()   -> createAndAppendRootInlineBox();
        createFlowBox()         -> createInlineFlowBox();
        createInlineFlowBox()   -> createAndAppendInlineFlowBox();

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

        * rendering/RenderBlock.cpp:
        (WebCore::RenderBlock::createRootInlineBox):
        (WebCore::RenderBlock::createAndAppendRootInlineBox):
        * rendering/RenderBlock.h:
        * rendering/RenderInline.cpp:
        (WebCore::RenderInline::createInlineFlowBox):
        (WebCore::RenderInline::createAndAppendInlineFlowBox):
        * rendering/RenderInline.h:
        * rendering/RenderSVGInline.cpp:
        (WebCore::RenderSVGInline::createInlineFlowBox):
        * rendering/RenderSVGInline.h:
        * rendering/RenderSVGText.cpp:
        (WebCore::RenderSVGText::createRootInlineBox):
        * rendering/RenderSVGText.h:
        * rendering/bidi.cpp:
        (WebCore::createInlineBoxForRenderer):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@45517 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebCore/rendering/bidi.cpp

diff --git a/WebCore/rendering/bidi.cpp b/WebCore/rendering/bidi.cpp
index 635ad9a..d64ce16 100644
--- a/WebCore/rendering/bidi.cpp
+++ b/WebCore/rendering/bidi.cpp
@@ -449,7 +449,7 @@
 static inline InlineBox* createInlineBoxForRenderer(RenderObject* obj, bool isRootLineBox, bool isOnlyRun = false)
 {
     if (isRootLineBox)
-        return toRenderBlock(obj)->createRootInlineBox();
+        return toRenderBlock(obj)->createAndAppendRootInlineBox();
     
     if (obj->isText()) {
         InlineTextBox* textBox = toRenderText(obj)->createInlineTextBox();
@@ -463,7 +463,7 @@
     if (obj->isBox())
         return toRenderBox(obj)->createInlineBox();
     
-    return toRenderInline(obj)->createInlineFlowBox();
+    return toRenderInline(obj)->createAndAppendInlineFlowBox();
 }
 
 static inline void dirtyLineBoxesForRenderer(RenderObject* o, bool fullLayout)