Changeset 31328 in webkit

Timestamp:

Mar 26, 2008, 1:53:07 PM (17 years ago)

Author:

mitz@apple.com

Message:

2008-03-26 Dan Bernstein <​mitz@apple.com>

Reviewed by Anders Carlsson.

• fix ​http://bugs.webkit.org/show_bug.cgi?id=18104 REGRESSION: LEAK: 2 InlineBox in editing/inserting/12882.html

• rendering/bidi.cpp: (WebCore::RenderBlock::layoutInlineChildren): When deciding to ditch old clean lines (due to changed or newly-added floats), keep the reference to those lines so they can be properly deleted in the end, and use a separate flag to signal that no matching should be attempted.

Location:

trunk/WebCore

Files:

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

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-03-26  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Anders Carlsson.
+
+        - fix http://bugs.webkit.org/show_bug.cgi?id=18104
+          REGRESSION: LEAK: 2 InlineBox in editing/inserting/12882.html
+
+        * rendering/bidi.cpp:
+        (WebCore::RenderBlock::layoutInlineChildren): When deciding to ditch
+        old clean lines (due to changed or newly-added floats), keep the
+        reference to those lines so they can be properly deleted in the end,
+        and use a separate flag to signal that no matching should be attempted.
+
 2008-03-26  Mark Rowe  <mrowe@apple.com>
 

trunk/WebCore/rendering/bidi.cpp

@@ -874 +874 @@
 
         bool endLineMatched = false;
+        bool checkForEndLineMatch = endLine;
 
         while (!end.atEnd()) {
             // FIXME: Is this check necessary before the first iteration or can it be moved to the end?
-            if (endLine && (endLineMatched = matchedEndLine(start, cleanLineStart, cleanLineBidiStatus, endLine, endLineYPos, repaintBottom, repaintTop)))
+            if (checkForEndLineMatch && (endLineMatched = matchedEndLine(start, cleanLineStart, cleanLineBidiStatus, endLine, endLineYPos, repaintBottom, repaintTop)))
                 break;
 
@@ -952 +953 @@
                     // If a float's geometry has changed, give up on syncing with clean lines.
                     if (floats[floatIndex].rect != IntRect(f->m_left, f->m_top, f->m_width, f->m_bottom - f->m_top))
-                        endLine = 0;
+                        checkForEndLineMatch = false;
                     floatIndex++;
                 }