Changeset 159994 in webkit


Ignore:
Timestamp:
Dec 3, 2013 12:01:17 AM (10 years ago)
Author:
zandobersek@gmail.com
Message:

Build fixes for GCC-using ports after r159965 and later
​https://bugs.webkit.org/show_bug.cgi?id=125136

GCC doesn't process API::ClientTraits template instantiations unless they're done
inside the API namespace.

  • Shared/WebConnectionClient.h:
  • UIProcess/Notifications/WebNotificationProvider.h:
  • UIProcess/WebContextClient.h:
  • UIProcess/WebContextConnectionClient.h:
  • UIProcess/WebContextInjectedBundleClient.h:
  • UIProcess/WebCookieManagerProxyClient.h:
  • UIProcess/WebDatabaseManagerProxyClient.h:
  • UIProcess/WebDownloadClient.h:
  • UIProcess/WebFindClient.h:
  • UIProcess/WebFormClient.h:
  • UIProcess/WebGeolocationProvider.h:
  • UIProcess/WebHistoryClient.h:
  • UIProcess/WebIconDatabaseClient.h:
  • UIProcess/WebLoaderClient.h:
  • UIProcess/WebOriginDataManagerProxyChangeClient.h:
  • UIProcess/WebPageContextMenuClient.h:
  • UIProcess/WebPolicyClient.h:
  • UIProcess/WebUIClient.h:
  • WebProcess/InjectedBundle/InjectedBundleClient.h:
  • WebProcess/InjectedBundle/InjectedBundlePageContextMenuClient.h:
  • WebProcess/InjectedBundle/InjectedBundlePageDiagnosticLoggingClient.h:
  • WebProcess/InjectedBundle/InjectedBundlePageEditorClient.h:
  • WebProcess/InjectedBundle/InjectedBundlePageFormClient.h:
  • WebProcess/InjectedBundle/InjectedBundlePageFullScreenClient.h:
  • WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.h:
  • WebProcess/InjectedBundle/InjectedBundlePagePolicyClient.h:
  • WebProcess/InjectedBundle/InjectedBundlePageResourceLoadClient.h:
  • WebProcess/InjectedBundle/InjectedBundlePageUIClient.h:
