Changeset 166171 in webkit

Timestamp:

Mar 24, 2014 9:30:52 AM (10 years ago)

Author:

Antti Koivisto

Message:

Text autosizing does not determine line count correctly for simple line layout
​https://bugs.webkit.org/show_bug.cgi?id=130673

Reviewed by Daniel Bates.

We don't count lines correctly in simple line layout case.

• page/Frame.cpp:

(WebCore::Frame::textAutosizingWidth):
(WebCore::Frame::setTextAutosizingWidth):

• page/ios/FrameIOS.mm:

(WebCore::Frame::textAutosizingWidth): Deleted.
(WebCore::Frame::setTextAutosizingWidth): Deleted.

Move to Frame.cpp to make enabling on non-iOS build easier.

• rendering/RenderBlockFlow.cpp:

(WebCore::RenderBlockFlow::lineCount):

Handle simple line layout case.

(WebCore::RenderBlockFlow::lineCountForTextAutosizing):

Call lineCount() if children are inline.
Rename for clarity.

(WebCore::RenderBlockFlow::adjustComputedFontSizes):
(WebCore::RenderBlockFlow::immediateLineCount): Deleted.

• rendering/RenderBlockFlow.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/Frame.cpp (modified) (1 diff)
• page/ios/FrameIOS.mm (modified) (1 diff)
• rendering/RenderBlockFlow.cpp (modified) (4 diffs)
• rendering/RenderBlockFlow.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-03-24  Antti Koivisto  <antti@apple.com>
+
+        Text autosizing does not determine line count correctly for simple line layout
+        https://bugs.webkit.org/show_bug.cgi?id=130673
+
+        Reviewed by Daniel Bates.
+        
+        We don't count lines correctly in simple line layout case.
+
+        * page/Frame.cpp:
+        (WebCore::Frame::textAutosizingWidth):
+        (WebCore::Frame::setTextAutosizingWidth):
+        * page/ios/FrameIOS.mm:
+        (WebCore::Frame::textAutosizingWidth): Deleted.
+        (WebCore::Frame::setTextAutosizingWidth): Deleted.
+        
+            Move to Frame.cpp to make enabling on non-iOS build easier.
+
+        * rendering/RenderBlockFlow.cpp:
+        (WebCore::RenderBlockFlow::lineCount):
+        
+            Handle simple line layout case.
+
+        (WebCore::RenderBlockFlow::lineCountForTextAutosizing):
+            
+            Call lineCount() if children are inline.
+            Rename for clarity.
+
+        (WebCore::RenderBlockFlow::adjustComputedFontSizes):
+        (WebCore::RenderBlockFlow::immediateLineCount): Deleted.
+        * rendering/RenderBlockFlow.h:
+
 2014-03-24  Frédéric Wang  <fred.wang@free.fr>
 

trunk/Source/WebCore/page/Frame.cpp

@@ -487 +487 @@
 }
 
+#if ENABLE(IOS_TEXT_AUTOSIZING)
+float Frame::textAutosizingWidth() const
+{
+    return m_textAutosizingWidth;
+}
+
+void Frame::setTextAutosizingWidth(float width)
+{
+    m_textAutosizingWidth = width;
+}
+#endif
+
 #if PLATFORM(IOS)
 void Frame::scrollOverflowLayer(RenderLayer* layer, const IntRect& visibleRect, const IntRect& exposeRect)

trunk/Source/WebCore/page/ios/FrameIOS.mm

@@ -873 +873 @@
 }
 
-#if ENABLE(IOS_TEXT_AUTOSIZING)
-float Frame::textAutosizingWidth() const
-{
-    return m_textAutosizingWidth;
-}
-
-void Frame::setTextAutosizingWidth(float width)
-{
-    m_textAutosizingWidth = width;
-}
-#endif
-
 } // namespace WebCore
 #endif // PLATFORM(IOS)

trunk/Source/WebCore/rendering/RenderBlockFlow.cpp

@@ -35 +35 @@
 #include "RenderIterator.h"
 #include "RenderLayer.h"
+#include "RenderListItem.h"
 #include "RenderMultiColumnFlowThread.h"
 #include "RenderMultiColumnSet.h"
@@ -2977 +2978 @@
 
     if (childrenInline()) {
+        if (m_simpleLineLayout) {
+            ASSERT(!stopRootInlineBox);
+            return m_simpleLineLayout->lineCount();
+        }
         for (auto box = firstRootBox(); box; box = box->nextRootBox()) {
             count++;
@@ -3404 +3409 @@
 }
 
-int RenderBlockFlow::immediateLineCount()
-{
-    // Copied and modified from RenderBlock::lineCount.
+int RenderBlockFlow::lineCountForTextAutosizing()
+{
+    if (style().visibility() != VISIBLE)
+        return 0;
+    if (childrenInline())
+        return lineCount();
     // Only descend into list items.
     int count = 0;
-    if (style().visibility() == VISIBLE) {
-        if (childrenInline()) {
-            for (RootInlineBox* box = firstRootBox(); box; box = box->nextRootBox())
-                count++;
-        } else {
-            for (RenderObject* obj = firstChild(); obj; obj = obj->nextSibling()) {
-                if (obj->isListItem())
-                    count += toRenderBlockFlow(obj)->lineCount();
-            }
-        }
-    }
+    for (auto& listItem : childrenOfType<RenderListItem>(*this))
+        count += listItem.lineCount();
     return count;
 }
@@ -3452 +3451 @@
     unsigned lineCount;
     if (m_lineCountForTextAutosizing == NOT_SET) {
-        int count = immediateLineCount();
+        int count = lineCountForTextAutosizing();
         if (!count)
             lineCount = NO_LINE;

trunk/Source/WebCore/rendering/RenderBlockFlow.h

@@ -588 +588 @@
 
 #if ENABLE(IOS_TEXT_AUTOSIZING)
-    int immediateLineCount();
+    int lineCountForTextAutosizing();
     void adjustComputedFontSizes(float size, float visibleWidth);
     void resetComputedFontSize()