[webkit-changes] [160128] trunk

Wed, 04 Dec 2013 14:40:40 -0800

Title: [160128] trunk
Revision
160128
Author
[email protected]
Date
2013-12-04 14:42:46 -0800 (Wed, 04 Dec 2013)

Log Message

Source/WebKit2: [EFL][GTK][WK2] Remove unnecessary reinterpret_casts when setting API clients
https://bugs.webkit.org/show_bug.cgi?id=125231

Patch by Nick Diego Yamane <[email protected]> on 2013-12-04
Reviewed by Anders Carlsson.

After r159988, WKClients have to be instantiated with a specific
version of that client and its Base field has to used when setting it.
Eg:

    WKFullScreenClientV0 wkClient = {
        {
            0, // version
            this, // clientInfo
        },
            willEnterFullScreen,
            willExitFullScreen
    };
    WKViewSetFullScreenClientGtk(this, &wkClient.base);

So we don't need the reinterpret_casts introduced in r160075.

* UIProcess/API/gtk/WebKitFullscreenClient.cpp:
(attachFullScreenClientToView): reinterpret_cast<WKFooClientBase*>(&client) -> &client.base
* UIProcess/API/gtk/WebKitRequestManagerClient.cpp:
(attachRequestManagerClientToContext): Ditto.
* UIProcess/API/gtk/WebKitTextChecker.cpp:
(WebKitTextChecker::WebKitTextChecker): Ditto.
* UIProcess/API/gtk/WebKitWebInspector.cpp:
(webkitWebInspectorCreate): Ditto.
* UIProcess/efl/BatteryProvider.cpp:
(BatteryProvider::BatteryProvider): Ditto.
* UIProcess/efl/NetworkInfoProvider.cpp:
(NetworkInfoProvider::NetworkInfoProvider): Ditto.
* UIProcess/efl/PageUIClientEfl.cpp:
(WebKit::PageUIClientEfl::PageUIClientEfl): Ditto.
* UIProcess/efl/RequestManagerClientEfl.cpp:
(WebKit::RequestManagerClientEfl::RequestManagerClientEfl): Ditto.
* UIProcess/efl/TextCheckerClientEfl.cpp:
(TextCheckerClientEfl::TextCheckerClientEfl): Ditto.
* UIProcess/efl/VibrationClientEfl.cpp:
(VibrationClientEfl::VibrationClientEfl): Ditto.
* UIProcess/efl/ViewClientEfl.cpp:
(WebKit::ViewClientEfl::ViewClientEfl): Ditto.

Tools: [EFL][WK2] Buildfix after r160104
https://bugs.webkit.org/show_bug.cgi?id=125231

Patch by Nick Diego Yamane <[email protected]> on 2013-12-04
Reviewed by Anders Carlsson.

* TestWebKitAPI/Tests/WebKit2/CoordinatedGraphics/WKViewIsActiveSetIsActive.cpp:
(TestWebKitAPI::TEST): reinterpret_cast<WKFooClientBase*>(&client) -> &client.base
* TestWebKitAPI/Tests/WebKit2/efl/WKViewClientWebProcessCallbacks.cpp:
(TestWebKitAPI::setViewClient): Ditto.

Modified Paths

Diff

Modified: trunk/Source/WebKit2/ChangeLog (160127 => 160128)


--- trunk/Source/WebKit2/ChangeLog	2013-12-04 22:24:55 UTC (rev 160127)
+++ trunk/Source/WebKit2/ChangeLog	2013-12-04 22:42:46 UTC (rev 160128)
@@ -1,5 +1,51 @@
 2013-12-04  Nick Diego Yamane  <[email protected]>
 
