Changeset 206222 in webkit


Ignore:
Timestamp:
Sep 21, 2016 11:24:43 AM (8 years ago)
Author:
keith_miller@apple.com
Message:

Fix build for future versions of Clang.
​https://bugs.webkit.org/show_bug.cgi?id=162346

Reviewed by Filip Pizlo.

Source/JavaScriptCore:

This fixes issues with the WebCore build where inline
template-class function definitions are marked as exported. This
genereates a weak external symobl that our build does not like.

  • runtime/VM.h:

(JSC::VM::setGlobalConstRedeclarationShouldThrow):

Source/WebCore:

This fixes issues with the WebCore build where inline
template-class function definitions are marked as exported. This
genereates a weak external symobl that our build does not like.

  • Configurations/WebCore.unexp:
  • dom/Exception.h:
  • page/Frame.h:
  • platform/cocoa/WebPlaybackSessionModelMediaElement.h:
  • platform/cocoa/WebVideoFullscreenModelVideoElement.h:

(WebCore::WebVideoFullscreenModelVideoElement::videoElement):

  • platform/graphics/Color.h:
  • platform/graphics/transforms/TransformationMatrix.h:

(WebCore::TransformationMatrix::rotate):

  • platform/mac/WebVideoFullscreenInterfaceMac.h:
  • platform/network/ParsedContentRange.h:

(WebCore::ParsedContentRange::ParsedContentRange):
(WebCore::ParsedContentRange::isValid):

  • platform/network/ResourceResponseBase.h:

(WebCore::ResourceResponseBase::certificateInfo):

  • platform/text/TextStream.h:

(WebCore::TextStream::increaseIndent):
(WebCore::TextStream::decreaseIndent):

Source/WTF:

This fixes issues with the WebCore build where inline
template-class function definitions are marked as exported. This
genereates a weak external symobl that our build does not like.

  • wtf/text/StringImpl.h:

Tools:

  • TestWebKitAPI/Counters.cpp:
  • TestWebKitAPI/Counters.h:

(DeleterCounter::deleterCount):
(DeleterCounter::TestingScope::TestingScope):
(DeleterCounter::operator()):

  • TestWebKitAPI/Tests/WTF/HashCountedSet.cpp:

(TestWebKitAPI::TEST):

  • TestWebKitAPI/Tests/WTF/HashMap.cpp:

(TestWebKitAPI::TEST):

