Changeset 63893 in webkit

Timestamp:

Jul 22, 2010 8:03:51 AM (14 years ago)

Author:

commit-queue@webkit.org

Message:

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):

Location:

trunk/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Shared/WebCoreArgumentCoders.h (modified) (2 diffs)
• UIProcess/WebPageProxy.cpp (modified) (1 diff)
• WebProcess/WebCoreSupport/WebChromeClient.cpp (modified) (1 diff)

trunk/WebKit2/ChangeLog

@@ +1 @@
+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>
 

trunk/WebKit2/Shared/WebCoreArgumentCoders.h

@@ -112 +112 @@
 };
 
+#if USE(LAZY_NATIVE_CURSOR)
 template<> struct ArgumentCoder<WebCore::Cursor> {
     static void encode(ArgumentEncoder* encoder, const WebCore::Cursor& cursor)
@@ -135 +136 @@
     }
 };
+#endif
 
 } // namespace CoreIPC

trunk/WebKit2/UIProcess/WebPageProxy.cpp

@@ -556 +556 @@
         }
         case WebPageProxyMessage::SetCursor: {
+#if USE(LAZY_NATIVE_CURSOR)
             Cursor cursor;
             if (!arguments.decode(cursor))
                 return;
             setCursor(cursor);
+#endif
             break;
         }

trunk/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp

@@ -436 +436 @@
 void WebChromeClient::setCursor(const Cursor& cursor)
 {
+#if USE(LAZY_NATIVE_CURSOR)
     WebProcess::shared().connection()->send(WebPageProxyMessage::SetCursor, m_page->pageID(), CoreIPC::In(cursor));
+#endif
 }