Diff
Modified: trunk/Source/WebKit/ChangeLog (228020 => 228021)
--- trunk/Source/WebKit/ChangeLog 2018-02-02 19:35:38 UTC (rev 228020)
+++ trunk/Source/WebKit/ChangeLog 2018-02-02 19:38:06 UTC (rev 228021)
@@ -1,3 +1,36 @@
+2018-02-02 Fujii Hironori <hironori.fu...@sony.com>
+
+ [Win] MSVC doesn't seem to like "friend class NeverDestroyed<Foo>"
+ https://bugs.webkit.org/show_bug.cgi?id=182081
+
+ Reviewed by Yusuke Suzuki.
+
+ The template friend class, which belongs to a different namespace,
+ can't access private member if its friend declaration is specified
+ without the namespace and with class keyword.
+
+ Replaced "friend class NeverDestroyed<Foo>" with "friend NeverDestroyed<Foo>".
+
+ * NetworkProcess/NetworkProcess.h:
+ * NetworkProcess/capture/NetworkCaptureManager.h:
+ * PluginProcess/PluginProcess.h:
+ * Shared/CallbackID.h:
+ * Shared/CoordinatedGraphics/threadedcompositor/CompositingRunLoop.cpp:
+ * StorageProcess/StorageProcess.h:
+ * UIProcess/Plugins/PluginProcessManager.h:
+ * UIProcess/Plugins/gtk/PluginInfoCache.h:
+ * UIProcess/WebPageProxy.cpp:
+ * UIProcess/WebPasteboardProxy.h:
+ * UIProcess/gtk/AcceleratedBackingStoreX11.cpp:
+ * UIProcess/gtk/HardwareAccelerationManager.h:
+ * UIProcess/gtk/WaylandCompositor.h:
+ * UIProcess/linux/MemoryPressureMonitor.h:
+ * UIProcess/mac/ServicesController.h:
+ * WebProcess/InjectedBundle/API/glib/WebKitExtensionManager.h:
+ * WebProcess/Plugins/WebPluginInfoProvider.h:
+ * WebProcess/WebCoreSupport/WebPasteboardOverrides.h:
+ * WebProcess/WebCoreSupport/WebPlatformStrategies.h:
+
2018-02-02 Youenn Fablet <you...@apple.com>
Configure serviceWorkerRegistrationDirectory on the web site data store and move it to a Caches subfolder as a default
Modified: trunk/Source/WebKit/NetworkProcess/NetworkProcess.h (228020 => 228021)
--- trunk/Source/WebKit/NetworkProcess/NetworkProcess.h 2018-02-02 19:35:38 UTC (rev 228020)
+++ trunk/Source/WebKit/NetworkProcess/NetworkProcess.h 2018-02-02 19:38:06 UTC (rev 228021)
@@ -78,8 +78,8 @@
class NetworkProcess : public ChildProcess, private DownloadManager::Client {
WTF_MAKE_NONCOPYABLE(NetworkProcess);
- friend class NeverDestroyed<NetworkProcess>;
- friend class NeverDestroyed<DownloadManager>;
+ friend NeverDestroyed<NetworkProcess>;
+ friend NeverDestroyed<DownloadManager>;
public:
static NetworkProcess& singleton();
Modified: trunk/Source/WebKit/NetworkProcess/capture/NetworkCaptureManager.h (228020 => 228021)
--- trunk/Source/WebKit/NetworkProcess/capture/NetworkCaptureManager.h 2018-02-02 19:35:38 UTC (rev 228020)
+++ trunk/Source/WebKit/NetworkProcess/capture/NetworkCaptureManager.h 2018-02-02 19:38:06 UTC (rev 228021)
@@ -55,7 +55,7 @@
*/
class Manager {
WTF_MAKE_NONCOPYABLE(Manager);
- friend class WTF::NeverDestroyed<Manager>;
+ friend NeverDestroyed<Manager>;
public:
enum RecordReplayMode {
Modified: trunk/Source/WebKit/PluginProcess/PluginProcess.h (228020 => 228021)
--- trunk/Source/WebKit/PluginProcess/PluginProcess.h 2018-02-02 19:35:38 UTC (rev 228020)
+++ trunk/Source/WebKit/PluginProcess/PluginProcess.h 2018-02-02 19:38:06 UTC (rev 228021)
@@ -45,7 +45,8 @@
class PluginProcess : public ChildProcess
{
WTF_MAKE_NONCOPYABLE(PluginProcess);
- friend class NeverDestroyed<PluginProcess>;
+ friend NeverDestroyed<PluginProcess>;
+
public:
static PluginProcess& singleton();
Modified: trunk/Source/WebKit/Shared/CallbackID.h (228020 => 228021)
--- trunk/Source/WebKit/Shared/CallbackID.h 2018-02-02 19:35:38 UTC (rev 228020)
+++ trunk/Source/WebKit/Shared/CallbackID.h 2018-02-02 19:38:06 UTC (rev 228021)
@@ -96,7 +96,7 @@
template <typename CallbackType> friend class SpecificCallbackMap;
friend class OptionalCallbackID;
friend struct WTF::CallbackIDHash;
- friend struct HashTraits<WebKit::CallbackID>;
+ friend HashTraits<WebKit::CallbackID>;
uint64_t m_id { HashTraits<uint64_t>::emptyValue() };
};
Modified: trunk/Source/WebKit/Shared/CoordinatedGraphics/threadedcompositor/CompositingRunLoop.cpp (228020 => 228021)
--- trunk/Source/WebKit/Shared/CoordinatedGraphics/threadedcompositor/CompositingRunLoop.cpp 2018-02-02 19:35:38 UTC (rev 228020)
+++ trunk/Source/WebKit/Shared/CoordinatedGraphics/threadedcompositor/CompositingRunLoop.cpp 2018-02-02 19:38:06 UTC (rev 228021)
@@ -41,7 +41,7 @@
class WorkQueuePool {
WTF_MAKE_NONCOPYABLE(WorkQueuePool);
- friend class NeverDestroyed<WorkQueuePool>;
+ friend NeverDestroyed<WorkQueuePool>;
public:
static WorkQueuePool& singleton()
{
Modified: trunk/Source/WebKit/StorageProcess/StorageProcess.h (228020 => 228021)
--- trunk/Source/WebKit/StorageProcess/StorageProcess.h 2018-02-02 19:35:38 UTC (rev 228020)
+++ trunk/Source/WebKit/StorageProcess/StorageProcess.h 2018-02-02 19:38:06 UTC (rev 228021)
@@ -66,7 +66,7 @@
#endif
{
WTF_MAKE_NONCOPYABLE(StorageProcess);
- friend class NeverDestroyed<StorageProcess>;
+ friend NeverDestroyed<StorageProcess>;
public:
static StorageProcess& singleton();
~StorageProcess();
Modified: trunk/Source/WebKit/UIProcess/Plugins/PluginProcessManager.h (228020 => 228021)
--- trunk/Source/WebKit/UIProcess/Plugins/PluginProcessManager.h 2018-02-02 19:35:38 UTC (rev 228020)
+++ trunk/Source/WebKit/UIProcess/Plugins/PluginProcessManager.h 2018-02-02 19:38:06 UTC (rev 228021)
@@ -51,7 +51,7 @@
class PluginProcessManager {
WTF_MAKE_NONCOPYABLE(PluginProcessManager);
- friend class NeverDestroyed<PluginProcessManager>;
+ friend NeverDestroyed<PluginProcessManager>;
public:
static PluginProcessManager& singleton();
Modified: trunk/Source/WebKit/UIProcess/Plugins/gtk/PluginInfoCache.h (228020 => 228021)
--- trunk/Source/WebKit/UIProcess/Plugins/gtk/PluginInfoCache.h 2018-02-02 19:35:38 UTC (rev 228020)
+++ trunk/Source/WebKit/UIProcess/Plugins/gtk/PluginInfoCache.h 2018-02-02 19:38:06 UTC (rev 228021)
@@ -37,7 +37,7 @@
class PluginInfoCache {
WTF_MAKE_NONCOPYABLE(PluginInfoCache);
- friend class NeverDestroyed<PluginInfoCache>;
+ friend NeverDestroyed<PluginInfoCache>;
public:
static PluginInfoCache& singleton();
Modified: trunk/Source/WebKit/UIProcess/WebPageProxy.cpp (228020 => 228021)
--- trunk/Source/WebKit/UIProcess/WebPageProxy.cpp 2018-02-02 19:35:38 UTC (rev 228020)
+++ trunk/Source/WebKit/UIProcess/WebPageProxy.cpp 2018-02-02 19:38:06 UTC (rev 228021)
@@ -214,7 +214,7 @@
class ExceededDatabaseQuotaRecords {
WTF_MAKE_NONCOPYABLE(ExceededDatabaseQuotaRecords); WTF_MAKE_FAST_ALLOCATED;
- friend class NeverDestroyed<ExceededDatabaseQuotaRecords>;
+ friend NeverDestroyed<ExceededDatabaseQuotaRecords>;
public:
struct Record {
uint64_t frameID;
Modified: trunk/Source/WebKit/UIProcess/WebPasteboardProxy.h (228020 => 228021)
--- trunk/Source/WebKit/UIProcess/WebPasteboardProxy.h 2018-02-02 19:35:38 UTC (rev 228020)
+++ trunk/Source/WebKit/UIProcess/WebPasteboardProxy.h 2018-02-02 19:38:06 UTC (rev 228021)
@@ -48,7 +48,7 @@
class WebPasteboardProxy : public IPC::MessageReceiver {
WTF_MAKE_NONCOPYABLE(WebPasteboardProxy);
- friend class LazyNeverDestroyed<WebPasteboardProxy>;
+ friend LazyNeverDestroyed<WebPasteboardProxy>;
public:
static WebPasteboardProxy& singleton();
Modified: trunk/Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreX11.cpp (228020 => 228021)
--- trunk/Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreX11.cpp 2018-02-02 19:35:38 UTC (rev 228020)
+++ trunk/Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreX11.cpp 2018-02-02 19:38:06 UTC (rev 228021)
@@ -51,7 +51,7 @@
class XDamageNotifier {
WTF_MAKE_NONCOPYABLE(XDamageNotifier);
- friend class NeverDestroyed<XDamageNotifier>;
+ friend NeverDestroyed<XDamageNotifier>;
public:
static XDamageNotifier& singleton()
{
Modified: trunk/Source/WebKit/UIProcess/gtk/HardwareAccelerationManager.h (228020 => 228021)
--- trunk/Source/WebKit/UIProcess/gtk/HardwareAccelerationManager.h 2018-02-02 19:35:38 UTC (rev 228020)
+++ trunk/Source/WebKit/UIProcess/gtk/HardwareAccelerationManager.h 2018-02-02 19:38:06 UTC (rev 228021)
@@ -31,7 +31,7 @@
class HardwareAccelerationManager {
WTF_MAKE_NONCOPYABLE(HardwareAccelerationManager);
- friend class NeverDestroyed<HardwareAccelerationManager>;
+ friend NeverDestroyed<HardwareAccelerationManager>;
public:
static HardwareAccelerationManager& singleton();
Modified: trunk/Source/WebKit/UIProcess/gtk/WaylandCompositor.h (228020 => 228021)
--- trunk/Source/WebKit/UIProcess/gtk/WaylandCompositor.h 2018-02-02 19:35:38 UTC (rev 228020)
+++ trunk/Source/WebKit/UIProcess/gtk/WaylandCompositor.h 2018-02-02 19:38:06 UTC (rev 228021)
@@ -50,7 +50,7 @@
class WaylandCompositor {
WTF_MAKE_NONCOPYABLE(WaylandCompositor);
- friend class NeverDestroyed<WaylandCompositor>;
+ friend NeverDestroyed<WaylandCompositor>;
public:
static WaylandCompositor& singleton();
Modified: trunk/Source/WebKit/UIProcess/linux/MemoryPressureMonitor.h (228020 => 228021)
--- trunk/Source/WebKit/UIProcess/linux/MemoryPressureMonitor.h 2018-02-02 19:35:38 UTC (rev 228020)
+++ trunk/Source/WebKit/UIProcess/linux/MemoryPressureMonitor.h 2018-02-02 19:38:06 UTC (rev 228021)
@@ -38,7 +38,7 @@
class MemoryPressureMonitor {
WTF_MAKE_NONCOPYABLE(MemoryPressureMonitor);
- friend class NeverDestroyed<MemoryPressureMonitor>;
+ friend NeverDestroyed<MemoryPressureMonitor>;
public:
static MemoryPressureMonitor& singleton();
static bool isEnabled();
Modified: trunk/Source/WebKit/UIProcess/mac/ServicesController.h (228020 => 228021)
--- trunk/Source/WebKit/UIProcess/mac/ServicesController.h 2018-02-02 19:35:38 UTC (rev 228020)
+++ trunk/Source/WebKit/UIProcess/mac/ServicesController.h 2018-02-02 19:38:06 UTC (rev 228021)
@@ -36,7 +36,7 @@
class ServicesController {
WTF_MAKE_NONCOPYABLE(ServicesController);
- friend class NeverDestroyed<ServicesController>;
+ friend NeverDestroyed<ServicesController>;
public:
static ServicesController& singleton();
Modified: trunk/Source/WebKit/WebProcess/InjectedBundle/API/glib/WebKitExtensionManager.h (228020 => 228021)
--- trunk/Source/WebKit/WebProcess/InjectedBundle/API/glib/WebKitExtensionManager.h 2018-02-02 19:35:38 UTC (rev 228020)
+++ trunk/Source/WebKit/WebProcess/InjectedBundle/API/glib/WebKitExtensionManager.h 2018-02-02 19:38:06 UTC (rev 228021)
@@ -51,7 +51,7 @@
Vector<Module*> m_extensionModules;
GRefPtr<WebKitWebExtension> m_extension;
- friend class NeverDestroyed<WebKitExtensionManager>;
+ friend NeverDestroyed<WebKitExtensionManager>;
};
} // namespace WebKit
Modified: trunk/Source/WebKit/WebProcess/Plugins/WebPluginInfoProvider.h (228020 => 228021)
--- trunk/Source/WebKit/WebProcess/Plugins/WebPluginInfoProvider.h 2018-02-02 19:35:38 UTC (rev 228020)
+++ trunk/Source/WebKit/WebProcess/Plugins/WebPluginInfoProvider.h 2018-02-02 19:38:06 UTC (rev 228021)
@@ -31,7 +31,7 @@
namespace WebKit {
class WebPluginInfoProvider final : public WebCore::PluginInfoProvider {
- friend class NeverDestroyed<WebPluginInfoProvider>;
+ friend NeverDestroyed<WebPluginInfoProvider>;
public:
static WebPluginInfoProvider& singleton();
Modified: trunk/Source/WebKit/WebProcess/WebCoreSupport/WebPasteboardOverrides.h (228020 => 228021)
--- trunk/Source/WebKit/WebProcess/WebCoreSupport/WebPasteboardOverrides.h 2018-02-02 19:35:38 UTC (rev 228020)
+++ trunk/Source/WebKit/WebProcess/WebCoreSupport/WebPasteboardOverrides.h 2018-02-02 19:38:06 UTC (rev 228021)
@@ -33,7 +33,7 @@
namespace WebKit {
class WebPasteboardOverrides {
- friend class NeverDestroyed<WebPasteboardOverrides>;
+ friend NeverDestroyed<WebPasteboardOverrides>;
public:
static WebPasteboardOverrides& sharedPasteboardOverrides();
Modified: trunk/Source/WebKit/WebProcess/WebCoreSupport/WebPlatformStrategies.h (228020 => 228021)
--- trunk/Source/WebKit/WebProcess/WebCoreSupport/WebPlatformStrategies.h 2018-02-02 19:35:38 UTC (rev 228020)
+++ trunk/Source/WebKit/WebProcess/WebCoreSupport/WebPlatformStrategies.h 2018-02-02 19:38:06 UTC (rev 228021)
@@ -33,7 +33,7 @@
namespace WebKit {
class WebPlatformStrategies : public WebCore::PlatformStrategies, private WebCore::CookiesStrategy, private WebCore::PasteboardStrategy {
- friend class NeverDestroyed<WebPlatformStrategies>;
+ friend NeverDestroyed<WebPlatformStrategies>;
public:
static void initialize();
