[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[ojan at chromium.org]

The following commit has been merged in the webkit-1.2 branch:
commit 078aa802c11b39fb8cc887c569866afc88ed7e0e
Author: ojan at chromium.org <ojan at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Mar 10 00:17:11 2010 +0000

    2010-03-09  Ojan Vafai  <ojan at chromium.org>
    
            Reviewed by Darin Adler.
    
            Fix review comment accidentally overlooked in bug 35713
            https://bugs.webkit.org/show_bug.cgi?id=35947
    
            * editing/DeleteSelectionCommand.cpp:
            (WebCore::DeleteSelectionCommand::setStartingSelectionOnSmartDelete):
            * editing/DeleteSelectionCommand.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55753 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 9e1f717..ede8746 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2010-03-09  Ojan Vafai  <ojan at chromium.org>
+
+        Reviewed by Darin Adler.
+
+        Fix review comment accidentally overlooked in bug 35713
+        https://bugs.webkit.org/show_bug.cgi?id=35947
+
+        * editing/DeleteSelectionCommand.cpp:
+        (WebCore::DeleteSelectionCommand::setStartingSelectionOnSmartDelete):
+        * editing/DeleteSelectionCommand.h:
+
 2010-03-03  Ojan Vafai  <ojan at chromium.org>
 
         Reviewed by Adam Barth.
diff --git a/WebCore/editing/DeleteSelectionCommand.cpp b/WebCore/editing/DeleteSelectionCommand.cpp
index 8027b14..5e81d50 100644
--- a/WebCore/editing/DeleteSelectionCommand.cpp
+++ b/WebCore/editing/DeleteSelectionCommand.cpp
@@ -161,7 +161,7 @@ void DeleteSelectionCommand::initializeStartEnd(Position& start, Position& end)
     }
 }
 
-void DeleteSelectionCommand::setStartingSelectionOnSmartDelete(Position& start, Position& end)
+void DeleteSelectionCommand::setStartingSelectionOnSmartDelete(const Position& start, const Position& end)
 {
     VisiblePosition newBase;
     VisiblePosition newExtent;
diff --git a/WebCore/editing/DeleteSelectionCommand.h b/WebCore/editing/DeleteSelectionCommand.h
index 44a005c..20f52f4 100644
--- a/WebCore/editing/DeleteSelectionCommand.h
+++ b/WebCore/editing/DeleteSelectionCommand.h
@@ -51,7 +51,7 @@ private:
     virtual bool preservesTypingStyle() const;
 
     void initializeStartEnd(Position&, Position&);
-    void setStartingSelectionOnSmartDelete(Position&, Position&);
+    void setStartingSelectionOnSmartDelete(const Position&, const Position&);
     void initializePositionData();
     void saveTypingStyleState();
     void insertPlaceholderForAncestorBlockContent();

-- 
WebKit Debian packaging