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

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 9bfb32c0336b0009f4d12f38cff64c41df5415d9
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jul 22 15:03:51 2010 +0000

    2010-07-22  Balazs Kelemen  <kb at inf.u-szeged.hu>
    
            Reviewed by Antonio Gomes.
    
            Lazy cursor creation should be guarded by #if USE(LAZY_NATIVE_CURSOR) in WebKit2
    
            https://bugs.webkit.org/show_bug.cgi?id=42622
    
            * Shared/WebCoreArgumentCoders.h:
            * UIProcess/WebPageProxy.cpp:
            (WebKit::WebPageProxy::didReceiveMessage):
            * WebProcess/WebCoreSupport/WebChromeClient.cpp:
            (WebKit::WebChromeClient::setCursor):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63893 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 2056843..40e904c 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,17 @@
+2010-07-22  Balazs Kelemen  <kb at inf.u-szeged.hu>
+
+        Reviewed by Antonio Gomes.
+
+        Lazy cursor creation should be guarded by #if USE(LAZY_NATIVE_CURSOR) in WebKit2
+
+        https://bugs.webkit.org/show_bug.cgi?id=42622
+
+        * Shared/WebCoreArgumentCoders.h:
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::didReceiveMessage):
+        * WebProcess/WebCoreSupport/WebChromeClient.cpp:
+        (WebKit::WebChromeClient::setCursor):
+
 2010-07-22  Jon Honeycutt  <jhoneycutt at apple.com>
 
         Build fix. Unreviewed.
diff --git a/WebKit2/Shared/WebCoreArgumentCoders.h b/WebKit2/Shared/WebCoreArgumentCoders.h
index 89dd5f9..fb5d18e 100644
--- a/WebKit2/Shared/WebCoreArgumentCoders.h
+++ b/WebKit2/Shared/WebCoreArgumentCoders.h
@@ -111,6 +111,7 @@ template<> struct ArgumentCoder<WebCore::PluginInfo> {
     }
 };
 
+#if USE(LAZY_NATIVE_CURSOR)
 template<> struct ArgumentCoder<WebCore::Cursor> {
     static void encode(ArgumentEncoder* encoder, const WebCore::Cursor& cursor)
     {
@@ -134,6 +135,7 @@ template<> struct ArgumentCoder<WebCore::Cursor> {
         return true;
     }
 };
+#endif
 
 } // namespace CoreIPC
 
diff --git a/WebKit2/UIProcess/WebPageProxy.cpp b/WebKit2/UIProcess/WebPageProxy.cpp
index 010f993..d065437 100644
--- a/WebKit2/UIProcess/WebPageProxy.cpp
+++ b/WebKit2/UIProcess/WebPageProxy.cpp
@@ -555,10 +555,12 @@ void WebPageProxy::didReceiveMessage(CoreIPC::Connection* connection, CoreIPC::M
             break;
         }
         case WebPageProxyMessage::SetCursor: {
+#if USE(LAZY_NATIVE_CURSOR)
             Cursor cursor;
             if (!arguments.decode(cursor))
                 return;
             setCursor(cursor);
+#endif
             break;
         }
         case WebPageProxyMessage::ShowPage: {
diff --git a/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp b/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp
index b17810a..848071a 100644
--- a/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp
+++ b/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp
@@ -435,7 +435,9 @@ void WebChromeClient::chooseIconForFiles(const Vector<String>&, FileChooser*)
 
 void WebChromeClient::setCursor(const Cursor& cursor)
 {
+#if USE(LAZY_NATIVE_CURSOR)
     WebProcess::shared().connection()->send(WebPageProxyMessage::SetCursor, m_page->pageID(), CoreIPC::In(cursor));
+#endif
 }
 
 void WebChromeClient::formStateDidChange(const Node*)

-- 
WebKit Debian packaging