Attachment 349637 Details for Bug 189576 – Patch

[patch] Patch

bug-189576-20180913161345.patch (text/plain), 4.74 KB, created by Fujii Hironori on 2018-09-13 00:13:47 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Fujii Hironori

Created: 2018-09-13 00:13:47 PDT

Size: 4.74 KB

patch

obsolete

>Subversion Revision: 235967
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index f024f6b73f371ab33db786c71111c6a47a774f40..bf4556d1fe0c239898112f852d22fd88cc53feb1 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,23 @@
>+2018-09-12  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 NOBODY (OOPS!).
>+
>+        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-11  Ryosuke Niwa  <rniwa@webkit.org>
> 
>         imported/w3c/web-platform-tests/shadow-dom/form-control-form-attribute.html hits assertion
>diff --git a/Source/WebCore/css/CSSInheritedValue.h b/Source/WebCore/css/CSSInheritedValue.h
>index 17a23c0ad287b151b6bc147469f47c15599b82d4..fbc070cf9a7edeab725dc46c70f0b93dd9a88fbf 100644
>--- 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 b6b19618e882ef55d0c5f6dee3b751b314738141..4f2c9cf71a33abccf1383a069f4e45817d301c19 100644
>--- 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 f20840eadf4b60ee3be2da830b726965a83b18e2..ae7be2eb2b75df78214af5c6ad5f5026e91031dc 100644
>--- 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 37bd7406eace4f37a7ac75d93f2891d2a2d7f6a4..305b4090ff5fbc8edf6be893db5065b5cf9e35bb 100644
>--- 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 523c4687927580658fd56d264653a76923c740b4..2a494ed8fd093d2c885af4b7d5b2d2af24813f5d 100644
>--- 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)
>     {

Actions: View | Formatted Diff | Diff

Attachments on bug 189576: 349637