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

[simon.fraser at apple.com]

The following commit has been merged in the webkit-1.2 branch:
commit 8b6dd0f99f5c0a77caea385ce08b4c1e3b5a4ff8
Author: simon.fraser at apple.com <simon.fraser at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Mar 9 01:47:33 2010 +0000

    2010-03-08  Simon Fraser  <simon.fraser at apple.com>
    
            Reviewed by Mark Rowe.
    
            Move the new method to the end of the MIG definitions file, to avoid breaking
            compatibility between WebKit and older versions of WebKitPluginHost.
    
            * Plugins/Hosted/WebKitPluginHost.defs:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55703 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index 401ac4c..b976a0c 100644
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -1,5 +1,14 @@
 2010-03-08  Simon Fraser  <simon.fraser at apple.com>
 
+        Reviewed by Mark Rowe.
+
+        Move the new method to the end of the MIG definitions file, to avoid breaking
+        compatibility between WebKit and older versions of WebKitPluginHost.
+
+        * Plugins/Hosted/WebKitPluginHost.defs:
+
+2010-03-08  Simon Fraser  <simon.fraser at apple.com>
+
         Reviewed by Kevin Decker.
 
         <rdar://problem/7714340> Need to grab image snapshot of Core Animation plugins
diff --git a/WebKit/mac/Plugins/Hosted/WebKitPluginHost.defs b/WebKit/mac/Plugins/Hosted/WebKitPluginHost.defs
index e1092b2..5d9df45 100644
--- a/WebKit/mac/Plugins/Hosted/WebKitPluginHost.defs
+++ b/WebKit/mac/Plugins/Hosted/WebKitPluginHost.defs
@@ -125,12 +125,6 @@ simpleroutine PHPluginInstancePrint(pluginHostPort :mach_port_t;
                                     width :uint32_t;
                                     height :uint32_t);
 
-simpleroutine PHPluginInstanceSnapshot(pluginHostPort :mach_port_t;
-                                    pluginID :uint32_t;
-                                    requestID :uint32_t;
-                                    width :uint32_t;
-                                    height :uint32_t);
-
 simpleroutine PHDestroyPluginInstance(pluginHostPort :mach_port_t;
                                     pluginID :uint32_t;
                                     requestID :uint32_t);
@@ -248,3 +242,9 @@ simpleroutine PHPluginInstancePrivateBrowsingModeDidChange(pluginHostPort :mach_
 
 simpleroutine PHSyncOpenPanelReply(pluginHostPort :mach_port_t;
                                    filenames :data_t);
+
+simpleroutine PHPluginInstanceSnapshot(pluginHostPort :mach_port_t;
+                                    pluginID :uint32_t;
+                                    requestID :uint32_t;
+                                    width :uint32_t;
+                                    height :uint32_t);

-- 
WebKit Debian packaging