[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.19-706-ge5415e9

[bweinstein at apple.com]

The following commit has been merged in the webkit-1.1 branch:
commit 0eb14ada24f60e5f567a4d820b63ed0342da0a04
Author: bweinstein at apple.com <bweinstein at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Jan 30 00:59:28 2010 +0000

    Roll out r54088 because the functions were already in
    IWebPreferencesPrivate, so they should stay there.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54090 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/win/ChangeLog b/WebKit/win/ChangeLog
index deece76..6cc5d6e 100644
--- a/WebKit/win/ChangeLog
+++ b/WebKit/win/ChangeLog
@@ -1,16 +1,5 @@
 2010-01-29  Brian Weinstein  <bweinstein at apple.com>
 
-        Rubber-stamped by Adam Roben.
-
-        Move customDragCursorEnabled preference functions from 
-        IWebPreferences to IWebPreferencesPrivate.
-
-        * Interfaces/IWebPreferences.idl: Moved customDragFunctions from here...
-        * Interfaces/IWebPreferencesPrivate.idl: To here.
-        * Interfaces/WebKit.idl: Touched to make sure we rebuild.
-
-2010-01-29  Brian Weinstein  <bweinstein at apple.com>
-
         Reviewed by Adam Roben.
 
         Drag and Drop: Windows uses "stop" sign as cursor when dragging
diff --git a/WebKit/win/Interfaces/IWebPreferences.idl b/WebKit/win/Interfaces/IWebPreferences.idl
index 40b7684..9a52d7c 100644
--- a/WebKit/win/Interfaces/IWebPreferences.idl
+++ b/WebKit/win/Interfaces/IWebPreferences.idl
@@ -186,7 +186,4 @@ interface IWebPreferences : IUnknown
 
     HRESULT setZoomsTextOnly(BOOL zoomsTextOnly);
     HRESULT zoomsTextOnly(BOOL *zoomsTextOnly);
-
-    HRESULT setCustomDragCursorsEnabled([in] BOOL customDragCursorsEnabled);
-    HRESULT customDragCursorsEnabled([out, retval] BOOL* customDragCursorsEnabled);
 }
diff --git a/WebKit/win/Interfaces/IWebPreferencesPrivate.idl b/WebKit/win/Interfaces/IWebPreferencesPrivate.idl
index cfd8e83..1293fb8 100644
--- a/WebKit/win/Interfaces/IWebPreferencesPrivate.idl
+++ b/WebKit/win/Interfaces/IWebPreferencesPrivate.idl
@@ -94,4 +94,7 @@ interface IWebPreferencesPrivate : IUnknown
 
     HRESULT setAcceleratedCompositingEnabled([in] BOOL);
     HRESULT acceleratedCompositingEnabled([out, retval] BOOL*);
+
+    HRESULT setCustomDragCursorsEnabled([in] BOOL);
+    HRESULT customDragCursorsEnabled([out, retval] BOOL*);
 }
diff --git a/WebKit/win/Interfaces/WebKit.idl b/WebKit/win/Interfaces/WebKit.idl
index 3cd748c..94dc697 100644
--- a/WebKit/win/Interfaces/WebKit.idl
+++ b/WebKit/win/Interfaces/WebKit.idl
@@ -294,3 +294,4 @@ library WebKit
         [default] interface IWebGeolocationPosition;
     }
 }
+

-- 
WebKit Debian packaging