⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 235986 in webkit


Ignore:
Timestamp:
Sep 13, 2018, 1:11:01 PM (8 years ago)
Author:
Fujii Hironori
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.
Location:
trunk/Source/WebCore
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r235982 r235986  
     12018-09-13  Fujii Hironori  <Hironori.Fujii@sony.com>
     2
     3        Remove the workaround for friend class LazyNeverDestroyed<X> statements for MSVC
     4        https://bugs.webkit.org/show_bug.cgi?id=189576
     5
     6        Reviewed by Alex Christensen.
     7
     8        Old MSVC can't compile "friend class LazyNeverDestroyed<X>"
     9        statements, but "friend LazyNeverDestroyed<X>".
     10
     11        No new tests (No behavior change).
     12
     13        * css/CSSInheritedValue.h: Removed the code for COMPILER(MSVC).
     14        Removed 'class' keyword in "friend class LazyNeverDestroyed<X>"
     15        statement.
     16        * css/CSSInitialValue.h: Ditto.
     17        * css/CSSPrimitiveValue.h: Ditto.
     18        * css/CSSRevertValue.h: Ditto.
     19        * css/CSSUnsetValue.h: Ditto.
     20
    1212018-09-13  Ms2ger  <Ms2ger@igalia.com>
    222

  • trunk/Source/WebCore/css/CSSInheritedValue.h

    r218588 r235986  
    3131    bool equals(const CSSInheritedValue&) const { return true; }
    3232
    33 #if COMPILER(MSVC)
    34     // FIXME: This should be private, but for some reason MSVC then fails to invoke it from LazyNeverDestroyed::construct.
    35 public:
    36 #else
    3733private:
    38     friend class LazyNeverDestroyed<CSSInheritedValue>;
    39 #endif
     34    friend LazyNeverDestroyed<CSSInheritedValue>;
    4035    CSSInheritedValue()
    4136        : CSSValue(InheritedClass)

  • trunk/Source/WebCore/css/CSSInitialValue.h

    r218588 r235986  
    4242    bool equals(const CSSInitialValue&) const { return true; }
    4343
    44 #if COMPILER(MSVC)
    45     // FIXME: This should be private, but for some reason MSVC then fails to invoke it from LazyNeverDestroyed::construct.
    46 public:
    47 #else
    4844private:
    49     friend class LazyNeverDestroyed<CSSInitialValue>;
    50 #endif
     45    friend LazyNeverDestroyed<CSSInitialValue>;
    5146    CSSInitialValue(bool implicit)
    5247        : CSSValue(InitialClass)

  • trunk/Source/WebCore/css/CSSPrimitiveValue.h

    r219744 r235986  
    289289    Ref<DeprecatedCSSOMPrimitiveValue> createDeprecatedCSSOMPrimitiveWrapper(CSSStyleDeclaration&) const;
    290290
    291 #if COMPILER(MSVC)
    292     // FIXME: This should be private, but for some reason MSVC then fails to invoke it from LazyNeverDestroyed::construct.
    293 public:
    294 #else
    295291private:
    296292    friend class CSSValuePool;
    297     friend class LazyNeverDestroyed<CSSPrimitiveValue>;
    298 #endif
     293    friend LazyNeverDestroyed<CSSPrimitiveValue>;
    299294
    300295    CSSPrimitiveValue(CSSValueID);

  • trunk/Source/WebCore/css/CSSRevertValue.h

    r218588 r235986  
    3636    bool equals(const CSSRevertValue&) const { return true; }
    3737
    38 #if COMPILER(MSVC)
    39     // FIXME: This should be private, but for some reason MSVC then fails to invoke it from LazyNeverDestroyed::construct.
    40 public:
    41 #else
    4238private:
    43     friend class LazyNeverDestroyed<CSSRevertValue>;
    44 #endif
     39    friend LazyNeverDestroyed<CSSRevertValue>;
    4540    CSSRevertValue()
    4641        : CSSValue(RevertClass)

  • trunk/Source/WebCore/css/CSSUnsetValue.h

    r218588 r235986  
    3636    bool equals(const CSSUnsetValue&) const { return true; }
    3737
    38 #if COMPILER(MSVC)
    39     // FIXME: This should be private, but for some reason MSVC then fails to invoke it from LazyNeverDestroyed::construct.
    40 public:
    41 #else
    4238private:
    43     friend class LazyNeverDestroyed<CSSUnsetValue>;
    44 #endif
     39    friend LazyNeverDestroyed<CSSUnsetValue>;
    4540    CSSUnsetValue()
    4641        : CSSValue(UnsetClass)
Note: See TracChangeset for help on using the changeset viewer.