[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

rniwa at webkit.org rniwa at webkit.org
Wed Dec 22 11:39:36 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 618f50af69d73286fe9577f5b3cab7bfb9e6f6bc
Author: rniwa at webkit.org <rniwa at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Aug 3 00:59:58 2010 +0000

    2010-08-02  Ryosuke Niwa  <rniwa at webkit.org>
    
            Reviewed by Eric Seidel.
    
            Range::create should not be calling deprecatedEditingOffset and node on start and end
            https://bugs.webkit.org/show_bug.cgi?id=43385
    
            Replaced node() and deprecatedEditingOffset() by containerNode() and computeOffsetInContainerNode().
    
            No new tests added since this does not change the behavior.
    
            * dom/Range.cpp:
            (WebCore::Range::create):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64516 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 133f71a..ddaa9fb 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2010-08-02  Ryosuke Niwa  <rniwa at webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        Range::create should not be calling deprecatedEditingOffset and node on start and end
+        https://bugs.webkit.org/show_bug.cgi?id=43385
+
+        Replaced node() and deprecatedEditingOffset() by containerNode() and computeOffsetInContainerNode().
+
+        No new tests added since this does not change the behavior.
+
+        * dom/Range.cpp:
+        (WebCore::Range::create):
+
 2010-08-02  Chris Fleizach  <cfleizach at apple.com>
 
         Unreviewed, rolling out r64472.
diff --git a/WebCore/dom/Range.cpp b/WebCore/dom/Range.cpp
index a5abdd4..33a21bb 100644
--- a/WebCore/dom/Range.cpp
+++ b/WebCore/dom/Range.cpp
@@ -94,8 +94,7 @@ PassRefPtr<Range> Range::create(PassRefPtr<Document> ownerDocument, PassRefPtr<N
 
 PassRefPtr<Range> Range::create(PassRefPtr<Document> ownerDocument, const Position& start, const Position& end)
 {
-    // FIXME: we shouldn't be using deprecatedEditingOffset here
-    return adoptRef(new Range(ownerDocument, start.node(), start.deprecatedEditingOffset(), end.node(), end.deprecatedEditingOffset()));
+    return adoptRef(new Range(ownerDocument, start.containerNode(), start.computeOffsetInContainerNode(), end.containerNode(), end.computeOffsetInContainerNode()));
 }
 
 Range::~Range()

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list