Title: [220866] tags/Safari-605.1.3

Diff

Modified: tags/Safari-605.1.3/Source/_javascript_Core/ChangeLog (220865 => 220866)


--- tags/Safari-605.1.3/Source/_javascript_Core/ChangeLog	2017-08-17 18:34:15 UTC (rev 220865)
+++ tags/Safari-605.1.3/Source/_javascript_Core/ChangeLog	2017-08-17 18:43:29 UTC (rev 220866)
@@ -1,3 +1,7 @@
+2017-08-17  Jason Marcell  <[email protected]>
+
+        Revert r220601. rdar://problem/33928369
+
 2017-08-16  Csaba Osztrogonác  <[email protected]>
 
         Fix JSCOnly ARM buildbots after r220047 and r220184

Modified: tags/Safari-605.1.3/Source/_javascript_Core/runtime/ArrayBuffer.cpp (220865 => 220866)


--- tags/Safari-605.1.3/Source/_javascript_Core/runtime/ArrayBuffer.cpp	2017-08-17 18:34:15 UTC (rev 220865)
+++ tags/Safari-605.1.3/Source/_javascript_Core/runtime/ArrayBuffer.cpp	2017-08-17 18:43:29 UTC (rev 220866)
@@ -132,7 +132,7 @@
     other.m_sizeInBytes = m_sizeInBytes;
     other.m_destructor = WTFMove(m_destructor);
     other.m_shared = m_shared;
-    reset();
+    clear();
 }
 
 void ArrayBufferContents::copyTo(ArrayBufferContents& other)

Modified: tags/Safari-605.1.3/Source/WTF/ChangeLog (220865 => 220866)


--- tags/Safari-605.1.3/Source/WTF/ChangeLog	2017-08-17 18:34:15 UTC (rev 220865)
+++ tags/Safari-605.1.3/Source/WTF/ChangeLog	2017-08-17 18:43:29 UTC (rev 220866)
@@ -1,3 +1,7 @@
+2017-08-17  Jason Marcell  <[email protected]>
+
+        Revert r220601. rdar://problem/33928369
+
 2017-08-16  Andy Estes  <[email protected]>
 
         [Payment Request] Add an ENABLE flag and an experimental feature preference

Modified: tags/Safari-605.1.3/Source/WTF/wtf/Function.h (220865 => 220866)


--- tags/Safari-605.1.3/Source/WTF/wtf/Function.h	2017-08-17 18:34:15 UTC (rev 220865)
+++ tags/Safari-605.1.3/Source/WTF/wtf/Function.h	2017-08-17 18:43:29 UTC (rev 220866)
@@ -52,8 +52,9 @@
 
     Out operator()(In... in) const
     {
-        ASSERT(m_callableWrapper);
-        return m_callableWrapper->call(std::forward<In>(in)...);
+        if (m_callableWrapper)
+            return m_callableWrapper->call(std::forward<In>(in)...);
+        return Out();
     }
 
     explicit operator bool() const { return !!m_callableWrapper; }

Modified: tags/Safari-605.1.3/Source/WebCore/ChangeLog (220865 => 220866)


--- tags/Safari-605.1.3/Source/WebCore/ChangeLog	2017-08-17 18:34:15 UTC (rev 220865)
+++ tags/Safari-605.1.3/Source/WebCore/ChangeLog	2017-08-17 18:43:29 UTC (rev 220866)
@@ -1,3 +1,7 @@
+2017-08-17  Jason Marcell  <[email protected]>
+
+        Revert r220601. rdar://problem/33928369
+
 2017-08-16  Antti Koivisto  <[email protected]>
 
         Move first-letter renderer mutation code out of RenderBlock and into RenderTreeUpdater

Modified: tags/Safari-605.1.3/Source/WebCore/bindings/js/JSCustomElementInterface.h (220865 => 220866)


--- tags/Safari-605.1.3/Source/WebCore/bindings/js/JSCustomElementInterface.h	2017-08-17 18:34:15 UTC (rev 220865)
+++ tags/Safari-605.1.3/Source/WebCore/bindings/js/JSCustomElementInterface.h	2017-08-17 18:43:29 UTC (rev 220866)
@@ -94,7 +94,7 @@
 
     RefPtr<Element> tryToConstructCustomElement(Document&, const AtomicString&);
 
-    void invokeCallback(Element&, JSC::JSObject* callback, const WTF::Function<void(JSC::ExecState*, JSDOMGlobalObject*, JSC::MarkedArgumentBuffer&)>& addArguments = [](JSC::ExecState*, JSDOMGlobalObject*, JSC::MarkedArgumentBuffer&) { });
+    void invokeCallback(Element&, JSC::JSObject* callback, const WTF::Function<void(JSC::ExecState*, JSDOMGlobalObject*, JSC::MarkedArgumentBuffer&)>& addArguments = { });
 
     QualifiedName m_name;
     JSC::Weak<JSC::JSObject> m_constructor;

Modified: tags/Safari-605.1.3/Source/WebKit/ChangeLog (220865 => 220866)


--- tags/Safari-605.1.3/Source/WebKit/ChangeLog	2017-08-17 18:34:15 UTC (rev 220865)
+++ tags/Safari-605.1.3/Source/WebKit/ChangeLog	2017-08-17 18:43:29 UTC (rev 220866)
@@ -1,3 +1,7 @@
+2017-08-17  Jason Marcell  <[email protected]>
+
+        Revert r220601. rdar://problem/33928369
+
 2017-08-16  Miguel Gomez  <[email protected]>
 
         [GTK] Crash of WebProcess with on-demand AC

