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

[enrica at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 3d53bf76ee1c2fb86d0f9174a4959d84970d1c29
Author: enrica at apple.com <enrica at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Sep 25 01:50:55 2010 +0000

    Build fix.
    
    * UIProcess/API/qt/qwkpage_p.h:
    * UIProcess/win/WebView.cpp:
    (WebKit::WebView::setEditCommandState):
    * UIProcess/win/WebView.h:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68320 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 3eafaae..8b91107 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,5 +1,14 @@
 2010-09-24  Enrica Casucci  <enrica at apple.com>
 
+        Build fix.
+
+        * UIProcess/API/qt/qwkpage_p.h:
+        * UIProcess/win/WebView.cpp:
+        (WebKit::WebView::setEditCommandState):
+        * UIProcess/win/WebView.h:
+
+2010-09-24  Enrica Casucci  <enrica at apple.com>
+
         Reviewed by Darin Adler.
 
         Maui: Pasteboard support (42317)
diff --git a/WebKit2/UIProcess/API/qt/qwkpage_p.h b/WebKit2/UIProcess/API/qt/qwkpage_p.h
index 4a471fd..ea415c4 100644
--- a/WebKit2/UIProcess/API/qt/qwkpage_p.h
+++ b/WebKit2/UIProcess/API/qt/qwkpage_p.h
@@ -69,7 +69,7 @@ public:
     void updateAction(QWKPage::WebAction action);
     void updateNavigationActions();
     void updateEditorActions();
-    void setEditCommandState(WTF:String&, bool, int);
+    void setEditCommandState(const WTF::String&, bool, int);
 
     void _q_webActionTriggered(bool checked);
 
diff --git a/WebKit2/UIProcess/win/WebView.cpp b/WebKit2/UIProcess/win/WebView.cpp
index 669e1df..cfe1edb 100644
--- a/WebKit2/UIProcess/win/WebView.cpp
+++ b/WebKit2/UIProcess/win/WebView.cpp
@@ -580,6 +580,10 @@ void WebView::clearAllEditCommands()
 {
 }
 
+void WebView::setEditCommandState(const WTF::String&, bool, int)
+{
+}
+
 #if USE(ACCELERATED_COMPOSITING)
 void WebView::pageDidEnterAcceleratedCompositing()
 {
diff --git a/WebKit2/UIProcess/win/WebView.h b/WebKit2/UIProcess/win/WebView.h
index e6e40a3..02b546d 100644
--- a/WebKit2/UIProcess/win/WebView.h
+++ b/WebKit2/UIProcess/win/WebView.h
@@ -97,6 +97,7 @@ private:
     virtual void setCursor(const WebCore::Cursor&);
     virtual void registerEditCommand(PassRefPtr<WebEditCommandProxy>, UndoOrRedo);
     virtual void clearAllEditCommands();
+    virtual void setEditCommandState(const WTF::String&, bool, int);
 
 #if USE(ACCELERATED_COMPOSITING)
     virtual void pageDidEnterAcceleratedCompositing();

-- 
WebKit Debian packaging