Changeset 160128 in webkit


Ignore:
Timestamp:
Dec 4, 2013 2:42:46 PM (10 years ago)
Author:
commit-queue@webkit.org
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 <​nick.yamane@openbossa.org> 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 <​nick.yamane@openbossa.org> 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.

Location:
trunk
Files:
14 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit2/ChangeLog

    r160125 r160128  
     12013-12-04  Nick Diego Yamane  <nick.yamane@openbossa.org>
     2
     3        [EFL][GTK][WK2] Remove unnecessary reinterpret_casts when setting API clients
     4        https://bugs.webkit.org/show_bug.cgi?id=125231
     5
     6        Reviewed by Anders Carlsson.
     7
     8        After r159988, WKClients have to be instantiated with a specific
     9        version of that client and its Base field has to used when setting it.
     10        Eg:
     11
     12            WKFullScreenClientV0 wkClient = {
     13                {
     14                    0, // version
     15                    this, // clientInfo
     16                },
     17                    willEnterFullScreen,
     18                    willExitFullScreen
     19            };
     20            WKViewSetFullScreenClientGtk(this, &wkClient.base);
     21
     22        So we don't need the reinterpret_casts introduced in r160075.
     23
     24        * UIProcess/API/gtk/WebKitFullscreenClient.cpp:
     25        (attachFullScreenClientToView): reinterpret_cast<WKFooClientBase*>(&client) -> &client.base
     26        * UIProcess/API/gtk/WebKitRequestManagerClient.cpp:
     27        (attachRequestManagerClientToContext): Ditto.
     28        * UIProcess/API/gtk/WebKitTextChecker.cpp:
     29        (WebKitTextChecker::WebKitTextChecker): Ditto.
     30        * UIProcess/API/gtk/WebKitWebInspector.cpp:
     31        (webkitWebInspectorCreate): Ditto.
     32        * UIProcess/efl/BatteryProvider.cpp:
     33        (BatteryProvider::BatteryProvider): Ditto.
     34        * UIProcess/efl/NetworkInfoProvider.cpp:
     35        (NetworkInfoProvider::NetworkInfoProvider): Ditto.
     36        * UIProcess/efl/PageUIClientEfl.cpp:
     37        (WebKit::PageUIClientEfl::PageUIClientEfl): Ditto.
     38        * UIProcess/efl/RequestManagerClientEfl.cpp:
     39        (WebKit::RequestManagerClientEfl::RequestManagerClientEfl): Ditto.
     40        * UIProcess/efl/TextCheckerClientEfl.cpp:
     41        (TextCheckerClientEfl::TextCheckerClientEfl): Ditto.
     42        * UIProcess/efl/VibrationClientEfl.cpp:
     43        (VibrationClientEfl::VibrationClientEfl): Ditto.
     44        * UIProcess/efl/ViewClientEfl.cpp:
     45        (WebKit::ViewClientEfl::ViewClientEfl): Ditto.
     46
    1472013-12-04  Nick Diego Yamane  <nick.yamane@openbossa.org>
    248

  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFullscreenClient.cpp

    r160075 r160128  
    4646        willExitFullScreen
    4747    };
    48     WKViewSetFullScreenClientGtk(toAPI(WEBKIT_WEB_VIEW_BASE(webView)), reinterpret_cast<WKFullScreenClientGtkBase*>(&wkFullScreenClient));
     48    WKViewSetFullScreenClientGtk(toAPI(WEBKIT_WEB_VIEW_BASE(webView)), &wkFullScreenClient.base);
    4949}
    5050

  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitRequestManagerClient.cpp

    r160075 r160128  
    4949        didFailToLoadURIRequest
    5050    };
    51     WKSoupRequestManagerSetClient(toAPI(webkitWebContextGetRequestManager(webContext)), reinterpret_cast<WKSoupRequestManagerClientBase*>(&wkRequestManagerClient));
     51    WKSoupRequestManagerSetClient(toAPI(webkitWebContextGetRequestManager(webContext)), &wkRequestManagerClient.base);
    5252}
    5353

  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitTextChecker.cpp

    r160075 r160128  
    108108        ignoreWordCallback,
    109109    };
    110     WKTextCheckerSetClient(reinterpret_cast<WKTextCheckerClientBase*>(&wkTextCheckerClient));
     110    WKTextCheckerSetClient(&wkTextCheckerClient.base);
    111111}
    112112

  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebInspector.cpp

    r160075 r160128  
    330330        didChangeAttachedHeight
    331331    };
    332     WKInspectorSetInspectorClientGtk(toAPI(webInspector), reinterpret_cast<WKInspectorClientGtkBase*>(&wkInspectorClientGtk));
     332    WKInspectorSetInspectorClientGtk(toAPI(webInspector), &wkInspectorClientGtk.base);
    333333
    334334    return inspector;

  • trunk/Source/WebKit2/UIProcess/efl/BatteryProvider.cpp

    r160075 r160128  
    7979    };
    8080
    81     WKBatteryManagerSetProvider(m_batteryManager.get(), reinterpret_cast<WKBatteryProviderBase*>(&wkBatteryProvider));
     81    WKBatteryManagerSetProvider(m_batteryManager.get(), &wkBatteryProvider.base);
    8282}
    8383

  • trunk/Source/WebKit2/UIProcess/efl/NetworkInfoProvider.cpp

    r160075 r160128  
    8383    };
    8484
    85     WKNetworkInfoManagerSetProvider(wkNetworkInfoManager, reinterpret_cast<WKNetworkInfoProviderBase*>(&wkNetworkInfoProvider));
     85    WKNetworkInfoManagerSetProvider(wkNetworkInfoManager, &wkNetworkInfoProvider.base);
    8686}
    8787

  • trunk/Source/WebKit2/UIProcess/efl/RequestManagerClientEfl.cpp

    r160075 r160128  
    7878    wkRequestManagerClient.didReceiveURIRequest = didReceiveURIRequest;
    7979
    80     WKSoupRequestManagerSetClient(m_soupRequestManager.get(), reinterpret_cast<WKSoupRequestManagerClientBase*>(&wkRequestManagerClient));
     80    WKSoupRequestManagerSetClient(m_soupRequestManager.get(), &wkRequestManagerClient.base);
    8181}
    8282

  • trunk/Source/WebKit2/UIProcess/efl/TextCheckerClientEfl.cpp

    r160075 r160128  
    7878        ignoreWordCallback
    7979    };
    80     WKTextCheckerSetClient(reinterpret_cast<WKTextCheckerClientBase*>(&wkTextCheckerClient));
     80    WKTextCheckerSetClient(&wkTextCheckerClient.base);
    8181}
    8282

  • trunk/Source/WebKit2/UIProcess/efl/VibrationClientEfl.cpp

    r160075 r160128  
    7070        cancelVibrationCallback
    7171    };
    72     WKVibrationSetProvider(wkVibration, reinterpret_cast<WKVibrationProviderBase*>(&wkVibrationProvider));
     72    WKVibrationSetProvider(wkVibration, &wkVibrationProvider.base);
    7373}
    7474

  • trunk/Source/WebKit2/UIProcess/efl/ViewClientEfl.cpp

    r160075 r160128  
    201201#endif
    202202
    203     WKViewSetViewClient(m_view->wkView(), reinterpret_cast<WKViewClientBase*>(&viewClient));
     203    WKViewSetViewClient(m_view->wkView(), &viewClient.base);
    204204}
    205205

  • trunk/Tools/ChangeLog

    r160124 r160128  
     12013-12-04  Nick Diego Yamane  <nick.yamane@openbossa.org>
     2
     3        [EFL][WK2] Buildfix after r160104
     4        https://bugs.webkit.org/show_bug.cgi?id=125231
     5
     6        Reviewed by Anders Carlsson.
     7
     8        * TestWebKitAPI/Tests/WebKit2/CoordinatedGraphics/WKViewIsActiveSetIsActive.cpp:
     9        (TestWebKitAPI::TEST): reinterpret_cast<WKFooClientBase*>(&client) -> &client.base
     10        * TestWebKitAPI/Tests/WebKit2/efl/WKViewClientWebProcessCallbacks.cpp:
     11        (TestWebKitAPI::setViewClient): Ditto.
     12
    1132013-12-04  Myles C. Maxfield  <mmaxfield@apple.com>
    214

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/CoordinatedGraphics/WKViewIsActiveSetIsActive.cpp

    r160107 r160128  
    9393    viewClient.webProcessCrashed = webProcessCrashed;
    9494    viewClient.webProcessDidRelaunch = webProcessRelaunched;
    95     WKViewSetViewClient(view.get(), reinterpret_cast<WKViewClientBase*>(&viewClient));
     95    WKViewSetViewClient(view.get(), &viewClient.base);
    9696
    9797    WKViewInitialize(view.get());

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/efl/WKViewClientWebProcessCallbacks.cpp

    r160107 r160128  
    9898    viewClient.webProcessDidRelaunch = webProcessDidRelaunch;
    9999
    100     WKViewSetViewClient(view, reinterpret_cast<WKViewClientBase*>(&viewClient));
     100    WKViewSetViewClient(view, &viewClient.base);
    101101}
    102102
Note: See TracChangeset for help on using the changeset viewer.