+        [EFL][GTK][WK2] Remove unnecessary reinterpret_casts when setting API clients
+        https://bugs.webkit.org/show_bug.cgi?id=125231
+
+        Reviewed by Anders Carlsson.
+
+        After r159988, WKClients have to be instantiated with a specific
+        version of that client and its Base field has to used when setting it.
+        Eg:
+
+            WKFullScreenClientV0 wkClient = {
+                {
+                    0, // version
+                    this, // clientInfo
+                },
+                    willEnterFullScreen,
+                    willExitFullScreen
+            };
+            WKViewSetFullScreenClientGtk(this, &wkClient.base);
+
+        So we don't need the reinterpret_casts introduced in r160075.
+
+        * UIProcess/API/gtk/WebKitFullscreenClient.cpp:
+        (attachFullScreenClientToView): reinterpret_cast<WKFooClientBase*>(&client) -> &client.base
+        * UIProcess/API/gtk/WebKitRequestManagerClient.cpp:
+        (attachRequestManagerClientToContext): Ditto.
+        * UIProcess/API/gtk/WebKitTextChecker.cpp:
+        (WebKitTextChecker::WebKitTextChecker): Ditto.
+        * UIProcess/API/gtk/WebKitWebInspector.cpp:
+        (webkitWebInspectorCreate): Ditto.
+        * UIProcess/efl/BatteryProvider.cpp:
+        (BatteryProvider::BatteryProvider): Ditto.
+        * UIProcess/efl/NetworkInfoProvider.cpp:
+        (NetworkInfoProvider::NetworkInfoProvider): Ditto.
+        * UIProcess/efl/PageUIClientEfl.cpp:
+        (WebKit::PageUIClientEfl::PageUIClientEfl): Ditto.
+        * UIProcess/efl/RequestManagerClientEfl.cpp:
+        (WebKit::RequestManagerClientEfl::RequestManagerClientEfl): Ditto.
+        * UIProcess/efl/TextCheckerClientEfl.cpp:
+        (TextCheckerClientEfl::TextCheckerClientEfl): Ditto.
+        * UIProcess/efl/VibrationClientEfl.cpp:
+        (VibrationClientEfl::VibrationClientEfl): Ditto.
+        * UIProcess/efl/ViewClientEfl.cpp:
+        (WebKit::ViewClientEfl::ViewClientEfl): Ditto.
+
+2013-12-04  Nick Diego Yamane  <[email protected]>
+
         [GTK][WK2] Fix build after r160104
         https://bugs.webkit.org/show_bug.cgi?id=125240

Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFullscreenClient.cpp (160127 => 160128)


--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFullscreenClient.cpp	2013-12-04 22:24:55 UTC (rev 160127)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFullscreenClient.cpp	2013-12-04 22:42:46 UTC (rev 160128)
@@ -45,6 +45,6 @@
         willEnterFullScreen,
         willExitFullScreen
     };
-    WKViewSetFullScreenClientGtk(toAPI(WEBKIT_WEB_VIEW_BASE(webView)), reinterpret_cast<WKFullScreenClientGtkBase*>(&wkFullScreenClient));
+    WKViewSetFullScreenClientGtk(toAPI(WEBKIT_WEB_VIEW_BASE(webView)), &wkFullScreenClient.base);
 }

Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitRequestManagerClient.cpp (160127 => 160128)


--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitRequestManagerClient.cpp	2013-12-04 22:24:55 UTC (rev 160127)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitRequestManagerClient.cpp	2013-12-04 22:42:46 UTC (rev 160128)
@@ -48,6 +48,6 @@
         didReceiveURIRequest,
         didFailToLoadURIRequest
     };
-    WKSoupRequestManagerSetClient(toAPI(webkitWebContextGetRequestManager(webContext)), reinterpret_cast<WKSoupRequestManagerClientBase*>(&wkRequestManagerClient));
+    WKSoupRequestManagerSetClient(toAPI(webkitWebContextGetRequestManager(webContext)), &wkRequestManagerClient.base);
 }

Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitTextChecker.cpp (160127 => 160128)


--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitTextChecker.cpp	2013-12-04 22:24:55 UTC (rev 160127)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitTextChecker.cpp	2013-12-04 22:42:46 UTC (rev 160128)
@@ -107,7 +107,7 @@
         learnWordCallback,
         ignoreWordCallback,
     };
-    WKTextCheckerSetClient(reinterpret_cast<WKTextCheckerClientBase*>(&wkTextCheckerClient));
+    WKTextCheckerSetClient(&wkTextCheckerClient.base);
 }
 
 void WebKitTextChecker::checkSpellingOfString(const String& string, int& misspellingLocation, int& misspellingLength)

Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebInspector.cpp (160127 => 160128)


--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebInspector.cpp	2013-12-04 22:24:55 UTC (rev 160127)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebInspector.cpp	2013-12-04 22:42:46 UTC (rev 160128)
@@ -329,7 +329,7 @@
         detach,
         didChangeAttachedHeight
     };
