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

andersca at apple.com andersca at apple.com
Wed Dec 22 17:55:12 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit db58a3151b0244884691f33d296767c4e981398e
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Dec 2 18:41:38 2010 +0000

    Plug-ins should be able to update the mouse cursor
    https://bugs.webkit.org/show_bug.cgi?id=50399
    
    Reviewed by Sam Weinig.
    
    WebKit2:
    
    Call WKEnableSettingCursorWhenInBackground.
    
    * PluginProcess/mac/PluginProcessMainMac.mm:
    (WebKit::PluginProcessMain):
    
    WebKitLibraries:
    
    Add WKEnableSettingCursorWhenInBackground.
    
    * WebKitSystemInterface.h:
    * libWebKitSystemInterfaceLeopard.a:
    * libWebKitSystemInterfaceSnowLeopard.a:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73159 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index fc0584f..5b1e2f5 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,15 @@
+2010-12-02  Anders Carlsson  <andersca at apple.com>
+
+        Reviewed by Sam Weinig.
+
+        Plug-ins should be able to update the mouse cursor
+        https://bugs.webkit.org/show_bug.cgi?id=50399
+
+        Call WKEnableSettingCursorWhenInBackground.
+
+        * PluginProcess/mac/PluginProcessMainMac.mm:
+        (WebKit::PluginProcessMain):
+
 2010-12-02  Sam Weinig  <sam at webkit.org>
 
         Reviewed by Anders Carlsson.
diff --git a/WebKit2/PluginProcess/mac/PluginProcessMainMac.mm b/WebKit2/PluginProcess/mac/PluginProcessMainMac.mm
index 48b2f69..36cc2a1 100644
--- a/WebKit2/PluginProcess/mac/PluginProcessMainMac.mm
+++ b/WebKit2/PluginProcess/mac/PluginProcessMainMac.mm
@@ -34,6 +34,7 @@
 #include <servers/bootstrap.h>
 #include <wtf/text/CString.h>
 #include <wtf/text/WTFString.h>
+#include <WebKitSystemInterface.h>
 
 // FIXME: We should be doing this another way.
 extern "C" kern_return_t bootstrap_look_up2(mach_port_t, const name_t, mach_port_t*, pid_t, uint64_t);
@@ -71,6 +72,10 @@ int PluginProcessMain(const CommandLine& commandLine)
     signal(SIGSEGV, _exit);
 #endif
 
+    // FIXME: It would be better to proxy set cursor calls over to the UI process instead of
+    // allowing plug-ins to change the mouse cursor at any time.
+    WKEnableSettingCursorWhenInBackground();
+
     JSC::initializeThreading();
     WTF::initializeMainThread();
     RunLoop::initializeMainRunLoop();
diff --git a/WebKitLibraries/ChangeLog b/WebKitLibraries/ChangeLog
index 60cb1f6..34e4e6d 100644
--- a/WebKitLibraries/ChangeLog
+++ b/WebKitLibraries/ChangeLog
@@ -1,3 +1,16 @@
+2010-12-02  Anders Carlsson  <andersca at apple.com>
+
+        Reviewed by Sam Weinig.
+
+        Plug-ins should be able to update the mouse cursor
+        https://bugs.webkit.org/show_bug.cgi?id=50399
+
+        Add WKEnableSettingCursorWhenInBackground.
+
+        * WebKitSystemInterface.h:
+        * libWebKitSystemInterfaceLeopard.a:
+        * libWebKitSystemInterfaceSnowLeopard.a:
+
 2010-12-01  Adam Roben  <aroben at apple.com>
 
         Don't let harmless errorlevels from the "set" utility leak into
diff --git a/WebKitLibraries/WebKitSystemInterface.h b/WebKitLibraries/WebKitSystemInterface.h
index d135304..f2f00fe 100644
--- a/WebKitLibraries/WebKitSystemInterface.h
+++ b/WebKitLibraries/WebKitSystemInterface.h
@@ -330,6 +330,8 @@ void WKWindowSetScaledFrame(NSWindow *window, NSRect scaleFrame, NSRect nonScale
 
 #if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
 void WKSyncSurfaceToView(NSView *view);
+
+void WKEnableSettingCursorWhenInBackground(void);
 #endif
 
 #if defined(BUILDING_ON_TIGER) || defined(BUILDING_ON_LEOPARD) || defined(BUILDING_ON_SNOW_LEOPARD)
diff --git a/WebKitLibraries/libWebKitSystemInterfaceLeopard.a b/WebKitLibraries/libWebKitSystemInterfaceLeopard.a
index 678342a..cdee8a3 100644
Binary files a/WebKitLibraries/libWebKitSystemInterfaceLeopard.a and b/WebKitLibraries/libWebKitSystemInterfaceLeopard.a differ
diff --git a/WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a b/WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a
index 1f82d39..2541fd7 100644
Binary files a/WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a and b/WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a differ

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list