Changeset 128713 in webkit

Timestamp:

Sep 16, 2012, 4:36:41 PM (13 years ago)

Author:

mitz@apple.com

Message:

REGRESSION (r126763): css1/pseudo/firstline.html fails when using the complex text code path
​https://bugs.webkit.org/show_bug.cgi?id=96890

Reviewed by Sam Weinig.

Source/WebCore:

Test: fast/text/stale-TextLayout-from-first-line.html

When a first-line style specifies a font, different pieces of the same RednerText can be
laid out using different fonts, requiring a differet TextLayout for each piece.

• rendering/RenderBlock.h:

(RenderTextInfo): Added m_font data member.

• rendering/RenderBlockLineLayout.cpp:

(WebCore::RenderBlock::RenderTextInfo::RenderTextInfo): Added initializer for new data member.
(WebCore::RenderBlock::LineBreaker::nextLineBreak): Added code to update the text layout in
renderTextInfo if the font has changed.

LayoutTests:

• fast/text/stale-TextLayout-from-first-line-expected.html: Added.
• fast/text/stale-TextLayout-from-first-line.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/text/stale-TextLayout-from-first-line-expected.html (added)
• LayoutTests/fast/text/stale-TextLayout-from-first-line.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderBlock.h (modified) (1 diff)
• Source/WebCore/rendering/RenderBlockLineLayout.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog ¶

@@ +1 @@
+2012-09-16  Dan Bernstein  <mitz@apple.com>
+
+        REGRESSION (r126763): css1/pseudo/firstline.html fails when using the complex text code path
+        https://bugs.webkit.org/show_bug.cgi?id=96890
+
+        Reviewed by Sam Weinig.
+
+        * fast/text/stale-TextLayout-from-first-line-expected.html: Added.
+        * fast/text/stale-TextLayout-from-first-line.html: Added.
+
 2012-09-16  Christophe Dumez  <christophe.dumez@intel.com>
 

trunk/Source/WebCore/ChangeLog ¶

@@ +1 @@
+2012-09-16  Dan Bernstein  <mitz@apple.com>
+
+        REGRESSION (r126763): css1/pseudo/firstline.html fails when using the complex text code path
+        https://bugs.webkit.org/show_bug.cgi?id=96890
+
+        Reviewed by Sam Weinig.
+
+        Test: fast/text/stale-TextLayout-from-first-line.html
+
+        When a first-line style specifies a font, different pieces of the same RednerText can be
+        laid out using different fonts, requiring a differet TextLayout for each piece.
+
+        * rendering/RenderBlock.h:
+        (RenderTextInfo): Added m_font data member.
+        * rendering/RenderBlockLineLayout.cpp:
+        (WebCore::RenderBlock::RenderTextInfo::RenderTextInfo): Added initializer for new data member.
+        (WebCore::RenderBlock::LineBreaker::nextLineBreak): Added code to update the text layout in
+        renderTextInfo if the font has changed.
+
 2012-09-16  Kalev Lember  <kalevlember@gmail.com>
 

trunk/Source/WebCore/rendering/RenderBlock.h ¶

@@ -716 +716 @@
         OwnPtr<TextLayout> m_layout;
         LazyLineBreakIterator m_lineBreakIterator;
+        const Font* m_font;
     };
 

trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp ¶

@@ -1276 +1276 @@
 RenderBlock::RenderTextInfo::RenderTextInfo()
     : m_text(0)
+    , m_font(0)
 {
 }
@@ -2437 +2438 @@
                 t->updateTextIfNeeded();
                 renderTextInfo.m_text = t;
+                renderTextInfo.m_font = &f;
                 renderTextInfo.m_layout = f.createLayout(t, width.currentWidth(), collapseWhiteSpace);
                 renderTextInfo.m_lineBreakIterator.reset(t->characters(), t->textLength(), style->locale());
-            }
+            } else if (renderTextInfo.m_layout && renderTextInfo.m_font != &f) {
+                renderTextInfo.m_font = &f;
+                renderTextInfo.m_layout = f.createLayout(t, width.currentWidth(), collapseWhiteSpace);
+            }
+
             TextLayout* textLayout = renderTextInfo.m_layout.get();