-    WKInspectorSetInspectorClientGtk(toAPI(webInspector), reinterpret_cast<WKInspectorClientGtkBase*>(&wkInspectorClientGtk));
+    WKInspectorSetInspectorClientGtk(toAPI(webInspector), &wkInspectorClientGtk.base);
 
     return inspector;
 }

Modified: trunk/Source/WebKit2/UIProcess/efl/BatteryProvider.cpp (160127 => 160128)


--- trunk/Source/WebKit2/UIProcess/efl/BatteryProvider.cpp	2013-12-04 22:24:55 UTC (rev 160127)
+++ trunk/Source/WebKit2/UIProcess/efl/BatteryProvider.cpp	2013-12-04 22:42:46 UTC (rev 160128)
@@ -78,7 +78,7 @@
         stopUpdatingCallback
     };
 
-    WKBatteryManagerSetProvider(m_batteryManager.get(), reinterpret_cast<WKBatteryProviderBase*>(&wkBatteryProvider));
+    WKBatteryManagerSetProvider(m_batteryManager.get(), &wkBatteryProvider.base);
 }
 
 void BatteryProvider::startUpdating()

Modified: trunk/Source/WebKit2/UIProcess/efl/NetworkInfoProvider.cpp (160127 => 160128)


--- trunk/Source/WebKit2/UIProcess/efl/NetworkInfoProvider.cpp	2013-12-04 22:24:55 UTC (rev 160127)
+++ trunk/Source/WebKit2/UIProcess/efl/NetworkInfoProvider.cpp	2013-12-04 22:42:46 UTC (rev 160128)
@@ -82,7 +82,7 @@
         isMeteredCallback
     };
 
-    WKNetworkInfoManagerSetProvider(wkNetworkInfoManager, reinterpret_cast<WKNetworkInfoProviderBase*>(&wkNetworkInfoProvider));
+    WKNetworkInfoManagerSetProvider(wkNetworkInfoManager, &wkNetworkInfoProvider.base);
 }
 
 NetworkInfoProvider::~NetworkInfoProvider()

Modified: trunk/Source/WebKit2/UIProcess/efl/RequestManagerClientEfl.cpp (160127 => 160128)


--- trunk/Source/WebKit2/UIProcess/efl/RequestManagerClientEfl.cpp	2013-12-04 22:24:55 UTC (rev 160127)
+++ trunk/Source/WebKit2/UIProcess/efl/RequestManagerClientEfl.cpp	2013-12-04 22:42:46 UTC (rev 160128)
@@ -77,7 +77,7 @@
     wkRequestManagerClient.base.clientInfo = this;
     wkRequestManagerClient.didReceiveURIRequest = didReceiveURIRequest;
 
-    WKSoupRequestManagerSetClient(m_soupRequestManager.get(), reinterpret_cast<WKSoupRequestManagerClientBase*>(&wkRequestManagerClient));
+    WKSoupRequestManagerSetClient(m_soupRequestManager.get(), &wkRequestManagerClient.base);
 }
 
 RequestManagerClientEfl::~RequestManagerClientEfl()

Modified: trunk/Source/WebKit2/UIProcess/efl/TextCheckerClientEfl.cpp (160127 => 160128)


--- trunk/Source/WebKit2/UIProcess/efl/TextCheckerClientEfl.cpp	2013-12-04 22:24:55 UTC (rev 160127)
+++ trunk/Source/WebKit2/UIProcess/efl/TextCheckerClientEfl.cpp	2013-12-04 22:42:46 UTC (rev 160128)
@@ -77,7 +77,7 @@
         learnWordCallback,
         ignoreWordCallback
     };
-    WKTextCheckerSetClient(reinterpret_cast<WKTextCheckerClientBase*>(&wkTextCheckerClient));
+    WKTextCheckerSetClient(&wkTextCheckerClient.base);
 }
 
 TextCheckerClientEfl& TextCheckerClientEfl::instance()

Modified: trunk/Source/WebKit2/UIProcess/efl/VibrationClientEfl.cpp (160127 => 160128)