Location:
trunk/Source/WebKit2
Files:
29 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit2/ChangeLog

    r159993 r159994  
     12013-12-02  Zan Dobersek  <zdobersek@igalia.com>
     2
     3        Build fixes for GCC-using ports after r159965 and later
     4        https://bugs.webkit.org/show_bug.cgi?id=125136
     5
     6        GCC doesn't process API::ClientTraits template instantiations unless they're done
     7        inside the API namespace.
     8
     9        * Shared/WebConnectionClient.h:
     10        * UIProcess/Notifications/WebNotificationProvider.h:
     11        * UIProcess/WebContextClient.h:
     12        * UIProcess/WebContextConnectionClient.h:
     13        * UIProcess/WebContextInjectedBundleClient.h:
     14        * UIProcess/WebCookieManagerProxyClient.h:
     15        * UIProcess/WebDatabaseManagerProxyClient.h:
     16        * UIProcess/WebDownloadClient.h:
     17        * UIProcess/WebFindClient.h:
     18        * UIProcess/WebFormClient.h:
     19        * UIProcess/WebGeolocationProvider.h:
     20        * UIProcess/WebHistoryClient.h:
     21        * UIProcess/WebIconDatabaseClient.h:
     22        * UIProcess/WebLoaderClient.h:
     23        * UIProcess/WebOriginDataManagerProxyChangeClient.h:
     24        * UIProcess/WebPageContextMenuClient.h:
     25        * UIProcess/WebPolicyClient.h:
     26        * UIProcess/WebUIClient.h:
     27        * WebProcess/InjectedBundle/InjectedBundleClient.h:
     28        * WebProcess/InjectedBundle/InjectedBundlePageContextMenuClient.h:
     29        * WebProcess/InjectedBundle/InjectedBundlePageDiagnosticLoggingClient.h:
     30        * WebProcess/InjectedBundle/InjectedBundlePageEditorClient.h:
     31        * WebProcess/InjectedBundle/InjectedBundlePageFormClient.h:
     32        * WebProcess/InjectedBundle/InjectedBundlePageFullScreenClient.h:
     33        * WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.h:
     34        * WebProcess/InjectedBundle/InjectedBundlePagePolicyClient.h:
     35        * WebProcess/InjectedBundle/InjectedBundlePageResourceLoadClient.h:
     36        * WebProcess/InjectedBundle/InjectedBundlePageUIClient.h:
     37
    1382013-12-02  Dan Bernstein  <mitz@apple.com>
    239

  • trunk/Source/WebKit2/Shared/WebConnectionClient.h

    r159988 r159994  
    3131#include <wtf/Forward.h>
    3232
    33 template<> struct API::ClientTraits<WKConnectionClientBase> {
     33namespace API {
     34class Object;
     35
     36template<> struct ClientTraits<WKConnectionClientBase> {
    3437    typedef std::tuple<WKConnectionClientV0> Versions;
    3538};
    36 
    37 namespace API {
    38 class Object;
    3939}
    4040

  • trunk/Source/WebKit2/UIProcess/Notifications/WebNotificationProvider.h

    r159988 r159994  
    3232#include <wtf/Vector.h>
    3333
    34 template<> struct API::ClientTraits<WKNotificationProviderBase> {
     34namespace API {
     35template<> struct ClientTraits<WKNotificationProviderBase> {
    3536    typedef std::tuple<WKNotificationProviderV0> Versions;
    3637};
     38}
    3739
    3840namespace WebKit {

  • trunk/Source/WebKit2/UIProcess/WebContextClient.h

    r159988 r159994  
    3030#include "WKContext.h"
    3131
    32 template<> struct API::ClientTraits<WKContextClientBase> {
     32namespace API {
     33class Array;
     34
     35template<> struct ClientTraits<WKContextClientBase> {
    3336    typedef std::tuple<WKContextClientV0> Versions;
    3437};
    35 
    36 namespace API {
    37 class Array;
    3838}
    3939

  • trunk/Source/WebKit2/UIProcess/WebContextConnectionClient.h

    r159988 r159994  
    3030#include "WKContext.h"
    3131
    32 template<> struct API::ClientTraits<WKContextConnectionClientBase> {
     32namespace API {
     33template<> struct ClientTraits<WKContextConnectionClientBase> {
    3334    typedef std::tuple<WKContextConnectionClientV0> Versions;
    3435};
     36}
    3537
    3638namespace WebKit {

  • trunk/Source/WebKit2/UIProcess/WebContextInjectedBundleClient.h

    r159988 r159994  
    3131#include <wtf/Forward.h>
    3232
    33 template<> struct API::ClientTraits<WKContextInjectedBundleClientBase> {
     33namespace API {
     34class Object;
     35
     36template<> struct ClientTraits<WKContextInjectedBundleClientBase> {
    3437    typedef std::tuple<WKContextInjectedBundleClientV0, WKContextInjectedBundleClientV1> Versions;
    3538};
    36 
    37 namespace API {
    38 class Object;
    3939}
    4040

  • trunk/Source/WebKit2/UIProcess/WebCookieManagerProxyClient.h

    r159988 r159994  
    3131#include <wtf/Forward.h>
    3232
    33 template<> struct API::ClientTraits<WKCookieManagerClientBase> {
     33namespace API {
     34template<> struct ClientTraits<WKCookieManagerClientBase> {
    3435    typedef std::tuple<WKCookieManagerClientV0> Versions;
    3536};
     37}
    3638
    3739namespace WebKit {

  • trunk/Source/WebKit2/UIProcess/WebDatabaseManagerProxyClient.h

    r159988 r159994  
    3131#include <wtf/Forward.h>
    3232
    33 template<> struct API::ClientTraits<WKDatabaseManagerClientBase> {
     33namespace API {
     34template<> struct ClientTraits<WKDatabaseManagerClientBase> {
    3435    typedef std::tuple<WKDatabaseManagerClientV0> Versions;
    3536};
     37}
    3638
    3739namespace WebKit {

  • trunk/Source/WebKit2/UIProcess/WebDownloadClient.h

    r159988 r159994  
    3131#include <wtf/Forward.h>
    3232
    33 template<> struct API::ClientTraits<WKContextDownloadClientBase> {
     33namespace API {
     34template<> struct ClientTraits<WKContextDownloadClientBase> {
    3435    typedef std::tuple<WKContextDownloadClientV0> Versions;
    3536};
     37}
    3638
    3739namespace WebCore {

  • trunk/Source/WebKit2/UIProcess/WebFindClient.h

    r159988 r159994  
    3131#include <wtf/Forward.h>
    3232
    33 template<> struct API::ClientTraits<WKPageFindClientBase> {
     33namespace API {
     34class Array;
     35
     36template<> struct ClientTraits<WKPageFindClientBase> {
    3437    typedef std::tuple<WKPageFindClientV0> Versions;
    3538};
    3639
    37 template<> struct API::ClientTraits<WKPageFindMatchesClientBase> {
     40template<> struct ClientTraits<WKPageFindMatchesClientBase> {
    3841    typedef std::tuple<WKPageFindMatchesClientV0> Versions;
    3942};
    40 
    41 namespace API {
    42 class Array;
    4343}
    4444

  • trunk/Source/WebKit2/UIProcess/WebFormClient.h

    r159988 r159994  
    3333#include <wtf/Vector.h>
    3434
    35 template<> struct API::ClientTraits<WKPageFormClientBase> {
     35namespace API {
     36class Object;
     37
     38template<> struct ClientTraits<WKPageFormClientBase> {
    3639    typedef std::tuple<WKPageFormClientV0> Versions;
    3740};
    38 
    39 namespace API {
    40 class Object;
    4141}
    4242

  • trunk/Source/WebKit2/UIProcess/WebGeolocationProvider.h

    r159988 r159994  
    3131#include <wtf/Forward.h>
    3232
    33 template<> struct API::ClientTraits<WKGeolocationProviderBase> {
     33namespace API {
     34template<> struct ClientTraits<WKGeolocationProviderBase> {
    3435    typedef std::tuple<WKGeolocationProviderV0, WKGeolocationProviderV1> Versions;
    3536};
     37}
    3638
    3739namespace WebKit {

  • trunk/Source/WebKit2/UIProcess/WebHistoryClient.h

    r159988 r159994  
    3131#include <wtf/Forward.h>
    3232
    33 template<> struct API::ClientTraits<WKContextHistoryClientBase> {
     33namespace API {
     34template<> struct ClientTraits<WKContextHistoryClientBase> {
    3435    typedef std::tuple<WKContextHistoryClientV0> Versions;
    3536};
     37}
    3638
    3739namespace WebKit {

  • trunk/Source/WebKit2/UIProcess/WebIconDatabaseClient.h

    r159988 r159994  
    3030#include "WKIconDatabase.h"
    3131
    32 template<> struct API::ClientTraits<WKIconDatabaseClientBase> {
     32namespace API {
     33template<> struct ClientTraits<WKIconDatabaseClientBase> {
    3334    typedef std::tuple<WKIconDatabaseClientV0, WKIconDatabaseClientV1> Versions;
    3435};
     36}
    3537
    3638namespace WebKit {

  • trunk/Source/WebKit2/UIProcess/WebLoaderClient.h

    r159988 r159994  
    3636#include <wtf/Vector.h>
    3737
    38 template<> struct API::ClientTraits<WKPageLoaderClientBase> {
     38namespace API {
     39class Object;
     40
     41template<> struct ClientTraits<WKPageLoaderClientBase> {
    3942    typedef std::tuple<WKPageLoaderClientV0, WKPageLoaderClientV1, WKPageLoaderClientV2, WKPageLoaderClientV3> Versions;
    4043};
    41 
    42 namespace API {
    43 class Object;
    4444}
    4545

  • trunk/Source/WebKit2/UIProcess/WebOriginDataManagerProxyChangeClient.h

    r159988 r159994  
    3131#include <wtf/Forward.h>
    3232
    33 template<> struct API::ClientTraits<WKOriginDataManagerChangeClientBase> {
     33namespace API {
     34template<> struct ClientTraits<WKOriginDataManagerChangeClientBase> {
    3435    typedef std::tuple<WKOriginDataManagerChangeClientV0> Versions;
    3536};
     37}
    3638
    3739namespace WebKit {

  • trunk/Source/WebKit2/UIProcess/WebPageContextMenuClient.h

    r159988 r159994  
    3535#include <wtf/Vector.h>
    3636
    37 template<> struct API::ClientTraits<WKPageContextMenuClientBase> {
     37namespace API {
     38template<> struct ClientTraits<WKPageContextMenuClientBase> {
    3839    typedef std::tuple<WKPageContextMenuClientV0, WKPageContextMenuClientV1, WKPageContextMenuClientV2, WKPageContextMenuClientV3> Versions;
    3940};
     41}
    4042
    4143namespace WebKit {

  • trunk/Source/WebKit2/UIProcess/WebPolicyClient.h

    r159988 r159994  
    3333#include <wtf/Forward.h>
    3434
    35 template<> struct API::ClientTraits<WKPagePolicyClientBase> {
     35namespace API {
     36class Object;
     37
     38template<> struct ClientTraits<WKPagePolicyClientBase> {
    3639    typedef std::tuple<WKPagePolicyClientV0, WKPagePolicyClientV1> Versions;
    3740};
    38 
    39 namespace API {
    40 class Object;
    4141}
    4242

  • trunk/Source/WebKit2/UIProcess/WebUIClient.h

    r159988 r159994  
    3535#include <wtf/PassRefPtr.h>
    3636
    37 template<> struct API::ClientTraits<WKPageUIClientBase> {
     37namespace API {
     38template<> struct ClientTraits<WKPageUIClientBase> {
    3839    typedef std::tuple<WKPageUIClientV0, WKPageUIClientV1, WKPageUIClientV2> Versions;
    3940};
     41}
    4042
    4143namespace WebCore {

  • trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleClient.h

    r159988 r159994  
    3131#include <wtf/Forward.h>
    3232
    33 template<> struct API::ClientTraits<WKBundleClientBase> {
     33namespace API {
     34class Object;
     35
     36template<> struct ClientTraits<WKBundleClientBase> {
    3437    typedef std::tuple<WKBundleClientV0, WKBundleClientV1> Versions;
    3538};
    36 
    37 namespace API {
    38 class Object;
    3939}
    4040

  • trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageContextMenuClient.h

    r159988 r159994  
    3333#include <wtf/Vector.h>
    3434
    35 template<> struct API::ClientTraits<WKBundlePageContextMenuClientBase> {
     35namespace API {
     36class Object;
     37
     38template<> struct ClientTraits<WKBundlePageContextMenuClientBase> {
    3639    typedef std::tuple<WKBundlePageContextMenuClientV0> Versions;
    3740};
    38 
    39 namespace API {
    40 class Object;
    4141}
    4242

  • trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageDiagnosticLoggingClient.h

    r159988 r159994  
    3232#include <wtf/Forward.h>
    3333
    34 template<> struct API::ClientTraits<WKBundlePageDiagnosticLoggingClientBase> {
     34namespace API {
     35template<> struct ClientTraits<WKBundlePageDiagnosticLoggingClientBase> {
    3536    typedef std::tuple<WKBundlePageDiagnosticLoggingClientV0> Versions;
    3637};
     38}
    3739
    3840namespace WebKit {

  • trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageEditorClient.h

    r159988 r159994  
    3434#include <wtf/Forward.h>
    3535
    36 template<> struct API::ClientTraits<WKBundlePageEditorClientBase> {
     36namespace API {
     37template<> struct ClientTraits<WKBundlePageEditorClientBase> {
    3738    typedef std::tuple<WKBundlePageEditorClientV0, WKBundlePageEditorClientV1> Versions;
    3839};
     40}
    3941
    4042namespace WebCore {

  • trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageFormClient.h

    r159988 r159994  
    3333#include <wtf/Vector.h>
    3434
    35 template<> struct API::ClientTraits<WKBundlePageFormClientBase> {
     35namespace API {
     36class Object;
     37
     38template<> struct ClientTraits<WKBundlePageFormClientBase> {
    3639    typedef std::tuple<WKBundlePageFormClientV0, WKBundlePageFormClientV1, WKBundlePageFormClientV2> Versions;
    3740};
    38 
    39 namespace API {
    40 class Object;
    4141}
    4242

  • trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageFullScreenClient.h

    r159988 r159994  
    3434#include <wtf/Forward.h>
    3535
    36 template<> struct API::ClientTraits<WKBundlePageFullScreenClientBase> {
     36namespace API {
     37template<> struct ClientTraits<WKBundlePageFullScreenClientBase> {
    3738    typedef std::tuple<WKBundlePageFullScreenClientV0, WKBundlePageFullScreenClientV1> Versions;
    3839};
     40}
    3941
    4042namespace WebCore {

  • trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.h

    r159988 r159994  
    3737namespace API {
    3838class Object;
    39 }
    4039
    41 template<> struct API::ClientTraits<WKBundlePageLoaderClientBase> {
     40template<> struct ClientTraits<WKBundlePageLoaderClientBase> {
    4241    typedef std::tuple<WKBundlePageLoaderClientV0, WKBundlePageLoaderClientV1, WKBundlePageLoaderClientV2, WKBundlePageLoaderClientV3, WKBundlePageLoaderClientV4, WKBundlePageLoaderClientV5, WKBundlePageLoaderClientV6, WKBundlePageLoaderClientV7> Versions;
    4342};
     43}
    4444
    4545namespace WebCore {

  • trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePagePolicyClient.h

    r159988 r159994  
    3232#include <wtf/Forward.h>
    3333
    34 template<> struct API::ClientTraits<WKBundlePagePolicyClientBase> {
     34namespace API {
     35template<> struct ClientTraits<WKBundlePagePolicyClientBase> {
    3536    typedef std::tuple<WKBundlePagePolicyClientV0> Versions;
    3637};
     38}
    3739
    3840namespace WebCore {

  • trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageResourceLoadClient.h

    r159988 r159994  
    3333#include <wtf/Forward.h>
    3434
    35 template<> struct API::ClientTraits<WKBundlePageResourceLoadClientBase> {
     35namespace API {
     36template<> struct ClientTraits<WKBundlePageResourceLoadClientBase> {
    3637    typedef std::tuple<WKBundlePageResourceLoadClientV0, WKBundlePageResourceLoadClientV1> Versions;
    3738};
     39}
    3840
    3941namespace WebCore {

  • trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageUIClient.h

    r159988 r159994  
    3333#include <wtf/Forward.h>
    3434
    35 template<> struct API::ClientTraits<WKBundlePageUIClientBase> {
     35namespace API {
     36class Object;
     37
     38template<> struct ClientTraits<WKBundlePageUIClientBase> {
    3639    typedef std::tuple<WKBundlePageUIClientV0, WKBundlePageUIClientV1, WKBundlePageUIClientV2> Versions;
    3740};
    38 
    39 namespace API {
    40 class Object;
    4141}
    4242
Note: See TracChangeset for help on using the changeset viewer.