Diff
Modified: trunk/Source/WebKit2/ChangeLog (159993 => 159994)
--- trunk/Source/WebKit2/ChangeLog 2013-12-03 06:20:39 UTC (rev 159993)
+++ trunk/Source/WebKit2/ChangeLog 2013-12-03 08:01:17 UTC (rev 159994)
@@ -1,3 +1,40 @@
+2013-12-02 Zan Dobersek <[email protected]>
+
+ 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:
+
2013-12-02 Dan Bernstein <[email protected]>
Build fix.
Modified: trunk/Source/WebKit2/Shared/WebConnectionClient.h (159993 => 159994)
--- trunk/Source/WebKit2/Shared/WebConnectionClient.h 2013-12-03 06:20:39 UTC (rev 159993)
+++ trunk/Source/WebKit2/Shared/WebConnectionClient.h 2013-12-03 08:01:17 UTC (rev 159994)
@@ -30,12 +30,12 @@
#include "WKConnectionRef.h"
#include <wtf/Forward.h>
-template<> struct API::ClientTraits<WKConnectionClientBase> {
+namespace API {
+class Object;
+
+template<> struct ClientTraits<WKConnectionClientBase> {
typedef std::tuple<WKConnectionClientV0> Versions;
};
-
-namespace API {
-class Object;
}
namespace WebKit {
Modified: trunk/Source/WebKit2/UIProcess/Notifications/WebNotificationProvider.h (159993 => 159994)
--- trunk/Source/WebKit2/UIProcess/Notifications/WebNotificationProvider.h 2013-12-03 06:20:39 UTC (rev 159993)
+++ trunk/Source/WebKit2/UIProcess/Notifications/WebNotificationProvider.h 2013-12-03 08:01:17 UTC (rev 159994)
@@ -31,9 +31,11 @@
#include <wtf/Forward.h>
#include <wtf/Vector.h>
-template<> struct API::ClientTraits<WKNotificationProviderBase> {
+namespace API {
+template<> struct ClientTraits<WKNotificationProviderBase> {
typedef std::tuple<WKNotificationProviderV0> Versions;
};
+}
namespace WebKit {
Modified: trunk/Source/WebKit2/UIProcess/WebContextClient.h (159993 => 159994)
--- trunk/Source/WebKit2/UIProcess/WebContextClient.h 2013-12-03 06:20:39 UTC (rev 159993)
+++ trunk/Source/WebKit2/UIProcess/WebContextClient.h 2013-12-03 08:01:17 UTC (rev 159994)
@@ -29,12 +29,12 @@
#include "APIClient.h"
#include "WKContext.h"
-template<> struct API::ClientTraits<WKContextClientBase> {
+namespace API {
+class Array;
+
+template<> struct ClientTraits<WKContextClientBase> {
typedef std::tuple<WKContextClientV0> Versions;
};
-
-namespace API {
-class Array;
}
namespace WebKit {
Modified: trunk/Source/WebKit2/UIProcess/WebContextConnectionClient.h (159993 => 159994)
--- trunk/Source/WebKit2/UIProcess/WebContextConnectionClient.h 2013-12-03 06:20:39 UTC (rev 159993)
+++ trunk/Source/WebKit2/UIProcess/WebContextConnectionClient.h 2013-12-03 08:01:17 UTC (rev 159994)
@@ -29,9 +29,11 @@
#include "APIClient.h"
#include "WKContext.h"
-template<> struct API::ClientTraits<WKContextConnectionClientBase> {
+namespace API {
+template<> struct ClientTraits<WKContextConnectionClientBase> {
typedef std::tuple<WKContextConnectionClientV0> Versions;
};
+}
namespace WebKit {
Modified: trunk/Source/WebKit2/UIProcess/WebContextInjectedBundleClient.h (159993 => 159994)
--- trunk/Source/WebKit2/UIProcess/WebContextInjectedBundleClient.h 2013-12-03 06:20:39 UTC (rev 159993)
+++ trunk/Source/WebKit2/UIProcess/WebContextInjectedBundleClient.h 2013-12-03 08:01:17 UTC (rev 159994)
@@ -30,12 +30,12 @@
#include "WKContext.h"
#include <wtf/Forward.h>
-template<> struct API::ClientTraits<WKContextInjectedBundleClientBase> {
+namespace API {
+class Object;
+
+template<> struct ClientTraits<WKContextInjectedBundleClientBase> {
typedef std::tuple<WKContextInjectedBundleClientV0, WKContextInjectedBundleClientV1> Versions;
};
-
-namespace API {
-class Object;
}
namespace WebKit {
Modified: trunk/Source/WebKit2/UIProcess/WebCookieManagerProxyClient.h (159993 => 159994)
--- trunk/Source/WebKit2/UIProcess/WebCookieManagerProxyClient.h 2013-12-03 06:20:39 UTC (rev 159993)
+++ trunk/Source/WebKit2/UIProcess/WebCookieManagerProxyClient.h 2013-12-03 08:01:17 UTC (rev 159994)
@@ -30,9 +30,11 @@
#include "WKCookieManager.h"
#include <wtf/Forward.h>
-template<> struct API::ClientTraits<WKCookieManagerClientBase> {
+namespace API {
+template<> struct ClientTraits<WKCookieManagerClientBase> {
typedef std::tuple<WKCookieManagerClientV0> Versions;
};
+}
namespace WebKit {
Modified: trunk/Source/WebKit2/UIProcess/WebDatabaseManagerProxyClient.h (159993 => 159994)
--- trunk/Source/WebKit2/UIProcess/WebDatabaseManagerProxyClient.h 2013-12-03 06:20:39 UTC (rev 159993)
+++ trunk/Source/WebKit2/UIProcess/WebDatabaseManagerProxyClient.h 2013-12-03 08:01:17 UTC (rev 159994)
@@ -30,9 +30,11 @@
#include "WKDatabaseManager.h"
#include <wtf/Forward.h>
-template<> struct API::ClientTraits<WKDatabaseManagerClientBase> {
+namespace API {
+template<> struct ClientTraits<WKDatabaseManagerClientBase> {
typedef std::tuple<WKDatabaseManagerClientV0> Versions;
};
+}
namespace WebKit {
Modified: trunk/Source/WebKit2/UIProcess/WebDownloadClient.h (159993 => 159994)
--- trunk/Source/WebKit2/UIProcess/WebDownloadClient.h 2013-12-03 06:20:39 UTC (rev 159993)
+++ trunk/Source/WebKit2/UIProcess/WebDownloadClient.h 2013-12-03 08:01:17 UTC (rev 159994)
@@ -30,9 +30,11 @@
#include "WKContext.h"
#include <wtf/Forward.h>
-template<> struct API::ClientTraits<WKContextDownloadClientBase> {
+namespace API {
+template<> struct ClientTraits<WKContextDownloadClientBase> {
typedef std::tuple<WKContextDownloadClientV0> Versions;
};
+}
namespace WebCore {
class ResourceError;
Modified: trunk/Source/WebKit2/UIProcess/WebFindClient.h (159993 => 159994)
--- trunk/Source/WebKit2/UIProcess/WebFindClient.h 2013-12-03 06:20:39 UTC (rev 159993)
+++ trunk/Source/WebKit2/UIProcess/WebFindClient.h 2013-12-03 08:01:17 UTC (rev 159994)
@@ -30,16 +30,16 @@
#include "WKPage.h"
#include <wtf/Forward.h>
-template<> struct API::ClientTraits<WKPageFindClientBase> {
+namespace API {
+class Array;
+
+template<> struct ClientTraits<WKPageFindClientBase> {
typedef std::tuple<WKPageFindClientV0> Versions;
};
-template<> struct API::ClientTraits<WKPageFindMatchesClientBase> {
+template<> struct ClientTraits<WKPageFindMatchesClientBase> {
typedef std::tuple<WKPageFindMatchesClientV0> Versions;
};
-
-namespace API {
-class Array;
}
namespace WebKit {
Modified: trunk/Source/WebKit2/UIProcess/WebFormClient.h (159993 => 159994)
--- trunk/Source/WebKit2/UIProcess/WebFormClient.h 2013-12-03 06:20:39 UTC (rev 159993)
+++ trunk/Source/WebKit2/UIProcess/WebFormClient.h 2013-12-03 08:01:17 UTC (rev 159994)
@@ -32,12 +32,12 @@
#include <wtf/Forward.h>
#include <wtf/Vector.h>
-template<> struct API::ClientTraits<WKPageFormClientBase> {
+namespace API {
+class Object;
+
+template<> struct ClientTraits<WKPageFormClientBase> {
typedef std::tuple<WKPageFormClientV0> Versions;
};
-
-namespace API {
-class Object;
}
namespace WebKit {
Modified: trunk/Source/WebKit2/UIProcess/WebGeolocationProvider.h (159993 => 159994)
--- trunk/Source/WebKit2/UIProcess/WebGeolocationProvider.h 2013-12-03 06:20:39 UTC (rev 159993)
+++ trunk/Source/WebKit2/UIProcess/WebGeolocationProvider.h 2013-12-03 08:01:17 UTC (rev 159994)
@@ -30,9 +30,11 @@
#include "WKGeolocationManager.h"
#include <wtf/Forward.h>
-template<> struct API::ClientTraits<WKGeolocationProviderBase> {
+namespace API {
+template<> struct ClientTraits<WKGeolocationProviderBase> {
typedef std::tuple<WKGeolocationProviderV0, WKGeolocationProviderV1> Versions;
};
+}
namespace WebKit {
Modified: trunk/Source/WebKit2/UIProcess/WebHistoryClient.h (159993 => 159994)
--- trunk/Source/WebKit2/UIProcess/WebHistoryClient.h 2013-12-03 06:20:39 UTC (rev 159993)
+++ trunk/Source/WebKit2/UIProcess/WebHistoryClient.h 2013-12-03 08:01:17 UTC (rev 159994)
@@ -30,9 +30,11 @@
#include "WKContext.h"
#include <wtf/Forward.h>
-template<> struct API::ClientTraits<WKContextHistoryClientBase> {
+namespace API {
+template<> struct ClientTraits<WKContextHistoryClientBase> {
typedef std::tuple<WKContextHistoryClientV0> Versions;
};
+}
namespace WebKit {
Modified: trunk/Source/WebKit2/UIProcess/WebIconDatabaseClient.h (159993 => 159994)
--- trunk/Source/WebKit2/UIProcess/WebIconDatabaseClient.h 2013-12-03 06:20:39 UTC (rev 159993)
+++ trunk/Source/WebKit2/UIProcess/WebIconDatabaseClient.h 2013-12-03 08:01:17 UTC (rev 159994)
@@ -29,9 +29,11 @@
#include "APIClient.h"
#include "WKIconDatabase.h"
-template<> struct API::ClientTraits<WKIconDatabaseClientBase> {
+namespace API {
+template<> struct ClientTraits<WKIconDatabaseClientBase> {
typedef std::tuple<WKIconDatabaseClientV0, WKIconDatabaseClientV1> Versions;
};
+}
namespace WebKit {
Modified: trunk/Source/WebKit2/UIProcess/WebLoaderClient.h (159993 => 159994)
--- trunk/Source/WebKit2/UIProcess/WebLoaderClient.h 2013-12-03 06:20:39 UTC (rev 159993)
+++ trunk/Source/WebKit2/UIProcess/WebLoaderClient.h 2013-12-03 08:01:17 UTC (rev 159994)
@@ -35,12 +35,12 @@
#include <wtf/RefPtr.h>
#include <wtf/Vector.h>
-template<> struct API::ClientTraits<WKPageLoaderClientBase> {
+namespace API {
+class Object;
+
+template<> struct ClientTraits<WKPageLoaderClientBase> {
typedef std::tuple<WKPageLoaderClientV0, WKPageLoaderClientV1, WKPageLoaderClientV2, WKPageLoaderClientV3> Versions;
};
-
-namespace API {
-class Object;
}
namespace WebCore {
Modified: trunk/Source/WebKit2/UIProcess/WebOriginDataManagerProxyChangeClient.h (159993 => 159994)
--- trunk/Source/WebKit2/UIProcess/WebOriginDataManagerProxyChangeClient.h 2013-12-03 06:20:39 UTC (rev 159993)
+++ trunk/Source/WebKit2/UIProcess/WebOriginDataManagerProxyChangeClient.h 2013-12-03 08:01:17 UTC (rev 159994)
@@ -30,9 +30,11 @@
#include "WKOriginDataManager.h"
#include <wtf/Forward.h>
-template<> struct API::ClientTraits<WKOriginDataManagerChangeClientBase> {
+namespace API {
+template<> struct ClientTraits<WKOriginDataManagerChangeClientBase> {
typedef std::tuple<WKOriginDataManagerChangeClientV0> Versions;
};
+}
namespace WebKit {
Modified: trunk/Source/WebKit2/UIProcess/WebPageContextMenuClient.h (159993 => 159994)
--- trunk/Source/WebKit2/UIProcess/WebPageContextMenuClient.h 2013-12-03 06:20:39 UTC (rev 159993)
+++ trunk/Source/WebKit2/UIProcess/WebPageContextMenuClient.h 2013-12-03 08:01:17 UTC (rev 159994)
@@ -34,9 +34,11 @@
#include <WebCore/IntPoint.h>
#include <wtf/Vector.h>
-template<> struct API::ClientTraits<WKPageContextMenuClientBase> {
+namespace API {
+template<> struct ClientTraits<WKPageContextMenuClientBase> {
typedef std::tuple<WKPageContextMenuClientV0, WKPageContextMenuClientV1, WKPageContextMenuClientV2, WKPageContextMenuClientV3> Versions;
};
+}
namespace WebKit {
Modified: trunk/Source/WebKit2/UIProcess/WebPolicyClient.h (159993 => 159994)
--- trunk/Source/WebKit2/UIProcess/WebPolicyClient.h 2013-12-03 06:20:39 UTC (rev 159993)
+++ trunk/Source/WebKit2/UIProcess/WebPolicyClient.h 2013-12-03 08:01:17 UTC (rev 159994)
@@ -32,12 +32,12 @@
#include <WebCore/FrameLoaderTypes.h>
#include <wtf/Forward.h>
-template<> struct API::ClientTraits<WKPagePolicyClientBase> {
+namespace API {
+class Object;
+
+template<> struct ClientTraits<WKPagePolicyClientBase> {
typedef std::tuple<WKPagePolicyClientV0, WKPagePolicyClientV1> Versions;
};
-
-namespace API {
-class Object;
}
namespace WebCore {
Modified: trunk/Source/WebKit2/UIProcess/WebUIClient.h (159993 => 159994)
--- trunk/Source/WebKit2/UIProcess/WebUIClient.h 2013-12-03 06:20:39 UTC (rev 159993)
+++ trunk/Source/WebKit2/UIProcess/WebUIClient.h 2013-12-03 08:01:17 UTC (rev 159994)
@@ -34,9 +34,11 @@
#include <wtf/Forward.h>
#include <wtf/PassRefPtr.h>
-template<> struct API::ClientTraits<WKPageUIClientBase> {
+namespace API {
+template<> struct ClientTraits<WKPageUIClientBase> {
typedef std::tuple<WKPageUIClientV0, WKPageUIClientV1, WKPageUIClientV2> Versions;
};
+}
namespace WebCore {
class FloatRect;
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleClient.h (159993 => 159994)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleClient.h 2013-12-03 06:20:39 UTC (rev 159993)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleClient.h 2013-12-03 08:01:17 UTC (rev 159994)
@@ -30,12 +30,12 @@
#include "WKBundle.h"
#include <wtf/Forward.h>
-template<> struct API::ClientTraits<WKBundleClientBase> {
+namespace API {
+class Object;
+
+template<> struct ClientTraits<WKBundleClientBase> {
typedef std::tuple<WKBundleClientV0, WKBundleClientV1> Versions;
};
-
-namespace API {
-class Object;
}
namespace WebKit {
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageContextMenuClient.h (159993 => 159994)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageContextMenuClient.h 2013-12-03 06:20:39 UTC (rev 159993)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageContextMenuClient.h 2013-12-03 08:01:17 UTC (rev 159994)
@@ -32,12 +32,12 @@
#include "WKBundlePage.h"
#include <wtf/Vector.h>
-template<> struct API::ClientTraits<WKBundlePageContextMenuClientBase> {
+namespace API {
+class Object;
+
+template<> struct ClientTraits<WKBundlePageContextMenuClientBase> {
typedef std::tuple<WKBundlePageContextMenuClientV0> Versions;
};
-
-namespace API {
-class Object;
}
namespace WebCore {
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageDiagnosticLoggingClient.h (159993 => 159994)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageDiagnosticLoggingClient.h 2013-12-03 06:20:39 UTC (rev 159993)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageDiagnosticLoggingClient.h 2013-12-03 08:01:17 UTC (rev 159994)
@@ -31,9 +31,11 @@
#include <_javascript_Core/JSBase.h>
#include <wtf/Forward.h>
-template<> struct API::ClientTraits<WKBundlePageDiagnosticLoggingClientBase> {
+namespace API {
+template<> struct ClientTraits<WKBundlePageDiagnosticLoggingClientBase> {
typedef std::tuple<WKBundlePageDiagnosticLoggingClientV0> Versions;
};
+}
namespace WebKit {
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageEditorClient.h (159993 => 159994)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageEditorClient.h 2013-12-03 06:20:39 UTC (rev 159993)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageEditorClient.h 2013-12-03 08:01:17 UTC (rev 159994)
@@ -33,9 +33,11 @@
#include <WebCore/TextAffinity.h>
#include <wtf/Forward.h>
-template<> struct API::ClientTraits<WKBundlePageEditorClientBase> {
+namespace API {
+template<> struct ClientTraits<WKBundlePageEditorClientBase> {
typedef std::tuple<WKBundlePageEditorClientV0, WKBundlePageEditorClientV1> Versions;
};
+}
namespace WebCore {
class CSSStyleDeclaration;
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageFormClient.h (159993 => 159994)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageFormClient.h 2013-12-03 06:20:39 UTC (rev 159993)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageFormClient.h 2013-12-03 08:01:17 UTC (rev 159994)
@@ -32,12 +32,12 @@
#include <wtf/Forward.h>
#include <wtf/Vector.h>
-template<> struct API::ClientTraits<WKBundlePageFormClientBase> {
+namespace API {
+class Object;
+
+template<> struct ClientTraits<WKBundlePageFormClientBase> {
typedef std::tuple<WKBundlePageFormClientV0, WKBundlePageFormClientV1, WKBundlePageFormClientV2> Versions;
};
-
-namespace API {
-class Object;
}
namespace WebCore {
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageFullScreenClient.h (159993 => 159994)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageFullScreenClient.h 2013-12-03 06:20:39 UTC (rev 159993)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageFullScreenClient.h 2013-12-03 08:01:17 UTC (rev 159994)
@@ -33,9 +33,11 @@
#include "WebEvent.h"
#include <wtf/Forward.h>
-template<> struct API::ClientTraits<WKBundlePageFullScreenClientBase> {
+namespace API {
+template<> struct ClientTraits<WKBundlePageFullScreenClientBase> {
typedef std::tuple<WKBundlePageFullScreenClientV0, WKBundlePageFullScreenClientV1> Versions;
};
+}
namespace WebCore {
class Element;
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.h (159993 => 159994)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.h 2013-12-03 06:20:39 UTC (rev 159993)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.h 2013-12-03 08:01:17 UTC (rev 159994)
@@ -36,11 +36,11 @@
namespace API {
class Object;
-}
-template<> struct API::ClientTraits<WKBundlePageLoaderClientBase> {
+template<> struct ClientTraits<WKBundlePageLoaderClientBase> {
typedef std::tuple<WKBundlePageLoaderClientV0, WKBundlePageLoaderClientV1, WKBundlePageLoaderClientV2, WKBundlePageLoaderClientV3, WKBundlePageLoaderClientV4, WKBundlePageLoaderClientV5, WKBundlePageLoaderClientV6, WKBundlePageLoaderClientV7> Versions;
};
+}
namespace WebCore {
class DOMWindowExtension;
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePagePolicyClient.h (159993 => 159994)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePagePolicyClient.h 2013-12-03 06:20:39 UTC (rev 159993)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePagePolicyClient.h 2013-12-03 08:01:17 UTC (rev 159994)
@@ -31,9 +31,11 @@
#include "WKBundlePage.h"
#include <wtf/Forward.h>
-template<> struct API::ClientTraits<WKBundlePagePolicyClientBase> {
+namespace API {
+template<> struct ClientTraits<WKBundlePagePolicyClientBase> {
typedef std::tuple<WKBundlePagePolicyClientV0> Versions;
};
+}
namespace WebCore {
class ResourceError;
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageResourceLoadClient.h (159993 => 159994)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageResourceLoadClient.h 2013-12-03 06:20:39 UTC (rev 159993)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageResourceLoadClient.h 2013-12-03 08:01:17 UTC (rev 159994)
@@ -32,9 +32,11 @@
#include <_javascript_Core/JSBase.h>
#include <wtf/Forward.h>
-template<> struct API::ClientTraits<WKBundlePageResourceLoadClientBase> {
+namespace API {
+template<> struct ClientTraits<WKBundlePageResourceLoadClientBase> {
typedef std::tuple<WKBundlePageResourceLoadClientV0, WKBundlePageResourceLoadClientV1> Versions;
};
+}
namespace WebCore {
class ResourceError;
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageUIClient.h (159993 => 159994)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageUIClient.h 2013-12-03 06:20:39 UTC (rev 159993)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageUIClient.h 2013-12-03 08:01:17 UTC (rev 159994)
@@ -32,12 +32,12 @@
#include <WebCore/RenderSnapshottedPlugIn.h>
#include <wtf/Forward.h>
-template<> struct API::ClientTraits<WKBundlePageUIClientBase> {
+namespace API {
+class Object;
+
+template<> struct ClientTraits<WKBundlePageUIClientBase> {
typedef std::tuple<WKBundlePageUIClientV0, WKBundlePageUIClientV1, WKBundlePageUIClientV2> Versions;
};
-
-namespace API {
-class Object;
}
namespace WebCore {