--- trunk/Source/WebKit2/UIProcess/efl/VibrationClientEfl.cpp	2013-12-04 22:24:55 UTC (rev 160127)
+++ trunk/Source/WebKit2/UIProcess/efl/VibrationClientEfl.cpp	2013-12-04 22:42:46 UTC (rev 160128)
@@ -69,7 +69,7 @@
         vibrateCallback,
         cancelVibrationCallback
     };
-    WKVibrationSetProvider(wkVibration, reinterpret_cast<WKVibrationProviderBase*>(&wkVibrationProvider));
+    WKVibrationSetProvider(wkVibration, &wkVibrationProvider.base);
 }
 
 VibrationClientEfl::~VibrationClientEfl()

Modified: trunk/Source/WebKit2/UIProcess/efl/ViewClientEfl.cpp (160127 => 160128)


--- trunk/Source/WebKit2/UIProcess/efl/ViewClientEfl.cpp	2013-12-04 22:24:55 UTC (rev 160127)
+++ trunk/Source/WebKit2/UIProcess/efl/ViewClientEfl.cpp	2013-12-04 22:42:46 UTC (rev 160128)
@@ -200,7 +200,7 @@
     viewClient.doneWithTouchEvent = doneWithTouchEvent;
 #endif
 
-    WKViewSetViewClient(m_view->wkView(), reinterpret_cast<WKViewClientBase*>(&viewClient));
+    WKViewSetViewClient(m_view->wkView(), &viewClient.base);
 }
 
 ViewClientEfl::~ViewClientEfl()

Modified: trunk/Tools/ChangeLog (160127 => 160128)


--- trunk/Tools/ChangeLog	2013-12-04 22:24:55 UTC (rev 160127)
+++ trunk/Tools/ChangeLog	2013-12-04 22:42:46 UTC (rev 160128)
@@ -1,3 +1,15 @@
+2013-12-04  Nick Diego Yamane  <[email protected]>
+
+        [EFL][WK2] Buildfix after r160104
+        https://bugs.webkit.org/show_bug.cgi?id=125231
+
+        Reviewed by Anders Carlsson.
+
+        * TestWebKitAPI/Tests/WebKit2/CoordinatedGraphics/WKViewIsActiveSetIsActive.cpp:
+        (TestWebKitAPI::TEST): reinterpret_cast<WKFooClientBase*>(&client) -> &client.base
+        * TestWebKitAPI/Tests/WebKit2/efl/WKViewClientWebProcessCallbacks.cpp:
+        (TestWebKitAPI::setViewClient): Ditto.
+
 2013-12-04  Myles C. Maxfield  <[email protected]>
 
         check-webkit-style detected some ternary statements as initialization lists

Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2/CoordinatedGraphics/WKViewIsActiveSetIsActive.cpp (160127 => 160128)


--- trunk/Tools/TestWebKitAPI/Tests/WebKit2/CoordinatedGraphics/WKViewIsActiveSetIsActive.cpp	2013-12-04 22:24:55 UTC (rev 160127)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2/CoordinatedGraphics/WKViewIsActiveSetIsActive.cpp	2013-12-04 22:42:46 UTC (rev 160128)
@@ -92,7 +92,7 @@
     viewClient.base.version = 0;
     viewClient.webProcessCrashed = webProcessCrashed;
     viewClient.webProcessDidRelaunch = webProcessRelaunched;
-    WKViewSetViewClient(view.get(), reinterpret_cast<WKViewClientBase*>(&viewClient));
+    WKViewSetViewClient(view.get(), &viewClient.base);
 
     WKViewInitialize(view.get());

Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2/efl/WKViewClientWebProcessCallbacks.cpp (160127 => 160128)


--- trunk/Tools/TestWebKitAPI/Tests/WebKit2/efl/WKViewClientWebProcessCallbacks.cpp	2013-12-04 22:24:55 UTC (rev 160127)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2/efl/WKViewClientWebProcessCallbacks.cpp	2013-12-04 22:42:46 UTC (rev 160128)
@@ -97,7 +97,7 @@
     viewClient.webProcessCrashed = webProcessCrashed;
     viewClient.webProcessDidRelaunch = webProcessDidRelaunch;
 
-    WKViewSetViewClient(view, reinterpret_cast<WKViewClientBase*>(&viewClient));
+    WKViewSetViewClient(view, &viewClient.base);
 }
 
 TEST(WebKit2, WKViewClientWebProcessCallbacks)

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to