Changeset 76889 in webkit

Timestamp:

Jan 27, 2011 6:03:58 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-01-27 Finnur Thorarinsson <​finnur.webkit@gmail.com>

Reviewed by Ojan Vafai.

This addresses a regression introduced by r75784, as described in:
​https://bugs.webkit.org/show_bug.cgi?id=53176

The problem is that originalEndContainer and originalEndOffset was
meant to capture the end of the document, but was being assigned after
a call to searchRange->setStart() (when scoping is restarted), which can
result in the Range being collapsed to start (thereby assigning the
wrong value to the Container/Offset pair).

This code is never triggered by layout tests, but I'm adding a regressiono
test on the Chromium side for this.

• src/WebFrameImpl.cpp: (WebKit::WebFrameImpl::scopeStringMatches):

Location:

trunk/Source/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• src/WebFrameImpl.cpp (modified) (2 diffs)

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2011-01-27  Finnur Thorarinsson  <finnur.webkit@gmail.com>
+
+        Reviewed by Ojan Vafai.
+
+        This addresses a regression introduced by r75784, as described in:
+        https://bugs.webkit.org/show_bug.cgi?id=53176
+
+        The problem is that originalEndContainer and originalEndOffset was
+        meant to capture the end of the document, but was being assigned after
+        a call to searchRange->setStart() (when scoping is restarted), which can
+        result in the Range being collapsed to start (thereby assigning the
+        wrong value to the Container/Offset pair).
+
+        This code is never triggered by layout tests, but I'm adding a regressiono
+        test on the Chromium side for this.
+
+        * src/WebFrameImpl.cpp:
+        (WebKit::WebFrameImpl::scopeStringMatches):
+
 2011-01-27  Zhenyao Mo  <zmo@google.com>
 

trunk/Source/WebKit/chromium/src/WebFrameImpl.cpp

@@ -1545 +1545 @@
     RefPtr<Range> searchRange(rangeOfContents(frame()->document()));
 
+    Node* originalEndContainer = searchRange->endContainer();
+    int originalEndOffset = searchRange->endOffset();
+
     ExceptionCode ec = 0, ec2 = 0;
     if (m_resumeScopingFromRange.get()) {
@@ -1558 +1561 @@
         }
     }
-
-    Node* originalEndContainer = searchRange->endContainer();
-    int originalEndOffset = searchRange->endOffset();
 
     // This timeout controls how long we scope before releasing control.  This