Location:
trunk
Files:
21 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/JavaScriptCore/ChangeLog

    r206221 r206222  
     12016-09-21  Keith Miller  <keith_miller@apple.com>
     2
     3        Fix build for future versions of Clang.
     4        https://bugs.webkit.org/show_bug.cgi?id=162346
     5
     6        Reviewed by Filip Pizlo.
     7
     8        This fixes issues with the WebCore build where inline
     9        template-class function definitions are marked as exported. This
     10        genereates a weak external symobl that our build does not like.
     11
     12
     13        * runtime/VM.h:
     14        (JSC::VM::setGlobalConstRedeclarationShouldThrow):
     15
    1162016-09-21  Chris Dumez  <cdumez@apple.com>
    217

  • trunk/Source/JavaScriptCore/runtime/VM.h

    r206160 r206222  
    617617    JS_EXPORT_PRIVATE void queueMicrotask(JSGlobalObject*, PassRefPtr<Microtask>);
    618618    JS_EXPORT_PRIVATE void drainMicrotasks();
    619     JS_EXPORT_PRIVATE void setGlobalConstRedeclarationShouldThrow(bool globalConstRedeclarationThrow) { m_globalConstRedeclarationShouldThrow = globalConstRedeclarationThrow; }
     619    void setGlobalConstRedeclarationShouldThrow(bool globalConstRedeclarationThrow) { m_globalConstRedeclarationShouldThrow = globalConstRedeclarationThrow; }
    620620    ALWAYS_INLINE bool globalConstRedeclarationShouldThrow() const { return m_globalConstRedeclarationShouldThrow; }
    621621

  • trunk/Source/WTF/ChangeLog

    r206196 r206222  
     12016-09-21  Keith Miller  <keith_miller@apple.com>
     2
     3        Fix build for future versions of Clang.
     4        https://bugs.webkit.org/show_bug.cgi?id=162346
     5
     6        Reviewed by Filip Pizlo.
     7
     8        This fixes issues with the WebCore build where inline
     9        template-class function definitions are marked as exported. This
     10        genereates a weak external symobl that our build does not like.
     11
     12        * wtf/text/StringImpl.h:
     13
    1142016-09-20  Alex Christensen  <achristensen@webkit.org>
    215

  • trunk/Source/WTF/wtf/text/StringImpl.h

    r206196 r206222  
    949949bool equalIgnoringASCIICase(const StringImpl&, const StringImpl&);
    950950WTF_EXPORT_STRING_API bool equalIgnoringASCIICase(const StringImpl*, const StringImpl*);
    951 WTF_EXPORT_STRING_API bool equalIgnoringASCIICase(const StringImpl&, const char*);
    952 WTF_EXPORT_STRING_API bool equalIgnoringASCIICase(const StringImpl*, const char*);
     951bool equalIgnoringASCIICase(const StringImpl&, const char*);
     952bool equalIgnoringASCIICase(const StringImpl*, const char*);
    953953
    954954WTF_EXPORT_STRING_API bool equalIgnoringASCIICaseNonNull(const StringImpl*, const StringImpl*);

  • trunk/Source/WebCore/ChangeLog

    r206221 r206222  
     12016-09-21  Keith Miller  <keith_miller@apple.com>
     2
     3        Fix build for future versions of Clang.
     4        https://bugs.webkit.org/show_bug.cgi?id=162346
     5
     6        Reviewed by Filip Pizlo.
     7
     8        This fixes issues with the WebCore build where inline
     9        template-class function definitions are marked as exported. This
     10        genereates a weak external symobl that our build does not like.
     11
     12        * Configurations/WebCore.unexp:
     13        * dom/Exception.h:
     14        * page/Frame.h:
     15        * platform/cocoa/WebPlaybackSessionModelMediaElement.h:
     16        * platform/cocoa/WebVideoFullscreenModelVideoElement.h:
     17        (WebCore::WebVideoFullscreenModelVideoElement::videoElement):
     18        * platform/graphics/Color.h:
     19        * platform/graphics/transforms/TransformationMatrix.h:
     20        (WebCore::TransformationMatrix::rotate):
     21        * platform/mac/WebVideoFullscreenInterfaceMac.h:
     22        * platform/network/ParsedContentRange.h:
     23        (WebCore::ParsedContentRange::ParsedContentRange):
     24        (WebCore::ParsedContentRange::isValid):
     25        * platform/network/ResourceResponseBase.h:
     26        (WebCore::ResourceResponseBase::certificateInfo):
     27        * platform/text/TextStream.h:
     28        (WebCore::TextStream::increaseIndent):
     29        (WebCore::TextStream::decreaseIndent):
     30
    1312016-09-21  Chris Dumez  <cdumez@apple.com>
    232

  • trunk/Source/WebCore/Configurations/WebCore.unexp

    r184419 r206222  
    4848_DDDFAScannerFirstResultInUnicharArray
    4949# Source/WebCore/page/mac/ServicesOverlayController.mm
     50_DDHighlightGetLayerWithContext
     51_DDHighlightGetBoundingRect
    5052_DDHighlightCreateWithRectsInVisibleRectWithStyleAndDirection
    5153_DDHighlightPointIsOnHighlight
     54
    5255
    5356# Subclasses of an exported C++ class in JavaScriptCore.

  • trunk/Source/WebCore/dom/Exception.h

    r205411 r206222  
    3535    explicit Exception(ExceptionCode);
    3636
    37     WEBCORE_EXPORT ExceptionCode code() const;
     37    ExceptionCode code() const;
    3838
    3939private:

  • trunk/Source/WebCore/page/Frame.h

    r206189 r206222  
    136136
    137137        MainFrame& mainFrame() const;
    138         WEBCORE_EXPORT bool isMainFrame() const;
     138        bool isMainFrame() const;
    139139
    140140        Page* page() const;

  • trunk/Source/WebCore/platform/cocoa/WebPlaybackSessionModelMediaElement.h

    r205365 r206222  
    4949    WEBCORE_EXPORT virtual ~WebPlaybackSessionModelMediaElement();
    5050    WEBCORE_EXPORT void setMediaElement(HTMLMediaElement*);
    51     WEBCORE_EXPORT HTMLMediaElement* mediaElement() const { return m_mediaElement.get(); }
     51    HTMLMediaElement* mediaElement() const { return m_mediaElement.get(); }
    5252
    5353    WEBCORE_EXPORT void handleEvent(WebCore::ScriptExecutionContext*, WebCore::Event*) final;

  • trunk/Source/WebCore/platform/cocoa/WebVideoFullscreenModelVideoElement.h

    r205365 r206222  
    5555    WEBCORE_EXPORT virtual ~WebVideoFullscreenModelVideoElement();
    5656    WEBCORE_EXPORT void setVideoElement(HTMLVideoElement*);
    57     WEBCORE_EXPORT HTMLVideoElement* videoElement() const { return m_videoElement.get(); }
     57    HTMLVideoElement* videoElement() const { return m_videoElement.get(); }
    5858    WEBCORE_EXPORT void setVideoFullscreenLayer(PlatformLayer*, std::function<void()> completionHandler = [] { });
    5959    WEBCORE_EXPORT void waitForPreparedForInlineThen(std::function<void()> completionHandler = [] { });

  • trunk/Source/WebCore/platform/graphics/Color.h

    r206056 r206222  
    6767
    6868WEBCORE_EXPORT RGBA32 colorWithOverrideAlpha(RGBA32 color, float overrideAlpha);
    69 WEBCORE_EXPORT RGBA32 colorWithOverrideAlpha(RGBA32 color, Optional<float> overrideAlpha);
     69RGBA32 colorWithOverrideAlpha(RGBA32 color, Optional<float> overrideAlpha);
    7070
    7171WEBCORE_EXPORT RGBA32 makeRGBA32FromFloats(float r, float g, float b, float a);

  • trunk/Source/WebCore/platform/graphics/transforms/TransformationMatrix.h

    r205881 r206222  
    232232
    233233    // Angle is in degrees.
    234     WEBCORE_EXPORT TransformationMatrix& rotate(double d) { return rotate3d(0, 0, d); }
     234    TransformationMatrix& rotate(double d) { return rotate3d(0, 0, d); }
    235235    TransformationMatrix& rotateFromVector(double x, double y);
    236236    WEBCORE_EXPORT TransformationMatrix& rotate3d(double rx, double ry, double rz);

  • trunk/Source/WebCore/platform/mac/WebVideoFullscreenInterfaceMac.h

    r205365 r206222  
    7979    WEBCORE_EXPORT void cleanupFullscreen();
    8080    WEBCORE_EXPORT void invalidate();
    81     WEBCORE_EXPORT void requestHideAndExitFullscreen() { }
     81    void requestHideAndExitFullscreen() { }
    8282    WEBCORE_EXPORT void preparedToReturnToInline(bool visible, const IntRect& inlineRect, NSWindow *parentWindow);
    8383    WEBCORE_EXPORT void ensureControlsManager();
    … …  
    9191    bool isPlayingVideoInEnhancedFullscreen() const;
    9292
    93     WEBCORE_EXPORT bool mayAutomaticallyShowVideoPictureInPicture() const { return false; }
     93    bool mayAutomaticallyShowVideoPictureInPicture() const { return false; }
    9494    void applicationDidBecomeActive() { }
    9595

  • trunk/Source/WebCore/platform/network/ParsedContentRange.h

    r195764 r206222  
    3434public:
    3535    WEBCORE_EXPORT explicit ParsedContentRange(const String&);
    36     WEBCORE_EXPORT ParsedContentRange() { }
     36    ParsedContentRange() { }
    3737    WEBCORE_EXPORT ParsedContentRange(int64_t firstBytePosition, int64_t lastBytePosition, int64_t instanceLength);
    3838
    39     WEBCORE_EXPORT bool isValid() const { return m_isValid; }
     39    bool isValid() const { return m_isValid; }
    4040    int64_t firstBytePosition() const { return m_firstBytePosition; }
    4141    int64_t lastBytePosition() const { return m_lastBytePosition; }

  • trunk/Source/WebCore/platform/network/ResourceResponseBase.h

    r204977 r206222  
    116116
    117117    WEBCORE_EXPORT void includeCertificateInfo() const;
    118     WEBCORE_EXPORT const Optional<CertificateInfo>& certificateInfo() const { return m_certificateInfo; };
     118    const Optional<CertificateInfo>& certificateInfo() const { return m_certificateInfo; };
    119119   
    120120    // These functions return parsed values of the corresponding response headers.

  • trunk/Source/WebCore/platform/text/TextStream.h

    r191474 r206222  
    7878    WEBCORE_EXPORT void nextLine(); // Output newline and indent.
    7979
    80     WEBCORE_EXPORT void increaseIndent() { ++m_indent; }
    81     WEBCORE_EXPORT void decreaseIndent() { --m_indent; ASSERT(m_indent >= 0); }
     80    void increaseIndent() { ++m_indent; }
     81    void decreaseIndent() { --m_indent; ASSERT(m_indent >= 0); }
    8282
    8383    WEBCORE_EXPORT void writeIndent();

  • trunk/Tools/ChangeLog

    r206220 r206222  
     12016-09-21  Keith Miller  <keith_miller@apple.com>
     2
     3        Fix build for future versions of Clang.
     4        https://bugs.webkit.org/show_bug.cgi?id=162346
     5
     6        Reviewed by Filip Pizlo.
     7
     8        * TestWebKitAPI/Counters.cpp:
     9        * TestWebKitAPI/Counters.h:
     10        (DeleterCounter::deleterCount):
     11        (DeleterCounter::TestingScope::TestingScope):
     12        (DeleterCounter::operator()):
     13        * TestWebKitAPI/Tests/WTF/HashCountedSet.cpp:
     14        (TestWebKitAPI::TEST):
     15        * TestWebKitAPI/Tests/WTF/HashMap.cpp:
     16        (TestWebKitAPI::TEST):
     17
    1182016-09-21  Alex Christensen  <achristensen@webkit.org>
    219

  • trunk/Tools/TestWebKitAPI/Counters.cpp

    r198085 r206222  
    3434unsigned ConstructorDestructorCounter::destructionCount = 0;
    3535
    36 template<> unsigned DeleterCounter<ConstructorDestructorCounter>::deleterCount = 0;
     36template<> unsigned DeleterCounter<ConstructorDestructorCounter>::m_deleterCount = 0;

  • trunk/Tools/TestWebKitAPI/Counters.h

    r198085 r206222  
    6666};
    6767
     68#if COMPILER(CLANG)
     69#if __has_warning("-Wundefined-var-template")
     70#pragma clang diagnostic push
     71#pragma clang diagnostic ignored "-Wundefined-var-template"
     72#endif
     73#endif
    6874template<typename T>
    6975struct DeleterCounter {
    70     static unsigned deleterCount;
     76    static unsigned m_deleterCount;
     77
     78    static unsigned deleterCount() { return m_deleterCount; }
    7179
    7280    struct TestingScope {
    7381        TestingScope()
    7482        {
    75             deleterCount = 0;
     83            m_deleterCount = 0;
    7684        }
    7785    };
    … …  
    7987    void operator()(T* p) const
    8088    {
    81         deleterCount++;
     89        m_deleterCount++;
    8290        delete p;
    8391    }
    8492};
     93#if COMPILER(CLANG)
     94#if __has_warning("-Wundefined-var-template")
     95#pragma clang diagnostic pop
     96#endif
     97#endif
    8598
    8699#endif // Counters_h

  • trunk/Tools/TestWebKitAPI/Tests/WTF/HashCountedSet.cpp

    r202242 r206222  
    285285    EXPECT_EQ(0u, ConstructorDestructorCounter::destructionCount);
    286286   
    287     EXPECT_EQ(0u, DeleterCounter<ConstructorDestructorCounter>::deleterCount);
     287    EXPECT_EQ(0u, DeleterCounter<ConstructorDestructorCounter>::deleterCount());
    288288   
    289289    hashCountedSet.clear();
    … …  
    292292    EXPECT_EQ(1u, ConstructorDestructorCounter::destructionCount);
    293293   
    294     EXPECT_EQ(1u, DeleterCounter<ConstructorDestructorCounter>::deleterCount);
     294    EXPECT_EQ(1u, DeleterCounter<ConstructorDestructorCounter>::deleterCount());
    295295}
    296296

  • trunk/Tools/TestWebKitAPI/Tests/WTF/HashMap.cpp

    r205694 r206222  
    207207    EXPECT_EQ(0u, ConstructorDestructorCounter::destructionCount);
    208208
    209     EXPECT_EQ(0u, DeleterCounter<ConstructorDestructorCounter>::deleterCount);
     209    EXPECT_EQ(0u, DeleterCounter<ConstructorDestructorCounter>::deleterCount());
    210210
    211211    map.clear();
    … …  
    214214    EXPECT_EQ(1u, ConstructorDestructorCounter::destructionCount);
    215215
    216     EXPECT_EQ(1u, DeleterCounter<ConstructorDestructorCounter>::deleterCount);
     216    EXPECT_EQ(1u, DeleterCounter<ConstructorDestructorCounter>::deleterCount());
    217217}
    218218
Note: See TracChangeset for help on using the changeset viewer.