Changeset 61629 in webkit

Timestamp:

Jun 22, 2010 3:10:10 PM (14 years ago)

Author:

mitz@apple.com

Message:

<rdar://problem/8119403> REGRESSION (r61548): PLT is almost 1.5% slower, Google page cycler slower
​https://bugs.webkit.org/show_bug.cgi?id=41012

Reviewed by Anders Carlsson.

• rendering/RenderBlockLineLayout.cpp:

(WebCore::RenderBlock::computeHorizontalPositionsForLine): Removed a redundant statement that was
left over in the original patch and resulted in double the calls to RenderText::width() here.
(WebCore::RenderBlock::findNextLineBreak): Changed the order of evaluating conditions for a
potential speedup.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderBlockLineLayout.cpp (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-06-22  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Anders Carlsson.
+
+        <rdar://problem/8119403> REGRESSION (r61548): PLT is almost 1.5% slower, Google page cycler slower
+        https://bugs.webkit.org/show_bug.cgi?id=41012
+
+        * rendering/RenderBlockLineLayout.cpp:
+        (WebCore::RenderBlock::computeHorizontalPositionsForLine): Removed a redundant statement that was
+        left over in the original patch and resulted in double the calls to RenderText::width() here.
+        (WebCore::RenderBlock::findNextLineBreak): Changed the order of evaluating conditions for a
+        potential speedup.
+
 2010-06-22  Darin Adler  <darin@apple.com>
 

trunk/WebCore/rendering/RenderBlockLineLayout.cpp

@@ -352 +352 @@
             HashSet<const SimpleFontData*> fallbackFonts;
             GlyphOverflow glyphOverflow;
-            r->m_box->setWidth(rt->width(r->m_start, r->m_stop - r->m_start, totWidth, firstLine, &fallbackFonts, &glyphOverflow));
             int hyphenWidth = 0;
             if (static_cast<InlineTextBox*>(r->m_box)->hasHyphen()) {
@@ -1717 +1716 @@
                             }
                         }
-                        if (canHyphenate && w + tmpW > width) {
-                            tryHyphenating(t, f, lastSpace, pos, w + tmpW - additionalTmpW, width, isFixedPitch, collapseWhiteSpace, lastSpaceWordSpacing, lBreak, nextBreakable, hyphenated);
-                            if (hyphenated)
-                                goto end;
-                        }
                         if (lineWasTooWide || w + tmpW > width) {
+                            if (canHyphenate && w + tmpW > width) {
+                                tryHyphenating(t, f, lastSpace, pos, w + tmpW - additionalTmpW, width, isFixedPitch, collapseWhiteSpace, lastSpaceWordSpacing, lBreak, nextBreakable, hyphenated);
+                                if (hyphenated)
+                                    goto end;
+                            }
                             if (lBreak.obj && shouldPreserveNewline(lBreak.obj) && lBreak.obj->isText() && toRenderText(lBreak.obj)->textLength() && !toRenderText(lBreak.obj)->isWordBreak() && toRenderText(lBreak.obj)->characters()[lBreak.pos] == '\n') {
                                 if (!stoppedIgnoringSpaces && pos > 0) {