[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[commit-queue at webkit.org]

The following commit has been merged in the webkit-1.3 branch:
commit bcebc74d3eb0745f2a1a610952ef955a537a47ab
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 28 02:03:58 2011 +0000

    2011-01-27  Finnur Thorarinsson  <finnur.webkit at 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):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76889 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebKit/chromium/ChangeLog b/Source/WebKit/chromium/ChangeLog
index a7f9aac..49d15ae 100644
--- a/Source/WebKit/chromium/ChangeLog
+++ b/Source/WebKit/chromium/ChangeLog
@@ -1,3 +1,22 @@
+2011-01-27  Finnur Thorarinsson  <finnur.webkit at 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 at google.com>
 
         Reviewed by Kenneth Russell.
diff --git a/Source/WebKit/chromium/src/WebFrameImpl.cpp b/Source/WebKit/chromium/src/WebFrameImpl.cpp
index 96fc455..b44beeb 100644
--- a/Source/WebKit/chromium/src/WebFrameImpl.cpp
+++ b/Source/WebKit/chromium/src/WebFrameImpl.cpp
@@ -1544,6 +1544,9 @@ void WebFrameImpl::scopeStringMatches(int identifier,
 
     RefPtr<Range> searchRange(rangeOfContents(frame()->document()));
 
+    Node* originalEndContainer = searchRange->endContainer();
+    int originalEndOffset = searchRange->endOffset();
+
     ExceptionCode ec = 0, ec2 = 0;
     if (m_resumeScopingFromRange.get()) {
         // This is a continuation of a scoping operation that timed out and didn't
@@ -1558,9 +1561,6 @@ void WebFrameImpl::scopeStringMatches(int identifier,
         }
     }
 
-    Node* originalEndContainer = searchRange->endContainer();
-    int originalEndOffset = searchRange->endOffset();
-
     // This timeout controls how long we scope before releasing control.  This
     // value does not prevent us from running for longer than this, but it is
     // periodically checked to see if we have exceeded our allocated time.

-- 
WebKit Debian packaging