Title: [235986] trunk/Source/WebCore
- Revision
- 235986
- Author
- [email protected]
- Date
- 2018-09-13 13:11:01 -0700 (Thu, 13 Sep 2018)
Log Message
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.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (235985 => 235986)
--- trunk/Source/WebCore/ChangeLog 2018-09-13 19:44:57 UTC (rev 235985)
+++ trunk/Source/WebCore/ChangeLog 2018-09-13 20:11:01 UTC (rev 235986)
@@ -1,3 +1,23 @@
+2018-09-13 Fujii Hironori <[email protected]>
+
+ 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 <[email protected]>
[GLib] Fix format string in KeyedEncoderGlib::beginObject().
Modified: trunk/Source/WebCore/css/CSSInheritedValue.h (235985 => 235986)
--- trunk/Source/WebCore/css/CSSInheritedValue.h 2018-09-13 19:44:57 UTC (rev 235985)
+++ trunk/Source/WebCore/css/CSSInheritedValue.h 2018-09-13 20:11:01 UTC (rev 235986)
@@ -30,13 +30,8 @@
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)
{
Modified: trunk/Source/WebCore/css/CSSInitialValue.h (235985 => 235986)
--- trunk/Source/WebCore/css/CSSInitialValue.h 2018-09-13 19:44:57 UTC (rev 235985)
+++ trunk/Source/WebCore/css/CSSInitialValue.h 2018-09-13 20:11:01 UTC (rev 235986)
@@ -41,13 +41,8 @@
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)
Modified: trunk/Source/WebCore/css/CSSPrimitiveValue.h (235985 => 235986)
--- trunk/Source/WebCore/css/CSSPrimitiveValue.h 2018-09-13 19:44:57 UTC (rev 235985)
+++ trunk/Source/WebCore/css/CSSPrimitiveValue.h 2018-09-13 20:11:01 UTC (rev 235986)
@@ -288,14 +288,9 @@
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);
Modified: trunk/Source/WebCore/css/CSSRevertValue.h (235985 => 235986)
--- trunk/Source/WebCore/css/CSSRevertValue.h 2018-09-13 19:44:57 UTC (rev 235985)
+++ trunk/Source/WebCore/css/CSSRevertValue.h 2018-09-13 20:11:01 UTC (rev 235986)
@@ -35,13 +35,8 @@
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)
{
Modified: trunk/Source/WebCore/css/CSSUnsetValue.h (235985 => 235986)
--- trunk/Source/WebCore/css/CSSUnsetValue.h 2018-09-13 19:44:57 UTC (rev 235985)
+++ trunk/Source/WebCore/css/CSSUnsetValue.h 2018-09-13 20:11:01 UTC (rev 235986)
@@ -35,13 +35,8 @@
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)
{
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
