Unreviewed, rolling out r206222 and r206227.
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 21 Sep 2016 21:22:00 +0000 (21:22 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 21 Sep 2016 21:22:00 +0000 (21:22 +0000)
https://bugs.webkit.org/show_bug.cgi?id=162361

"broke the windows build" (Requested by keith_mi_ on #webkit).

Reverted changesets:

"Fix build for future versions of Clang."
https://bugs.webkit.org/show_bug.cgi?id=162346
http://trac.webkit.org/changeset/206222

"Attempt to fix windows build after r206222."
http://trac.webkit.org/changeset/206227

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

22 files changed:
Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/runtime/VM.h
Source/WTF/ChangeLog
Source/WTF/wtf/text/StringImpl.h
Source/WebCore/ChangeLog
Source/WebCore/Configurations/WebCore.unexp
Source/WebCore/dom/Exception.h
Source/WebCore/page/Frame.h
Source/WebCore/page/MainFrame.h
Source/WebCore/platform/cocoa/WebPlaybackSessionModelMediaElement.h
Source/WebCore/platform/cocoa/WebVideoFullscreenModelVideoElement.h
Source/WebCore/platform/graphics/Color.h
Source/WebCore/platform/graphics/transforms/TransformationMatrix.h
Source/WebCore/platform/mac/WebVideoFullscreenInterfaceMac.h
Source/WebCore/platform/network/ParsedContentRange.h
Source/WebCore/platform/network/ResourceResponseBase.h
Source/WebCore/platform/text/TextStream.h
Tools/ChangeLog
Tools/TestWebKitAPI/Counters.cpp
Tools/TestWebKitAPI/Counters.h
Tools/TestWebKitAPI/Tests/WTF/HashCountedSet.cpp
Tools/TestWebKitAPI/Tests/WTF/HashMap.cpp

index 0896dea..d53de46 100644 (file)
@@ -1,3 +1,19 @@
+2016-09-21  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r206222 and r206227.
+        https://bugs.webkit.org/show_bug.cgi?id=162361
+
+        "broke the windows build" (Requested by keith_mi_ on #webkit).
+
+        Reverted changesets:
+
+        "Fix build for future versions of Clang."
+        https://bugs.webkit.org/show_bug.cgi?id=162346
+        http://trac.webkit.org/changeset/206222
+
+        "Attempt to fix windows build after r206222."
+        http://trac.webkit.org/changeset/206227
+
 2016-09-21  Filip Pizlo  <fpizlo@apple.com>
 
         Add a Fence opcode to B3
index 198d1e9..a3ac19d 100644 (file)
@@ -616,7 +616,7 @@ public:
 
     JS_EXPORT_PRIVATE void queueMicrotask(JSGlobalObject*, PassRefPtr<Microtask>);
     JS_EXPORT_PRIVATE void drainMicrotasks();
-    void setGlobalConstRedeclarationShouldThrow(bool globalConstRedeclarationThrow) { m_globalConstRedeclarationShouldThrow = globalConstRedeclarationThrow; }
+    JS_EXPORT_PRIVATE void setGlobalConstRedeclarationShouldThrow(bool globalConstRedeclarationThrow) { m_globalConstRedeclarationShouldThrow = globalConstRedeclarationThrow; }
     ALWAYS_INLINE bool globalConstRedeclarationShouldThrow() const { return m_globalConstRedeclarationShouldThrow; }
 
     inline bool shouldTriggerTermination(ExecState*);
index 82bb65e..eaab4b2 100644 (file)
@@ -1,3 +1,19 @@
+2016-09-21  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r206222 and r206227.
+        https://bugs.webkit.org/show_bug.cgi?id=162361
+
+        "broke the windows build" (Requested by keith_mi_ on #webkit).
+
+        Reverted changesets:
+
+        "Fix build for future versions of Clang."
+        https://bugs.webkit.org/show_bug.cgi?id=162346
+        http://trac.webkit.org/changeset/206222
+
+        "Attempt to fix windows build after r206222."
+        http://trac.webkit.org/changeset/206227
+
 2016-09-21  Keith Miller  <keith_miller@apple.com>
 
         Fix build for future versions of Clang.
index 421a923..ecc32af 100644 (file)
@@ -948,8 +948,8 @@ WTF_EXPORT_STRING_API bool equalIgnoringNullity(const UChar*, size_t length, Str
 
 bool equalIgnoringASCIICase(const StringImpl&, const StringImpl&);
 WTF_EXPORT_STRING_API bool equalIgnoringASCIICase(const StringImpl*, const StringImpl*);
-bool equalIgnoringASCIICase(const StringImpl&, const char*);
-bool equalIgnoringASCIICase(const StringImpl*, const char*);
+WTF_EXPORT_STRING_API bool equalIgnoringASCIICase(const StringImpl&, const char*);
+WTF_EXPORT_STRING_API bool equalIgnoringASCIICase(const StringImpl*, const char*);
 
 WTF_EXPORT_STRING_API bool equalIgnoringASCIICaseNonNull(const StringImpl*, const StringImpl*);
 
index 8340ada..db3e382 100644 (file)
@@ -1,3 +1,19 @@
+2016-09-21  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r206222 and r206227.
+        https://bugs.webkit.org/show_bug.cgi?id=162361
+
+        "broke the windows build" (Requested by keith_mi_ on #webkit).
+
+        Reverted changesets:
+
+        "Fix build for future versions of Clang."
+        https://bugs.webkit.org/show_bug.cgi?id=162346
+        http://trac.webkit.org/changeset/206222
+
+        "Attempt to fix windows build after r206222."
+        http://trac.webkit.org/changeset/206227
+
 2016-09-21  Alex Christensen  <achristensen@webkit.org>
 
         URLParser should match URL::parse when parsing data urls with slashes in them
index d120eb7..311e73a 100644 (file)
@@ -47,12 +47,9 @@ _VTPixelTransferSessionTransferImage
 _DDDFAScannerCreateFromCache
 _DDDFAScannerFirstResultInUnicharArray
 # Source/WebCore/page/mac/ServicesOverlayController.mm
-_DDHighlightGetLayerWithContext
-_DDHighlightGetBoundingRect
 _DDHighlightCreateWithRectsInVisibleRectWithStyleAndDirection
 _DDHighlightPointIsOnHighlight
 
-
 # Subclasses of an exported C++ class in JavaScriptCore.
 
 # Source/JavaScriptCore/inspector/ScriptDebugServer.h
index bc39523..1acbd5f 100644 (file)
@@ -34,7 +34,7 @@ class Exception {
 public:
     explicit Exception(ExceptionCode);
 
-    ExceptionCode code() const;
+    WEBCORE_EXPORT ExceptionCode code() const;
 
 private:
     ExceptionCode m_code;
index fbfdcb9..abf8368 100644 (file)
@@ -135,7 +135,7 @@ namespace WebCore {
         void disconnectOwnerElement();
 
         MainFrame& mainFrame() const;
-        bool isMainFrame() const;
+        WEBCORE_EXPORT bool isMainFrame() const;
 
         Page* page() const;
         HTMLFrameOwnerElement* ownerElement() const;
index 28c456c..7fc1b95 100644 (file)
@@ -89,7 +89,7 @@ private:
 #endif
 };
 
-ALWAYS_INLINE bool Frame::isMainFrame() const
+inline bool Frame::isMainFrame() const
 {
     return this == &m_mainFrame;
 }
index b9d23f7..b8ce150 100644 (file)
@@ -48,7 +48,7 @@ public:
     }
     WEBCORE_EXPORT virtual ~WebPlaybackSessionModelMediaElement();
     WEBCORE_EXPORT void setMediaElement(HTMLMediaElement*);
-    HTMLMediaElement* mediaElement() const { return m_mediaElement.get(); }
+    WEBCORE_EXPORT HTMLMediaElement* mediaElement() const { return m_mediaElement.get(); }
 
     WEBCORE_EXPORT void handleEvent(WebCore::ScriptExecutionContext*, WebCore::Event*) final;
     void updateForEventName(const WTF::AtomicString&);
index 9d1179a..ffc8749 100644 (file)
@@ -54,7 +54,7 @@ public:
     }
     WEBCORE_EXPORT virtual ~WebVideoFullscreenModelVideoElement();
     WEBCORE_EXPORT void setVideoElement(HTMLVideoElement*);
-    HTMLVideoElement* videoElement() const { return m_videoElement.get(); }
+    WEBCORE_EXPORT HTMLVideoElement* videoElement() const { return m_videoElement.get(); }
     WEBCORE_EXPORT void setVideoFullscreenLayer(PlatformLayer*, std::function<void()> completionHandler = [] { });
     WEBCORE_EXPORT void waitForPreparedForInlineThen(std::function<void()> completionHandler = [] { });
     
index 652003a..3f3a7b3 100644 (file)
@@ -66,7 +66,7 @@ RGBA32 makePremultipliedRGBA(int r, int g, int b, int a);
 RGBA32 makeUnPremultipliedRGBA(int r, int g, int b, int a);
 
 WEBCORE_EXPORT RGBA32 colorWithOverrideAlpha(RGBA32 color, float overrideAlpha);
-RGBA32 colorWithOverrideAlpha(RGBA32 color, Optional<float> overrideAlpha);
+WEBCORE_EXPORT RGBA32 colorWithOverrideAlpha(RGBA32 color, Optional<float> overrideAlpha);
 
 WEBCORE_EXPORT RGBA32 makeRGBA32FromFloats(float r, float g, float b, float a);
 RGBA32 makeRGBAFromHSLA(double h, double s, double l, double a);
index 06547d4..73ff363 100644 (file)
@@ -231,7 +231,7 @@ public:
     TransformationMatrix& scale3d(double sx, double sy, double sz);
 
     // Angle is in degrees.
-    TransformationMatrix& rotate(double d) { return rotate3d(0, 0, d); }
+    WEBCORE_EXPORT TransformationMatrix& rotate(double d) { return rotate3d(0, 0, d); }
     TransformationMatrix& rotateFromVector(double x, double y);
     WEBCORE_EXPORT TransformationMatrix& rotate3d(double rx, double ry, double rz);
     
index f9f4a55..db18c0d 100644 (file)
@@ -78,7 +78,7 @@ public:
     WEBCORE_EXPORT void exitFullscreenWithoutAnimationToMode(HTMLMediaElementEnums::VideoFullscreenMode);
     WEBCORE_EXPORT void cleanupFullscreen();
     WEBCORE_EXPORT void invalidate();
-    void requestHideAndExitFullscreen() { }
+    WEBCORE_EXPORT void requestHideAndExitFullscreen() { }
     WEBCORE_EXPORT void preparedToReturnToInline(bool visible, const IntRect& inlineRect, NSWindow *parentWindow);
     WEBCORE_EXPORT void ensureControlsManager();
 
@@ -90,7 +90,7 @@ public:
 
     bool isPlayingVideoInEnhancedFullscreen() const;
 
-    bool mayAutomaticallyShowVideoPictureInPicture() const { return false; }
+    WEBCORE_EXPORT bool mayAutomaticallyShowVideoPictureInPicture() const { return false; }
     void applicationDidBecomeActive() { }
 
     WEBCORE_EXPORT WebVideoFullscreenInterfaceMacObjC *videoFullscreenInterfaceObjC();
index 281b803..cfbf2da 100644 (file)
@@ -33,10 +33,10 @@ namespace WebCore {
 class ParsedContentRange {
 public:
     WEBCORE_EXPORT explicit ParsedContentRange(const String&);
-    ParsedContentRange() { }
+    WEBCORE_EXPORT ParsedContentRange() { }
     WEBCORE_EXPORT ParsedContentRange(int64_t firstBytePosition, int64_t lastBytePosition, int64_t instanceLength);
 
-    bool isValid() const { return m_isValid; }
+    WEBCORE_EXPORT bool isValid() const { return m_isValid; }
     int64_t firstBytePosition() const { return m_firstBytePosition; }
     int64_t lastBytePosition() const { return m_lastBytePosition; }
     int64_t instanceLength() const { return m_instanceLength; }
index 7d68951..ce1a5fb 100644 (file)
@@ -115,7 +115,7 @@ public:
     WEBCORE_EXPORT String suggestedFilename() const;
 
     WEBCORE_EXPORT void includeCertificateInfo() const;
-    const Optional<CertificateInfo>& certificateInfo() const { return m_certificateInfo; };
+    WEBCORE_EXPORT const Optional<CertificateInfo>& certificateInfo() const { return m_certificateInfo; };
     
     // These functions return parsed values of the corresponding response headers.
     // NaN means that the header was not present or had invalid value.
index f1e62d3..87eecb3 100644 (file)
@@ -77,8 +77,8 @@ public:
     WEBCORE_EXPORT void endGroup();
     WEBCORE_EXPORT void nextLine(); // Output newline and indent.
 
-    void increaseIndent() { ++m_indent; }
-    void decreaseIndent() { --m_indent; ASSERT(m_indent >= 0); }
+    WEBCORE_EXPORT void increaseIndent() { ++m_indent; }
+    WEBCORE_EXPORT void decreaseIndent() { --m_indent; ASSERT(m_indent >= 0); }
 
     WEBCORE_EXPORT void writeIndent();
 
index 7e6e879..1949bcd 100644 (file)
@@ -1,3 +1,19 @@
+2016-09-21  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r206222 and r206227.
+        https://bugs.webkit.org/show_bug.cgi?id=162361
+
+        "broke the windows build" (Requested by keith_mi_ on #webkit).
+
+        Reverted changesets:
+
+        "Fix build for future versions of Clang."
+        https://bugs.webkit.org/show_bug.cgi?id=162346
+        http://trac.webkit.org/changeset/206222
+
+        "Attempt to fix windows build after r206222."
+        http://trac.webkit.org/changeset/206227
+
 2016-09-21  Alex Christensen  <achristensen@webkit.org>
 
         URLParser should match URL::parse when parsing data urls with slashes in them
index 536a434..ada3de8 100644 (file)
@@ -33,4 +33,4 @@ unsigned CopyMoveCounter::moveCount = 0;
 unsigned ConstructorDestructorCounter::constructionCount = 0;
 unsigned ConstructorDestructorCounter::destructionCount = 0;
 
-template<> unsigned DeleterCounter<ConstructorDestructorCounter>::m_deleterCount = 0;
+template<> unsigned DeleterCounter<ConstructorDestructorCounter>::deleterCount = 0;
index f9ea224..1335d2b 100644 (file)
@@ -65,35 +65,22 @@ struct ConstructorDestructorCounter {
     ~ConstructorDestructorCounter() { destructionCount++; }
 };
 
-#if COMPILER(CLANG)
-#if __has_warning("-Wundefined-var-template")
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wundefined-var-template"
-#endif
-#endif
 template<typename T>
 struct DeleterCounter {
-    static unsigned m_deleterCount;
-
-    static unsigned deleterCount() { return m_deleterCount; }
+    static unsigned deleterCount;
 
     struct TestingScope {
         TestingScope()
         {
-            m_deleterCount = 0;
+            deleterCount = 0;
         }
     };
 
     void operator()(T* p) const
     {
-        m_deleterCount++;
+        deleterCount++;
         delete p;
     }
 };
-#if COMPILER(CLANG)
-#if __has_warning("-Wundefined-var-template")
-#pragma clang diagnostic pop
-#endif
-#endif
 
 #endif // Counters_h
index 9627bd0..6a7bb19 100644 (file)
@@ -284,14 +284,14 @@ TEST(WTF_HashCountedSet, UniquePtrKey_CustomDeleter)
     EXPECT_EQ(1u, ConstructorDestructorCounter::constructionCount);
     EXPECT_EQ(0u, ConstructorDestructorCounter::destructionCount);
     
-    EXPECT_EQ(0u, DeleterCounter<ConstructorDestructorCounter>::deleterCount());
+    EXPECT_EQ(0u, DeleterCounter<ConstructorDestructorCounter>::deleterCount);
     
     hashCountedSet.clear();
     
     EXPECT_EQ(1u, ConstructorDestructorCounter::constructionCount);
     EXPECT_EQ(1u, ConstructorDestructorCounter::destructionCount);
     
-    EXPECT_EQ(1u, DeleterCounter<ConstructorDestructorCounter>::deleterCount());
+    EXPECT_EQ(1u, DeleterCounter<ConstructorDestructorCounter>::deleterCount);
 }
 
 TEST(WTF_HashCountedSet, UniquePtrKey_FindUsingRawPointer)
index b5bfc1a..a109d3f 100644 (file)
@@ -206,14 +206,14 @@ TEST(WTF_HashMap, UniquePtrKey_CustomDeleter)
     EXPECT_EQ(1u, ConstructorDestructorCounter::constructionCount);
     EXPECT_EQ(0u, ConstructorDestructorCounter::destructionCount);
 
-    EXPECT_EQ(0u, DeleterCounter<ConstructorDestructorCounter>::deleterCount());
+    EXPECT_EQ(0u, DeleterCounter<ConstructorDestructorCounter>::deleterCount);
 
     map.clear();
     
     EXPECT_EQ(1u, ConstructorDestructorCounter::constructionCount);
     EXPECT_EQ(1u, ConstructorDestructorCounter::destructionCount);
 
-    EXPECT_EQ(1u, DeleterCounter<ConstructorDestructorCounter>::deleterCount());
+    EXPECT_EQ(1u, DeleterCounter<ConstructorDestructorCounter>::deleterCount);
 }
 
 TEST(WTF_HashMap, UniquePtrKey_FindUsingRawPointer)