Modified: tags/Safari-605.1.3/Source/WebKit/UIProcess/WebResourceLoadStatisticsStore.h (220865 => 220866)


--- tags/Safari-605.1.3/Source/WebKit/UIProcess/WebResourceLoadStatisticsStore.h	2017-08-17 18:34:15 UTC (rev 220865)
+++ tags/Safari-605.1.3/Source/WebKit/UIProcess/WebResourceLoadStatisticsStore.h	2017-08-17 18:43:29 UTC (rev 220866)
@@ -60,7 +60,7 @@
 class WebResourceLoadStatisticsStore final : public IPC::Connection::WorkQueueMessageReceiver {
 public:
     using UpdateCookiePartitioningForDomainsHandler = WTF::Function<void(const Vector<String>& domainsToRemove, const Vector<String>& domainsToAdd, ShouldClearFirst)>;
-    static Ref<WebResourceLoadStatisticsStore> create(const String& resourceLoadStatisticsDirectory, Function<void (const String&)>&& testingCallback, UpdateCookiePartitioningForDomainsHandler&& updateCookiePartitioningForDomainsHandler = [](const Vector<String>&, const Vector<String>&, ShouldClearFirst) { })
+    static Ref<WebResourceLoadStatisticsStore> create(const String& resourceLoadStatisticsDirectory, Function<void (const String&)>&& testingCallback, UpdateCookiePartitioningForDomainsHandler&& updateCookiePartitioningForDomainsHandler = { })
     {
         return adoptRef(*new WebResourceLoadStatisticsStore(resourceLoadStatisticsDirectory, WTFMove(testingCallback), WTFMove(updateCookiePartitioningForDomainsHandler)));
     }

Modified: tags/Safari-605.1.3/Tools/ChangeLog (220865 => 220866)


--- tags/Safari-605.1.3/Tools/ChangeLog	2017-08-17 18:34:15 UTC (rev 220865)
+++ tags/Safari-605.1.3/Tools/ChangeLog	2017-08-17 18:43:29 UTC (rev 220866)
@@ -1,3 +1,7 @@
+2017-08-17  Jason Marcell  <[email protected]>
+
+        Revert r220601. rdar://problem/33928369
+
 2017-08-16  Andy Estes  <[email protected]>
 
         [Payment Request] Add an ENABLE flag and an experimental feature preference

Modified: tags/Safari-605.1.3/Tools/TestWebKitAPI/Tests/WTF/Function.cpp (220865 => 220866)


--- tags/Safari-605.1.3/Tools/TestWebKitAPI/Tests/WTF/Function.cpp	2017-08-17 18:34:15 UTC (rev 220865)
+++ tags/Safari-605.1.3/Tools/TestWebKitAPI/Tests/WTF/Function.cpp	2017-08-17 18:43:29 UTC (rev 220866)
@@ -141,6 +141,7 @@
 {
     Function<unsigned()> a;
     EXPECT_FALSE(static_cast<bool>(a));
+    EXPECT_EQ(0U, a());
 
     a = [] {
         return 1U;
@@ -150,6 +151,7 @@
 
     a = nullptr;
     EXPECT_FALSE(static_cast<bool>(a));
+    EXPECT_EQ(0U, a());
 
     a = MoveOnly { 2 };
     EXPECT_TRUE(static_cast<bool>(a));
@@ -159,6 +161,7 @@
     EXPECT_TRUE(static_cast<bool>(b));
     EXPECT_EQ(2U, b());
     EXPECT_FALSE(static_cast<bool>(a));
+    EXPECT_EQ(0U, a());
 
     a = MoveOnly { 3 };
     Function<unsigned()> c = WTFMove(a);
@@ -165,11 +168,17 @@
     EXPECT_TRUE(static_cast<bool>(c));
     EXPECT_EQ(3U, c());
     EXPECT_FALSE(static_cast<bool>(a));
+    EXPECT_EQ(0U, a());
 
     b = WTFMove(c);
     EXPECT_TRUE(static_cast<bool>(b));
     EXPECT_EQ(3U, b());
     EXPECT_FALSE(static_cast<bool>(c));
+    EXPECT_EQ(0U, c());
+
+    Function<unsigned()> d = nullptr;
+    EXPECT_FALSE(static_cast<bool>(d));
+    EXPECT_EQ(0U, d());
 }
 
 struct FunctionDestructionChecker {
@@ -213,6 +222,15 @@
     FunctionDestructionChecker::functionResult = std::nullopt;
 
     a = FunctionDestructionChecker(a);
+    a = nullptr;
+    EXPECT_TRUE(static_cast<bool>(FunctionDestructionChecker::functionAsBool));
+    EXPECT_TRUE(static_cast<bool>(FunctionDestructionChecker::functionResult));
+    EXPECT_FALSE(FunctionDestructionChecker::functionAsBool.value());
+    EXPECT_EQ(0U, FunctionDestructionChecker::functionResult.value());
+    FunctionDestructionChecker::functionAsBool = std::nullopt;
+    FunctionDestructionChecker::functionResult = std::nullopt;
+
+    a = FunctionDestructionChecker(a);
     a = MoveOnly { 2 };
     EXPECT_TRUE(static_cast<bool>(FunctionDestructionChecker::functionAsBool));
     EXPECT_TRUE(static_cast<bool>(FunctionDestructionChecker::functionResult));
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to