Remove the workaround for friend class LazyNeverDestroyed<X> statements for MSVC

https://bugs.webkit.org/show_bug.cgi?id=189576

Reviewed by Alex Christensen.

Old MSVC can't compile "friend class LazyNeverDestroyed<X>"
statements, but "friend LazyNeverDestroyed<X>".

No new tests (No behavior change).

* css/CSSInheritedValue.h: Removed the code for COMPILER(MSVC).
Removed 'class' keyword in "friend class LazyNeverDestroyed<X>"
statement.
* css/CSSInitialValue.h: Ditto.
* css/CSSPrimitiveValue.h: Ditto.
* css/CSSRevertValue.h: Ditto.
* css/CSSUnsetValue.h: Ditto.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@235986 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index cd68093..0b2a95f 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,23 @@
+2018-09-13  Fujii Hironori  <Hironori.Fujii@sony.com>
+
+        Remove the workaround for friend class LazyNeverDestroyed<X> statements for MSVC
+        https://bugs.webkit.org/show_bug.cgi?id=189576
+
+        Reviewed by Alex Christensen.
+
+        Old MSVC can't compile "friend class LazyNeverDestroyed<X>"
+        statements, but "friend LazyNeverDestroyed<X>".
+
+        No new tests (No behavior change).
+
+        * css/CSSInheritedValue.h: Removed the code for COMPILER(MSVC).
+        Removed 'class' keyword in "friend class LazyNeverDestroyed<X>"
+        statement.
+        * css/CSSInitialValue.h: Ditto.
+        * css/CSSPrimitiveValue.h: Ditto.
+        * css/CSSRevertValue.h: Ditto.
+        * css/CSSUnsetValue.h: Ditto.
+
 2018-09-13  Ms2ger  <Ms2ger@igalia.com>
 
         [GLib] Fix format string in KeyedEncoderGlib::beginObject().

diff --git a/Source/WebCore/css/CSSInheritedValue.h b/Source/WebCore/css/CSSInheritedValue.h
index 17a23c0..fbc070c 100644 (file)
--- a/Source/WebCore/css/CSSInheritedValue.h
+++ b/Source/WebCore/css/CSSInheritedValue.h
@@ -30,13 +30,8 @@ public:
 
     bool equals(const CSSInheritedValue&) const { return true; }
 
-#if COMPILER(MSVC)
-    // FIXME: This should be private, but for some reason MSVC then fails to invoke it from LazyNeverDestroyed::construct.
-public:
-#else
 private:
-    friend class LazyNeverDestroyed<CSSInheritedValue>;
-#endif
+    friend LazyNeverDestroyed<CSSInheritedValue>;
     CSSInheritedValue()
         : CSSValue(InheritedClass)
     {

diff --git a/Source/WebCore/css/CSSInitialValue.h b/Source/WebCore/css/CSSInitialValue.h
index b6b1961..4f2c9cf 100644 (file)
--- a/Source/WebCore/css/CSSInitialValue.h
+++ b/Source/WebCore/css/CSSInitialValue.h
@@ -41,13 +41,8 @@ public:
 
     bool equals(const CSSInitialValue&) const { return true; }
 
-#if COMPILER(MSVC)
-    // FIXME: This should be private, but for some reason MSVC then fails to invoke it from LazyNeverDestroyed::construct.
-public:
-#else
 private:
-    friend class LazyNeverDestroyed<CSSInitialValue>;
-#endif
+    friend LazyNeverDestroyed<CSSInitialValue>;
     CSSInitialValue(bool implicit)
         : CSSValue(InitialClass)
         , m_isImplicit(implicit)

diff --git a/Source/WebCore/css/CSSPrimitiveValue.h b/Source/WebCore/css/CSSPrimitiveValue.h
index f20840e..ae7be2e 100644 (file)
--- a/Source/WebCore/css/CSSPrimitiveValue.h
+++ b/Source/WebCore/css/CSSPrimitiveValue.h
@@ -288,14 +288,9 @@ public:
 
     Ref<DeprecatedCSSOMPrimitiveValue> createDeprecatedCSSOMPrimitiveWrapper(CSSStyleDeclaration&) const;
 
-#if COMPILER(MSVC)
-    // FIXME: This should be private, but for some reason MSVC then fails to invoke it from LazyNeverDestroyed::construct.
-public:
-#else
 private:
     friend class CSSValuePool;
-    friend class LazyNeverDestroyed<CSSPrimitiveValue>;
-#endif
+    friend LazyNeverDestroyed<CSSPrimitiveValue>;
 
     CSSPrimitiveValue(CSSValueID);
     CSSPrimitiveValue(CSSPropertyID);

diff --git a/Source/WebCore/css/CSSRevertValue.h b/Source/WebCore/css/CSSRevertValue.h
index 37bd740..305b409 100644 (file)
--- a/Source/WebCore/css/CSSRevertValue.h
+++ b/Source/WebCore/css/CSSRevertValue.h
@@ -35,13 +35,8 @@ public:
 
     bool equals(const CSSRevertValue&) const { return true; }
 
-#if COMPILER(MSVC)
-    // FIXME: This should be private, but for some reason MSVC then fails to invoke it from LazyNeverDestroyed::construct.
-public:
-#else
 private:
-    friend class LazyNeverDestroyed<CSSRevertValue>;
-#endif
+    friend LazyNeverDestroyed<CSSRevertValue>;
     CSSRevertValue()
         : CSSValue(RevertClass)
     {

diff --git a/Source/WebCore/css/CSSUnsetValue.h b/Source/WebCore/css/CSSUnsetValue.h
index 523c468..2a494ed 100644 (file)
--- a/Source/WebCore/css/CSSUnsetValue.h
+++ b/Source/WebCore/css/CSSUnsetValue.h
@@ -35,13 +35,8 @@ public:
 
     bool equals(const CSSUnsetValue&) const { return true; }
 
-#if COMPILER(MSVC)
-    // FIXME: This should be private, but for some reason MSVC then fails to invoke it from LazyNeverDestroyed::construct.
-public:
-#else
 private:
-    friend class LazyNeverDestroyed<CSSUnsetValue>;
-#endif
+    friend LazyNeverDestroyed<CSSUnsetValue>;
     CSSUnsetValue()
         : CSSValue(UnsetClass)
     {