2010-07-22 Balazs Kelemen <kb@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): Canonical link: https://commits.webkit.org/54730@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@63893 268f45cc-cd09-0410-ab3c-d52691b4dbfc
WebKit · Jul 22, 2010 · a9ef2ba36329f1581815885aecf6c021b9ab7552 · a9ef2ba
1 parent c679e36
commit a9ef2ba36329f1581815885aecf6c021b9ab7552
Showing with 20 additions and 0 deletions.

+14 −0 WebKit2/ChangeLog

+2 −0 WebKit2/Shared/WebCoreArgumentCoders.h

+2 −0 WebKit2/UIProcess/WebPageProxy.cpp

+2 −0 WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
@@ -1,3 +1,17 @@
+2010-07-22  Balazs Kelemen  <kb@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@apple.com>
 
         Build fix. Unreviewed.

diff --git 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
@@ -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
@@ -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*)