Changeset 27706 in webkit

Timestamp:

Nov 11, 2007 9:40:30 PM (16 years ago)

Author:

mitz@apple.com

Message:

WebCore:

Reviewed by Adam Roben.

• fix ​http://bugs.webkit.org/show_bug.cgi?id=15942 REGRESSION: Selecting "Edit Html" tab in Blogger causes crash (Assertion failed: isRange())

Test: editing/selection/cleared-by-relayout.html

• editing/Selection.cpp: (WebCore::Selection::toRange): Check if the selection has been cleared by updating layout.

LayoutTests:

Reviewed by Adam Roben.

• test for ​http://bugs.webkit.org/show_bug.cgi?id=15942 REGRESSION: Selecting "Edit Html" tab in Blogger causes crash (Assertion failed: isRange())

• editing/selection/cleared-by-relayout-expected.txt: Added.
• editing/selection/cleared-by-relayout.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/editing/selection/cleared-by-relayout-expected.txt (added)
• LayoutTests/editing/selection/cleared-by-relayout.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/editing/Selection.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2007-11-11  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Adam Roben.
+
+        - test for http://bugs.webkit.org/show_bug.cgi?id=15942
+          REGRESSION: Selecting "Edit Html" tab in Blogger causes crash (Assertion failed: isRange())
+
+        * editing/selection/cleared-by-relayout-expected.txt: Added.
+        * editing/selection/cleared-by-relayout.html: Added.
+
 2007-11-11  Antti Koivisto  <antti@apple.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-11-11  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Adam Roben.
+
+        - fix http://bugs.webkit.org/show_bug.cgi?id=15942
+          REGRESSION: Selecting "Edit Html" tab in Blogger causes crash (Assertion failed: isRange())
+
+        Test: editing/selection/cleared-by-relayout.html
+
+        * editing/Selection.cpp:
+        (WebCore::Selection::toRange): Check if the selection has been cleared
+        by updating layout.
+
 2007-11-11  Darin Adler  <darin@apple.com>
 

trunk/WebCore/editing/Selection.cpp

@@ -129 +129 @@
     // incorrect results.
     m_start.node()->document()->updateLayout();
+
+    // Check again, because updating layout can clear the selection.
+    if (isNone())
+        return 0;
 
     Position s, e;