from:"matthew

[webkit-changes] [216527] branches/safari-603-branch

2017-05-09 Thread matthew_hanson

Title: [216527] branches/safari-603-branch








Revision 216527
Author matthew_han...@apple.com
Date 2017-05-09 11:05:30 -0700 (Tue, 09 May 2017)


Log Message
Cherry-pick r216431. rdar://problem/31971208

Modified Paths

branches/safari-603-branch/LayoutTests/ChangeLog
branches/safari-603-branch/LayoutTests/fast/shadow-dom/composed-tree-slots-expected.txt
branches/safari-603-branch/LayoutTests/fast/shadow-dom/composed-tree-slots.html
branches/safari-603-branch/Source/WebCore/ChangeLog
branches/safari-603-branch/Source/WebCore/dom/ComposedTreeIterator.cpp


Added Paths

branches/safari-603-branch/LayoutTests/fast/html/details-flow-thread-expected.txt
branches/safari-603-branch/LayoutTests/fast/html/details-flow-thread.html




Diff

Modified: branches/safari-603-branch/LayoutTests/ChangeLog (216526 => 216527)

--- branches/safari-603-branch/LayoutTests/ChangeLog	2017-05-09 18:05:26 UTC (rev 216526)
+++ branches/safari-603-branch/LayoutTests/ChangeLog	2017-05-09 18:05:30 UTC (rev 216527)
@@ -1,5 +1,24 @@
 2017-05-09  Matthew Hanson  
 
+Cherry-pick r216431. rdar://problem/31971208
+
+2017-05-08  Antti Koivisto  
+
+ComposedTreeIterator does not traverse all slotted children if the traversal root is a slot element.
+https://bugs.webkit.org/show_bug.cgi?id=171375
+
+
+Reviewed by Zalan Bujtas.
+
+* fast/html/details-flow-thread-expected.txt: Added.
+* fast/html/details-flow-thread.html: Added.
+* fast/shadow-dom/composed-tree-slots-expected.txt:
+* fast/shadow-dom/composed-tree-slots.html:
+
+Expand the test so it also prints out slot subtrees using slots as traversal roots.
+
+2017-05-09  Matthew Hanson  
+
 Cherry-pick r216120. rdar://problem/31970955
 
 2017-05-03  Daniel Bates  


Added: branches/safari-603-branch/LayoutTests/fast/html/details-flow-thread-expected.txt (0 => 216527)

--- branches/safari-603-branch/LayoutTests/fast/html/details-flow-thread-expected.txt	(rev 0)
+++ branches/safari-603-branch/LayoutTests/fast/html/details-flow-thread-expected.txt	2017-05-09 18:05:30 UTC (rev 216527)
@@ -0,0 +1 @@
+This test passes if it doesn't assert


Added: branches/safari-603-branch/LayoutTests/fast/html/details-flow-thread.html (0 => 216527)

--- branches/safari-603-branch/LayoutTests/fast/html/details-flow-thread.html	(rev 0)
+++ branches/safari-603-branch/LayoutTests/fast/html/details-flow-thread.html	2017-05-09 18:05:30 UTC (rev 216527)
@@ -0,0 +1,26 @@
+
+details div { -webkit-flow-into: bar; }
+
+
+if (window.testRunner)
+testRunner.dumpAsText();
+
+function gc() {
+if (window.GCController)
+return GCController.collect();
+var a;
+for (var i=0; i<100; i++)
+a = new Uint8Array(1024*1024);
+}
+
+function go() {
+details.offsetLeft;
+details.open = false;
+div.innerHTML = "This test passes if it doesn't assert";
+gc();
+}
+
+
+
+
+foo


Modified: branches/safari-603-branch/LayoutTests/fast/shadow-dom/composed-tree-slots-expected.txt (216526 => 216527)

--- branches/safari-603-branch/LayoutTests/fast/shadow-dom/composed-tree-slots-expected.txt	2017-05-09 18:05:26 UTC (rev 216526)
+++ branches/safari-603-branch/LayoutTests/fast/shadow-dom/composed-tree-slots-expected.txt	2017-05-09 18:05:30 UTC (rev 216527)
@@ -2,18 +2,27 @@
 Test 1
   div (shadow root)
 slot
+Slot trees:
 
+
 Test 2
   div (shadow root)
 slot
   #text
+Slot trees:
+  #text
 
+
 Test 3
   div (shadow root)
 slot
   #text
   div
+Slot trees:
+  #text
+  div
 
+
 Test 4
   div (shadow root)
 slot
@@ -21,13 +30,21 @@
 #text
   div
 #text
+Slot trees:
+  div
+#text
+  div
+#text
 
+
 Test 5
   div (shadow root)
 div
   slot
 #text
+Slot trees:
 
+
 Test 6
   div (shadow root)
 div
@@ -34,7 +51,10 @@
   slot
 #text
 #text
+Slot trees:
+  #text
 
+
 Test 7
   div (shadow root)
 div
@@ -42,7 +62,11 @@
 #text
 div
 #text
+Slot trees:
+  #text
+  div
 
+
 Test 8
   div (shadow root)
 div
@@ -52,24 +76,41 @@
 div
   #text
 #text
+Slot trees:
+  div
+#text
+  div
+#text
 
+
 Test 9
   div (shadow root)
 slot
   slot-default
 #text
+Slot trees:
+  slot-default
+#text
 
+
 Test 10
   div (shadow root)
 slot
   #text
+Slot trees:
+  #text
 
+
 Test 11
   div (shadow root)
 slot
   #text
   div
+Slot trees:
+  #text
+  div
 
+
 Test 12
   div (shadow root)
 slot
@@ -77,7 +118,13 @@
 #text
   div
 #text
+Slot trees:
+  div
+#text
+  div
+#text
 
+
 Test 13
   div (shadow root)
 div (shadow root)
@@ -86,7 +133,13 @@
   #text
   slot
   #text
+Slot trees:
 
+  #text
+  slot
+  #text
+
+
 Test 14

[webkit-changes] [216526] branches/safari-603-branch/Source/JavaScriptCore

2017-05-09 Thread matthew_hanson

Title: [216526] branches/safari-603-branch/Source/_javascript_Core








Revision 216526
Author matthew_han...@apple.com
Date 2017-05-09 11:05:26 -0700 (Tue, 09 May 2017)


Log Message
Cherry-pick r216309. rdar://problem/31971364

Modified Paths

branches/safari-603-branch/Source/_javascript_Core/ChangeLog
branches/safari-603-branch/Source/_javascript_Core/runtime/JSCJSValue.cpp
branches/safari-603-branch/Source/_javascript_Core/runtime/JSObject.cpp
branches/safari-603-branch/Source/_javascript_Core/runtime/JSObjectInlines.h




Diff

Modified: branches/safari-603-branch/Source/_javascript_Core/ChangeLog (216525 => 216526)

--- branches/safari-603-branch/Source/_javascript_Core/ChangeLog	2017-05-09 18:05:23 UTC (rev 216525)
+++ branches/safari-603-branch/Source/_javascript_Core/ChangeLog	2017-05-09 18:05:26 UTC (rev 216526)
@@ -1,5 +1,26 @@
 2017-05-09  Matthew Hanson  
 
+Cherry-pick r216309. rdar://problem/31971364
+
+2017-05-05  Keith Miller  
+
+Put does not properly consult the prototype chain
+https://bugs.webkit.org/show_bug.cgi?id=171754
+
+Reviewed by Saam Barati.
+
+We should do a follow up that cleans up the rest of put. See:
+https://bugs.webkit.org/show_bug.cgi?id=171759
+
+* runtime/JSCJSValue.cpp:
+(JSC::JSValue::putToPrimitive):
+* runtime/JSObject.cpp:
+(JSC::JSObject::putInlineSlow):
+* runtime/JSObjectInlines.h:
+(JSC::JSObject::canPerformFastPutInline):
+
+2017-05-09  Matthew Hanson  
+
 Cherry-pick r215596. rdar://problem/31971150
 
 2017-04-20  Mark Lam  


Modified: branches/safari-603-branch/Source/_javascript_Core/runtime/JSCJSValue.cpp (216525 => 216526)

--- branches/safari-603-branch/Source/_javascript_Core/runtime/JSCJSValue.cpp	2017-05-09 18:05:23 UTC (rev 216525)
+++ branches/safari-603-branch/Source/_javascript_Core/runtime/JSCJSValue.cpp	2017-05-09 18:05:26 UTC (rev 216526)
@@ -160,7 +160,9 @@
 JSValue prototype;
 if (propertyName != vm.propertyNames->underscoreProto) {
 for (; !obj->structure()->hasReadOnlyOrGetterSetterPropertiesExcludingProto(); obj = asObject(prototype)) {
-prototype = obj->getPrototypeDirect();
+prototype = obj->getPrototype(vm, exec);
+RETURN_IF_EXCEPTION(scope, false);
+
 if (prototype.isNull())
 return typeError(exec, scope, slot.isStrictMode(), ASCIILiteral(ReadonlyPropertyWriteError));
 }


Modified: branches/safari-603-branch/Source/_javascript_Core/runtime/JSObject.cpp (216525 => 216526)

--- branches/safari-603-branch/Source/_javascript_Core/runtime/JSObject.cpp	2017-05-09 18:05:23 UTC (rev 216525)
+++ branches/safari-603-branch/Source/_javascript_Core/runtime/JSObject.cpp	2017-05-09 18:05:26 UTC (rev 216526)
@@ -802,13 +802,13 @@
 ProxyObject* proxy = jsCast(obj);
 return proxy->ProxyObject::put(proxy, exec, propertyName, value, slot);
 }
-JSValue prototype = obj->getPrototypeDirect();
+JSValue prototype = obj->getPrototype(vm, exec);
+RETURN_IF_EXCEPTION(scope, false);
 if (prototype.isNull())
 break;
 obj = asObject(prototype);
 }
 
-ASSERT(!structure(vm)->prototypeChainMayInterceptStoreTo(vm, propertyName) || obj == this);
 if (!putDirectInternal(vm, propertyName, value, 0, slot))
 return typeError(exec, scope, slot.isStrictMode(), ASCIILiteral(ReadonlyPropertyWriteError));
 return true;


Modified: branches/safari-603-branch/Source/_javascript_Core/runtime/JSObjectInlines.h (216525 => 216526)

--- branches/safari-603-branch/Source/_javascript_Core/runtime/JSObjectInlines.h	2017-05-09 18:05:23 UTC (rev 216525)
+++ branches/safari-603-branch/Source/_javascript_Core/runtime/JSObjectInlines.h	2017-05-09 18:05:26 UTC (rev 216526)
@@ -69,7 +69,8 @@
 JSValue prototype;
 JSObject* obj = this;
 while (true) {
-if (obj->structure(vm)->hasReadOnlyOrGetterSetterPropertiesExcludingProto() || obj->type() == ProxyObjectType)
+MethodTable::GetPrototypeFunctionPtr defaultGetPrototype = JSObject::getPrototype;
+if (obj->structure(vm)->hasReadOnlyOrGetterSetterPropertiesExcludingProto() || obj->methodTable(vm)->getPrototype != defaultGetPrototype)
 return false;
 
 prototype = obj->getPrototypeDirect();






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [216521] branches/safari-603-branch

2017-05-09 Thread matthew_hanson

Title: [216521] branches/safari-603-branch








Revision 216521
Author matthew_han...@apple.com
Date 2017-05-09 11:05:07 -0700 (Tue, 09 May 2017)


Log Message
Cherry-pick r215596. rdar://problem/31971150

Modified Paths

branches/safari-603-branch/JSTests/ChangeLog
branches/safari-603-branch/Source/_javascript_Core/ChangeLog
branches/safari-603-branch/Source/_javascript_Core/jit/ThunkGenerators.cpp


Added Paths

branches/safari-603-branch/JSTests/stress/regress-171079.js




Diff

Modified: branches/safari-603-branch/JSTests/ChangeLog (216520 => 216521)

--- branches/safari-603-branch/JSTests/ChangeLog	2017-05-09 18:05:04 UTC (rev 216520)
+++ branches/safari-603-branch/JSTests/ChangeLog	2017-05-09 18:05:07 UTC (rev 216521)
@@ -1,5 +1,19 @@
 2017-05-09  Matthew Hanson  
 
+Cherry-pick r215596. rdar://problem/31971150
+
+2017-04-20  Mark Lam  
+
+virtualThunkFor() needs to materialize its of tagMaskRegister for tail calls.
+https://bugs.webkit.org/show_bug.cgi?id=171079
+
+
+Reviewed by Saam Barati.
+
+* stress/regress-171079.js: Added.
+
+2017-05-09  Matthew Hanson  
+
 Cherry-pick r215351. rdar://problem/31631922
 
 2017-04-13  Mark Lam  


Added: branches/safari-603-branch/JSTests/stress/regress-171079.js (0 => 216521)

--- branches/safari-603-branch/JSTests/stress/regress-171079.js	(rev 0)
+++ branches/safari-603-branch/JSTests/stress/regress-171079.js	2017-05-09 18:05:07 UTC (rev 216521)
@@ -0,0 +1,38 @@
+function assert(actual, expected) {
+if (actual != expected)
+throw("FAILED: actual " + actual + ", expected " + expected);
+}
+
+Object.defineProperty(this, "t0", { 
+get: function() {
+"use strict";
+return t2.subarray(4, 7);
+}
+});
+
+t2 = new Uint16Array();
+
+var exception;
+function test() {
+exception = void 0;
+try {
+return t0;
+} catch (e) {
+exception = e;
+}
+}
+
+for (var i = 0; i < 100; ++i) {
+test();
+assert(exception, void 0);
+}
+
+t2.__proto__ = {
+subarray: 1
+};
+
+test();
+assert(exception, "TypeError: t2.subarray is not a function. (In 't2.subarray(4, 7)', 't2.subarray' is 1)");
+
+test();
+assert(exception, "TypeError: t2.subarray is not a function. (In 't2.subarray(4, 7)', 't2.subarray' is 1)");


Modified: branches/safari-603-branch/Source/_javascript_Core/ChangeLog (216520 => 216521)

--- branches/safari-603-branch/Source/_javascript_Core/ChangeLog	2017-05-09 18:05:04 UTC (rev 216520)
+++ branches/safari-603-branch/Source/_javascript_Core/ChangeLog	2017-05-09 18:05:07 UTC (rev 216521)
@@ -1,5 +1,23 @@
 2017-05-09  Matthew Hanson  
 
+Cherry-pick r215596. rdar://problem/31971150
+
+2017-04-20  Mark Lam  
+
+virtualThunkFor() needs to materialize its of tagMaskRegister for tail calls.
+https://bugs.webkit.org/show_bug.cgi?id=171079
+
+
+Reviewed by Saam Barati.
+
+This is needed because tail calls would restore callee saved registers (and
+therefore, potentially clobber the tag registers) before jumping to the thunk.
+
+* jit/ThunkGenerators.cpp:
+(JSC::virtualThunkFor):
+
+2017-05-09  Matthew Hanson  
+
 Cherry-pick r215351. rdar://problem/31631922
 
 2017-04-13  Mark Lam  


Modified: branches/safari-603-branch/Source/_javascript_Core/jit/ThunkGenerators.cpp (216520 => 216521)

--- branches/safari-603-branch/Source/_javascript_Core/jit/ThunkGenerators.cpp	2017-05-09 18:05:04 UTC (rev 216520)
+++ branches/safari-603-branch/Source/_javascript_Core/jit/ThunkGenerators.cpp	2017-05-09 18:05:07 UTC (rev 216521)
@@ -183,9 +183,16 @@
 // the DFG knows that the value is definitely a cell, or definitely a function.
 
 #if USE(JSVALUE64)
+GPRReg tagMaskRegister = GPRInfo::tagMaskRegister;
+if (callLinkInfo.isTailCall()) {
+// Tail calls could have clobbered the GPRInfo::tagMaskRegister because they
+// restore callee saved registers before getthing here. So, let's materialize
+// the TagMask in a temp register and use the temp instead.
+tagMaskRegister = GPRInfo::regT4;
+jit.move(CCallHelpers::TrustedImm64(TagMask), tagMaskRegister);
+}
 slowCase.append(
-jit.branchTest64(
-CCallHelpers::NonZero, GPRInfo::regT0, GPRInfo::tagMaskRegister));
+jit.branchTest64(CCallHelpers::NonZero, GPRInfo::regT0, tagMaskRegister));
 #else
 slowCase.append(
 jit.branch32(






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [216524] branches/safari-603-branch

2017-05-09 Thread matthew_hanson

Title: [216524] branches/safari-603-branch








Revision 216524
Author matthew_han...@apple.com
Date 2017-05-09 11:05:19 -0700 (Tue, 09 May 2017)


Log Message
Cherry-pick r216096. rdar://problem/31971264

Modified Paths

branches/safari-603-branch/LayoutTests/ChangeLog
branches/safari-603-branch/Source/WebCore/ChangeLog
branches/safari-603-branch/Source/WebCore/accessibility/AXObjectCache.cpp
branches/safari-603-branch/Source/WebCore/accessibility/AXObjectCache.h
branches/safari-603-branch/Source/WebCore/page/FrameView.cpp
branches/safari-603-branch/Source/WebCore/rendering/RenderText.cpp


Added Paths

branches/safari-603-branch/LayoutTests/accessibility/crash-while-adding-text-child-with-transform-expected.txt
branches/safari-603-branch/LayoutTests/accessibility/crash-while-adding-text-child-with-transform.html




Diff

Modified: branches/safari-603-branch/LayoutTests/ChangeLog (216523 => 216524)

--- branches/safari-603-branch/LayoutTests/ChangeLog	2017-05-09 18:05:14 UTC (rev 216523)
+++ branches/safari-603-branch/LayoutTests/ChangeLog	2017-05-09 18:05:19 UTC (rev 216524)
@@ -1,5 +1,20 @@
 2017-05-09  Matthew Hanson  
 
+Cherry-pick r216096. rdar://problem/31971264
+
+2017-05-02  Zalan Bujtas  
+
+Defer AX cache update when text content changes until after layout is finished.
+https://bugs.webkit.org/show_bug.cgi?id=171429
+
+
+Reviewed by Simon Fraser.
+
+* accessibility/crash-while-adding-text-child-with-transform-expected.txt: Added.
+* accessibility/crash-while-adding-text-child-with-transform.html: Added.
+
+2017-05-09  Matthew Hanson  
+
 Cherry-pick r216023. rdar://problem/31971371
 
 2017-05-01  Chris Dumez  


Added: branches/safari-603-branch/LayoutTests/accessibility/crash-while-adding-text-child-with-transform-expected.txt (0 => 216524)

--- branches/safari-603-branch/LayoutTests/accessibility/crash-while-adding-text-child-with-transform-expected.txt	(rev 0)
+++ branches/safari-603-branch/LayoutTests/accessibility/crash-while-adding-text-child-with-transform-expected.txt	2017-05-09 18:05:19 UTC (rev 216524)
@@ -0,0 +1,2 @@
+pass if no crash or assert.
+


Added: branches/safari-603-branch/LayoutTests/accessibility/crash-while-adding-text-child-with-transform.html (0 => 216524)

--- branches/safari-603-branch/LayoutTests/accessibility/crash-while-adding-text-child-with-transform.html	(rev 0)
+++ branches/safari-603-branch/LayoutTests/accessibility/crash-while-adding-text-child-with-transform.html	2017-05-09 18:05:19 UTC (rev 216524)
@@ -0,0 +1,26 @@
+
+
+
+This tests that AX can manage text content changes while inside tree mutation.
+
+#foobar {
+text-transform: lowercase;
+}
+
+#foobar::first-letter {
+	margin: 1px;
+}
+
+
+if (window.testRunner)
+testRunner.dumpAsText();
+if (window.accessibilityController)
+accessibilityController.accessibleElementById("foobar");
+
+
+
+Pass if no crash or assert.
+newParent.appendChild(foobar);
+
+
+


Modified: branches/safari-603-branch/Source/WebCore/ChangeLog (216523 => 216524)

--- branches/safari-603-branch/Source/WebCore/ChangeLog	2017-05-09 18:05:14 UTC (rev 216523)
+++ branches/safari-603-branch/Source/WebCore/ChangeLog	2017-05-09 18:05:19 UTC (rev 216524)
@@ -1,5 +1,38 @@
 2017-05-09  Matthew Hanson  
 
+Cherry-pick r216096. rdar://problem/31971264
+
+2017-05-02  Zalan Bujtas  
+
+Defer AX cache update when text content changes until after layout is finished.
+https://bugs.webkit.org/show_bug.cgi?id=171429
+
+
+Reviewed by Simon Fraser.
+
+When the content of the RenderText changes (even as the result of a text-transform change)
+instead of updating the AX cache eagerly (and trigger layout on a half-backed render tree)
+we should just defer it until after the subsequent layout is done.
+
+Test: accessibility/crash-while-adding-text-child-with-transform.html
+
+* accessibility/AXObjectCache.cpp:
+(WebCore::AXObjectCache::remove):
+(WebCore::AXObjectCache::performDeferredCacheUpdate):
+(WebCore::AXObjectCache::recomputeDeferredIsIgnored):
+(WebCore::AXObjectCache::deferTextChanged):
+(WebCore::AXObjectCache::performDeferredIsIgnoredChange): Deleted.
+* accessibility/AXObjectCache.h:
+(WebCore::AXObjectCache::deferTextChanged):
+(WebCore::AXObjectCache::performDeferredCacheUpdate):
+(WebCore::AXObjectCache::performDeferredIsIgnoredChange): Deleted.
+* page/FrameView.cpp:
+(WebCore::FrameView::performPostLayoutTasks):
+* rendering/RenderText.cpp:
+

[webkit-changes] [216522] branches/safari-603-branch

2017-05-09 Thread matthew_hanson

Title: [216522] branches/safari-603-branch








Revision 216522
Author matthew_han...@apple.com
Date 2017-05-09 11:05:11 -0700 (Tue, 09 May 2017)


Log Message
Cherry-pick r215971. rdar://problem/31971140

Modified Paths

branches/safari-603-branch/LayoutTests/ChangeLog
branches/safari-603-branch/Source/WebCore/ChangeLog
branches/safari-603-branch/Source/WebCore/accessibility/AccessibilityRenderObject.cpp


Added Paths

branches/safari-603-branch/LayoutTests/accessibility/accessibility-crash-setattribute-expected.txt
branches/safari-603-branch/LayoutTests/accessibility/accessibility-crash-setattribute.html




Diff

Modified: branches/safari-603-branch/LayoutTests/ChangeLog (216521 => 216522)

--- branches/safari-603-branch/LayoutTests/ChangeLog	2017-05-09 18:05:07 UTC (rev 216521)
+++ branches/safari-603-branch/LayoutTests/ChangeLog	2017-05-09 18:05:11 UTC (rev 216522)
@@ -1,3 +1,17 @@
+2017-05-09  Matthew Hanson  
+
+Cherry-pick r215971. rdar://problem/31971140
+
+2017-04-28  Per Arne Vollan  
+
+Crash under WebCore::AccessibilityRenderObject::handleAriaExpandedChanged().
+https://bugs.webkit.org/show_bug.cgi?id=171427
+
+Reviewed by Brent Fulgham.
+
+* accessibility/accessibility-crash-setattribute-expected.txt: Added.
+* accessibility/accessibility-crash-setattribute.html: Added.
+
 2017-05-03  Ryan Haddad  
 
 Unreviewed test gardening.


Added: branches/safari-603-branch/LayoutTests/accessibility/accessibility-crash-setattribute-expected.txt (0 => 216522)

--- branches/safari-603-branch/LayoutTests/accessibility/accessibility-crash-setattribute-expected.txt	(rev 0)
+++ branches/safari-603-branch/LayoutTests/accessibility/accessibility-crash-setattribute-expected.txt	2017-05-09 18:05:11 UTC (rev 216522)
@@ -0,0 +1,2 @@
+PASS if no crash.  
+


Added: branches/safari-603-branch/LayoutTests/accessibility/accessibility-crash-setattribute.html (0 => 216522)

--- branches/safari-603-branch/LayoutTests/accessibility/accessibility-crash-setattribute.html	(rev 0)
+++ branches/safari-603-branch/LayoutTests/accessibility/accessibility-crash-setattribute.html	2017-05-09 18:05:11 UTC (rev 216522)
@@ -0,0 +1,28 @@
+
+
+
+#div { visibility: collapse }
+
+
+PASS if no crash.
+
+if (window.accessibilityController) {
+var largeRange = accessibilityController.accessibleElementById("largeRange");
+}
+if (window.testRunner) {
+testRunner.dumpAsText();
+}
+function eventhandler() {
+document.execCommand("bold", false);
+img.style.removeProperty("-webkit-appearance");
+img.setAttribute("aria-expanded", "false");
+}
+
+
+
+
+aaa
+
+
+
+


Modified: branches/safari-603-branch/Source/WebCore/ChangeLog (216521 => 216522)

--- branches/safari-603-branch/Source/WebCore/ChangeLog	2017-05-09 18:05:07 UTC (rev 216521)
+++ branches/safari-603-branch/Source/WebCore/ChangeLog	2017-05-09 18:05:11 UTC (rev 216522)
@@ -1,5 +1,26 @@
 2017-05-09  Matthew Hanson  
 
+Cherry-pick r215971. rdar://problem/31971140
+
+2017-04-28  Per Arne Vollan  
+
+Crash under WebCore::AccessibilityRenderObject::handleAriaExpandedChanged().
+https://bugs.webkit.org/show_bug.cgi?id=171427
+rdar://problem/31863417
+
+Reviewed by Brent Fulgham.
+
+The AccessibilityRenderObject object might delete itself in handleAriaExpandedChanged() under the call
+to the parentObject() method. This will cause a crash when accessing the object later in this method.
+Protect the current object while executing arbitrary event code.
+
+Test: accessibility/accessibility-crash-setattribute.html
+
+* accessibility/AccessibilityRenderObject.cpp:
+(WebCore::AccessibilityRenderObject::handleAriaExpandedChanged):
+
+2017-05-09  Matthew Hanson  
+
 Cherry-pick r215528. rdar://problem/31971331
 
 2017-04-19  Joseph Pecoraro  


Modified: branches/safari-603-branch/Source/WebCore/accessibility/AccessibilityRenderObject.cpp (216521 => 216522)

--- branches/safari-603-branch/Source/WebCore/accessibility/AccessibilityRenderObject.cpp	2017-05-09 18:05:07 UTC (rev 216521)
+++ branches/safari-603-branch/Source/WebCore/accessibility/AccessibilityRenderObject.cpp	2017-05-09 18:05:11 UTC (rev 216522)
@@ -2441,6 +2441,9 @@
 
 void AccessibilityRenderObject::handleAriaExpandedChanged()
 {
+// This object might be deleted under the call to the parentObject() method.
+auto protectedThis = makeRef(*this);
+
 // Find if a parent of this object should handle aria-expanded changes.
 AccessibilityObject* containerParent = this->parentObject();
 while (containerParent)

[webkit-changes] [216523] branches/safari-603-branch

2017-05-09 Thread matthew_hanson

Title: [216523] branches/safari-603-branch








Revision 216523
Author matthew_han...@apple.com
Date 2017-05-09 11:05:14 -0700 (Tue, 09 May 2017)


Log Message
Cherry-pick r216023. rdar://problem/31971371

Modified Paths

branches/safari-603-branch/LayoutTests/ChangeLog
branches/safari-603-branch/Source/WebCore/ChangeLog
branches/safari-603-branch/Source/WebCore/dom/Document.cpp


Added Paths

branches/safari-603-branch/LayoutTests/fast/dom/domparser-parsefromstring-svg-load-event-expected.txt
branches/safari-603-branch/LayoutTests/fast/dom/domparser-parsefromstring-svg-load-event.html




Diff

Modified: branches/safari-603-branch/LayoutTests/ChangeLog (216522 => 216523)

--- branches/safari-603-branch/LayoutTests/ChangeLog	2017-05-09 18:05:11 UTC (rev 216522)
+++ branches/safari-603-branch/LayoutTests/ChangeLog	2017-05-09 18:05:14 UTC (rev 216523)
@@ -1,5 +1,22 @@
 2017-05-09  Matthew Hanson  
 
+Cherry-pick r216023. rdar://problem/31971371
+
+2017-05-01  Chris Dumez  
+
+Do not dispatch SVG load event in frameless documents
+https://bugs.webkit.org/show_bug.cgi?id=171505
+
+
+Reviewed by Andreas Kling.
+
+Add layout test coverage. I have verified that this test passes on both Firefox and Chrome.
+
+* fast/dom/domparser-parsefromstring-svg-load-event-expected.txt: Added.
+* fast/dom/domparser-parsefromstring-svg-load-event.html: Added.
+
+2017-05-09  Matthew Hanson  
+
 Cherry-pick r215971. rdar://problem/31971140
 
 2017-04-28  Per Arne Vollan  


Added: branches/safari-603-branch/LayoutTests/fast/dom/domparser-parsefromstring-svg-load-event-expected.txt (0 => 216523)

--- branches/safari-603-branch/LayoutTests/fast/dom/domparser-parsefromstring-svg-load-event-expected.txt	(rev 0)
+++ branches/safari-603-branch/LayoutTests/fast/dom/domparser-parsefromstring-svg-load-event-expected.txt	2017-05-09 18:05:14 UTC (rev 216523)
@@ -0,0 +1,9 @@
+Tests that SVG load events are not fired in frameless documents. This test passes if you do not see a FAIL alert message.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS successfullyParsed is true
+
+TEST COMPLETE
+


Added: branches/safari-603-branch/LayoutTests/fast/dom/domparser-parsefromstring-svg-load-event.html (0 => 216523)

--- branches/safari-603-branch/LayoutTests/fast/dom/domparser-parsefromstring-svg-load-event.html	(rev 0)
+++ branches/safari-603-branch/LayoutTests/fast/dom/domparser-parsefromstring-svg-load-event.html	2017-05-09 18:05:14 UTC (rev 216523)
@@ -0,0 +1,15 @@
+
+
+
+
+description("Tests that SVG load events are not fired in frameless documents. This test passes if you do not see a FAIL alert message.");
+jsTestIsAsync = true;
+
+new DOMParser().parseFromString('

[webkit-changes] [216519] branches/safari-603-branch

2017-05-09 Thread matthew_hanson

Title: [216519] branches/safari-603-branch








Revision 216519
Author matthew_han...@apple.com
Date 2017-05-09 11:05:01 -0700 (Tue, 09 May 2017)


Log Message
Cherry-pick r215351. rdar://problem/31631922

Modified Paths

branches/safari-603-branch/JSTests/ChangeLog
branches/safari-603-branch/Source/_javascript_Core/ChangeLog
branches/safari-603-branch/Source/_javascript_Core/dfg/DFGByteCodeParser.cpp


Added Paths

branches/safari-603-branch/JSTests/stress/regress-170661.js




Diff

Modified: branches/safari-603-branch/JSTests/ChangeLog (216518 => 216519)

--- branches/safari-603-branch/JSTests/ChangeLog	2017-05-09 18:04:58 UTC (rev 216518)
+++ branches/safari-603-branch/JSTests/ChangeLog	2017-05-09 18:05:01 UTC (rev 216519)
@@ -1,3 +1,17 @@
+2017-05-09  Matthew Hanson  
+
+Cherry-pick r215351. rdar://problem/31631922
+
+2017-04-13  Mark Lam  
+
+Should use flushDirect() when flushing the scopeRegister due to needsScopeRegister().
+https://bugs.webkit.org/show_bug.cgi?id=170661
+
+
+Reviewed by Filip Pizlo.
+
+* stress/regress-170661.js: Added.
+
 2017-03-16  Jason Marcell  
 
 Merge r213742. rdar://problem/30921818


Added: branches/safari-603-branch/JSTests/stress/regress-170661.js (0 => 216519)

--- branches/safari-603-branch/JSTests/stress/regress-170661.js	(rev 0)
+++ branches/safari-603-branch/JSTests/stress/regress-170661.js	2017-05-09 18:05:01 UTC (rev 216519)
@@ -0,0 +1,18 @@
+function f() {
+(function bar() {
+eval('1');
+f();
+}());
+
+throw 1;
+}
+
+var exception;
+try {
+f();
+} catch (e) {
+exception = e;
+}
+
+if (exception != "RangeError: Maximum call stack size exceeded.")
+throw("FAILED");


Modified: branches/safari-603-branch/Source/_javascript_Core/ChangeLog (216518 => 216519)

--- branches/safari-603-branch/Source/_javascript_Core/ChangeLog	2017-05-09 18:04:58 UTC (rev 216518)
+++ branches/safari-603-branch/Source/_javascript_Core/ChangeLog	2017-05-09 18:05:01 UTC (rev 216519)
@@ -1,3 +1,24 @@
+2017-05-09  Matthew Hanson  
+
+Cherry-pick r215351. rdar://problem/31631922
+
+2017-04-13  Mark Lam  
+
+Should use flushDirect() when flushing the scopeRegister due to needsScopeRegister().
+https://bugs.webkit.org/show_bug.cgi?id=170661
+
+
+Reviewed by Filip Pizlo.
+
+Previously, we were using flush() to flush the outermost frame's scopeRegister.
+This is incorrect because flush() expects the VirtualRegister value passed to
+it to be that of the top most inlined frame.  In the event that we reach a
+terminal condition while inside an inlined frame, flush() will end up flushing
+the wrong register.  The fix is simply to use flushDirect() instead.
+
+* dfg/DFGByteCodeParser.cpp:
+(JSC::DFG::ByteCodeParser::flush):
+
 2017-04-14  Jason Marcell  
 
 Cherry-pick r214637. rdar://problem/31615783


Modified: branches/safari-603-branch/Source/_javascript_Core/dfg/DFGByteCodeParser.cpp (216518 => 216519)

--- branches/safari-603-branch/Source/_javascript_Core/dfg/DFGByteCodeParser.cpp	2017-05-09 18:04:58 UTC (rev 216518)
+++ branches/safari-603-branch/Source/_javascript_Core/dfg/DFGByteCodeParser.cpp	2017-05-09 18:05:01 UTC (rev 216519)
@@ -623,7 +623,7 @@
 if (!inlineStackEntry->m_inlineCallFrame && m_graph.needsFlushedThis())
 flushDirect(virtualRegisterForArgument(0));
 if (m_graph.needsScopeRegister())
-flush(m_codeBlock->scopeRegister());
+flushDirect(m_codeBlock->scopeRegister());
 }
 
 void flushForTerminal()






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [216518] branches/safari-603-branch/Source/WebCore

2017-05-09 Thread matthew_hanson

Title: [216518] branches/safari-603-branch/Source/WebCore








Revision 216518
Author matthew_han...@apple.com
Date 2017-05-09 11:04:58 -0700 (Tue, 09 May 2017)


Log Message
Cherry-pick r214554. rdar://problem/31971164

Modified Paths

branches/safari-603-branch/Source/WebCore/ChangeLog
branches/safari-603-branch/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.h
branches/safari-603-branch/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm




Diff

Modified: branches/safari-603-branch/Source/WebCore/ChangeLog (216517 => 216518)

--- branches/safari-603-branch/Source/WebCore/ChangeLog	2017-05-09 18:02:12 UTC (rev 216517)
+++ branches/safari-603-branch/Source/WebCore/ChangeLog	2017-05-09 18:04:58 UTC (rev 216518)
@@ -1,3 +1,23 @@
+2017-05-09  Matthew Hanson  
+
+Cherry-pick r214554. rdar://problem/31971164
+
+2017-03-29  Jeremy Jones  
+
+WebVideoFullscreenInterfaceAVKit needs a strong self ref before dispatching to the main thread.
+https://bugs.webkit.org/show_bug.cgi?id=170129
+
+Reviewed by David Kilzer.
+
+No new tests becuase no new behavior.
+
+Hold a strong reference to WebVideoFullscreenInterfaceAVKit when dispatching to the main thread.
+Make WebVideoFullscreenInterfaceAVKit safe to retain from non-main thread.
+
+* platform/ios/WebVideoFullscreenInterfaceAVKit.h:
+* platform/ios/WebVideoFullscreenInterfaceAVKit.mm:
+(WebVideoFullscreenInterfaceAVKit::exitFullscreen):
+
 2017-04-16  Jason Marcell  
 
 Roll out r211294 vi 215335. rdar://problem/31512298


Modified: branches/safari-603-branch/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.h (216517 => 216518)

--- branches/safari-603-branch/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.h	2017-05-09 18:02:12 UTC (rev 216517)
+++ branches/safari-603-branch/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.h	2017-05-09 18:04:58 UTC (rev 216518)
@@ -66,7 +66,7 @@
 : public WebVideoFullscreenInterface
 , public WebVideoFullscreenModelClient
 , public WebPlaybackSessionModelClient
-, public RefCounted {
+, public ThreadSafeRefCounted {
 
 public:
 static Ref create(WebPlaybackSessionInterfaceAVKit&);


Modified: branches/safari-603-branch/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm (216517 => 216518)

--- branches/safari-603-branch/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm	2017-05-09 18:02:12 UTC (rev 216517)
+++ branches/safari-603-branch/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm	2017-05-09 18:04:58 UTC (rev 216518)
@@ -753,7 +753,7 @@
 [[m_playerViewController view] setBackgroundColor:[getUIColorClass() clearColor]];
 [CATransaction commit];
 
-dispatch_async(dispatch_get_main_queue(), ^{
+dispatch_async(dispatch_get_main_queue(), [protectedThis, this]() {
 if (m_fullscreenChangeObserver)
 m_fullscreenChangeObserver->didExitFullscreen();
 });






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [216520] branches/safari-603-branch/Source/WebCore

2017-05-09 Thread matthew_hanson

Title: [216520] branches/safari-603-branch/Source/WebCore








Revision 216520
Author matthew_han...@apple.com
Date 2017-05-09 11:05:04 -0700 (Tue, 09 May 2017)


Log Message
Cherry-pick r215528. rdar://problem/31971331

Modified Paths

branches/safari-603-branch/Source/WebCore/ChangeLog
branches/safari-603-branch/Source/WebCore/workers/WorkerMessagingProxy.cpp
branches/safari-603-branch/Source/WebCore/workers/WorkerMessagingProxy.h




Diff

Modified: branches/safari-603-branch/Source/WebCore/ChangeLog (216519 => 216520)

--- branches/safari-603-branch/Source/WebCore/ChangeLog	2017-05-09 18:05:01 UTC (rev 216519)
+++ branches/safari-603-branch/Source/WebCore/ChangeLog	2017-05-09 18:05:04 UTC (rev 216520)
@@ -1,5 +1,29 @@
 2017-05-09  Matthew Hanson  
 
+Cherry-pick r215528. rdar://problem/31971331
+
+2017-04-19  Joseph Pecoraro  
+
+ASAN Crash running LayoutTests/inspector/worker tests
+https://bugs.webkit.org/show_bug.cgi?id=170967
+
+
+Reviewed by Alex Christensen.
+
+* workers/WorkerMessagingProxy.h:
+* workers/WorkerMessagingProxy.cpp:
+(WebCore::WorkerMessagingProxy::WorkerMessagingProxy):
+(WebCore::WorkerMessagingProxy::workerGlobalScopeDestroyedInternal):
+Make the MessagingProxy thread safe ref counted. Since it used to
+delete itself, turn this into a ref (implicit on construction)
+and deref (replacing delete this).
+
+(WebCore::WorkerMessagingProxy::postMessageToPageInspector):
+When dispatching have the lambda implicitly ref/deref with the
+lambda to keep the proxy alive while a lambda is queued.
+
+2017-05-09  Matthew Hanson  
+
 Cherry-pick r214554. rdar://problem/31971164
 
 2017-03-29  Jeremy Jones  


Modified: branches/safari-603-branch/Source/WebCore/workers/WorkerMessagingProxy.cpp (216519 => 216520)

--- branches/safari-603-branch/Source/WebCore/workers/WorkerMessagingProxy.cpp	2017-05-09 18:05:01 UTC (rev 216519)
+++ branches/safari-603-branch/Source/WebCore/workers/WorkerMessagingProxy.cpp	2017-05-09 18:05:04 UTC (rev 216520)
@@ -65,6 +65,9 @@
 ASSERT(m_workerObject);
 ASSERT((is(*m_scriptExecutionContext) && isMainThread())
 || (is(*m_scriptExecutionContext) && currentThread() == downcast(*m_scriptExecutionContext).thread().threadID()));
+
+// Nobody outside this class ref counts this object. The original ref
+// is balanced by the deref in workerGlobalScopeDestroyedInternal.
 }
 
 WorkerMessagingProxy::~WorkerMessagingProxy()
@@ -169,8 +172,9 @@
 
 void WorkerMessagingProxy::postMessageToPageInspector(const String& message)
 {
-RunLoop::main().dispatch([this, message = message.isolatedCopy()] {
-m_inspectorProxy->sendMessageFromWorkerToFrontend(message);
+RunLoop::main().dispatch([this, protectedThis = makeRef(*this), message = message.isolatedCopy()] {
+if (!m_mayBeDestroyed)
+m_inspectorProxy->sendMessageFromWorkerToFrontend(message);
 });
 }
 
@@ -240,8 +244,9 @@
 
 m_inspectorProxy->workerTerminated();
 
+// This balances the original ref in construction.
 if (m_mayBeDestroyed)
-delete this;
+deref();
 }
 
 void WorkerMessagingProxy::terminateWorkerGlobalScope()


Modified: branches/safari-603-branch/Source/WebCore/workers/WorkerMessagingProxy.h (216519 => 216520)

--- branches/safari-603-branch/Source/WebCore/workers/WorkerMessagingProxy.h	2017-05-09 18:05:01 UTC (rev 216519)
+++ branches/safari-603-branch/Source/WebCore/workers/WorkerMessagingProxy.h	2017-05-09 18:05:04 UTC (rev 216520)
@@ -20,7 +20,7 @@
  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #pragma once
@@ -34,6 +34,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 namespace WebCore {
@@ -43,10 +44,11 @@
 class Worker;
 class WorkerInspectorProxy;
 
-class WorkerMessagingProxy : public WorkerGlobalScopeProxy, public WorkerObjectProxy, public WorkerLoaderProxy {
+class WorkerMessagingProxy : public ThreadSafeRefCounted, public WorkerGlobalScopeProxy, public WorkerObjectProxy, public WorkerLoaderProxy {
 WTF_MAKE_NONCOPYABLE(WorkerMessagingProxy); WTF_MAKE_FAST_ALLOCATED;
 public:
 explicit WorkerMessagingProxy(Worker*);
+virtual ~WorkerMessagingProxy();
 
 // Implementations of WorkerGlobalScopeProxy.
 // (Only use these methods in the worker object thread.)
@@ -78,9 +80,6 @@
 // Only use this method on the worker object thread.
 bool

[webkit-changes] [216441] branches/safari-604.1.21-branch/

2017-05-08 Thread matthew_hanson

Title: [216441] branches/safari-604.1.21-branch/








Revision 216441
Author matthew_han...@apple.com
Date 2017-05-08 11:40:46 -0700 (Mon, 08 May 2017)


Log Message
New Branch.

Added Paths

branches/safari-604.1.21-branch/




Diff




___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [216287] tags/Safari-604.1.21.0.1/Source

2017-05-05 Thread matthew_hanson

Title: [216287] tags/Safari-604.1.21.0.1/Source








Revision 216287
Author matthew_han...@apple.com
Date 2017-05-05 15:53:09 -0700 (Fri, 05 May 2017)


Log Message
Versioning.

Modified Paths

tags/Safari-604.1.21.0.1/Source/_javascript_Core/Configurations/Version.xcconfig
tags/Safari-604.1.21.0.1/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig
tags/Safari-604.1.21.0.1/Source/WebCore/Configurations/Version.xcconfig
tags/Safari-604.1.21.0.1/Source/WebCore/PAL/Configurations/Version.xcconfig
tags/Safari-604.1.21.0.1/Source/WebInspectorUI/Configurations/Version.xcconfig
tags/Safari-604.1.21.0.1/Source/WebKit/mac/Configurations/Version.xcconfig
tags/Safari-604.1.21.0.1/Source/WebKit2/Configurations/Version.xcconfig




Diff

Modified: tags/Safari-604.1.21.0.1/Source/_javascript_Core/Configurations/Version.xcconfig (216286 => 216287)

--- tags/Safari-604.1.21.0.1/Source/_javascript_Core/Configurations/Version.xcconfig	2017-05-05 22:53:05 UTC (rev 216286)
+++ tags/Safari-604.1.21.0.1/Source/_javascript_Core/Configurations/Version.xcconfig	2017-05-05 22:53:09 UTC (rev 216287)
@@ -25,8 +25,8 @@
 MINOR_VERSION = 1;
 TINY_VERSION = 21;
 MICRO_VERSION = 0;
-NANO_VERSION = 0;
-FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);
+NANO_VERSION = 1;
+FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION).$(NANO_VERSION);
 
 // The bundle version and short version string are set based on the current build configuration, see below.
 BUNDLE_VERSION = $(BUNDLE_VERSION_$(CONFIGURATION));


Modified: tags/Safari-604.1.21.0.1/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig (216286 => 216287)

--- tags/Safari-604.1.21.0.1/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig	2017-05-05 22:53:05 UTC (rev 216286)
+++ tags/Safari-604.1.21.0.1/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig	2017-05-05 22:53:09 UTC (rev 216287)
@@ -25,8 +25,8 @@
 MINOR_VERSION = 1;
 TINY_VERSION = 21;
 MICRO_VERSION = 0;
-NANO_VERSION = 0;
-FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);
+NANO_VERSION = 1;
+FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION).$(NANO_VERSION);
 
 // The bundle version and short version string are set based on the current build configuration, see below.
 BUNDLE_VERSION = $(BUNDLE_VERSION_$(CONFIGURATION));


Modified: tags/Safari-604.1.21.0.1/Source/WebCore/Configurations/Version.xcconfig (216286 => 216287)

--- tags/Safari-604.1.21.0.1/Source/WebCore/Configurations/Version.xcconfig	2017-05-05 22:53:05 UTC (rev 216286)
+++ tags/Safari-604.1.21.0.1/Source/WebCore/Configurations/Version.xcconfig	2017-05-05 22:53:09 UTC (rev 216287)
@@ -25,8 +25,8 @@
 MINOR_VERSION = 1;
 TINY_VERSION = 21;
 MICRO_VERSION = 0;
-NANO_VERSION = 0;
-FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);
+NANO_VERSION = 1;
+FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION).$(NANO_VERSION);
 
 // The bundle version and short version string are set based on the current build configuration, see below.
 BUNDLE_VERSION = $(BUNDLE_VERSION_$(CONFIGURATION));


Modified: tags/Safari-604.1.21.0.1/Source/WebCore/PAL/Configurations/Version.xcconfig (216286 => 216287)

--- tags/Safari-604.1.21.0.1/Source/WebCore/PAL/Configurations/Version.xcconfig	2017-05-05 22:53:05 UTC (rev 216286)
+++ tags/Safari-604.1.21.0.1/Source/WebCore/PAL/Configurations/Version.xcconfig	2017-05-05 22:53:09 UTC (rev 216287)
@@ -25,8 +25,8 @@
 MINOR_VERSION = 1;
 TINY_VERSION = 21;
 MICRO_VERSION = 0;
-NANO_VERSION = 0;
-FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);
+NANO_VERSION = 1;
+FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION).$(NANO_VERSION);
 
 // The bundle version and short version string are set based on the current build configuration, see below.
 BUNDLE_VERSION = $(BUNDLE_VERSION_$(CONFIGURATION));


Modified: tags/Safari-604.1.21.0.1/Source/WebInspectorUI/Configurations/Version.xcconfig (216286 => 216287)

--- tags/Safari-604.1.21.0.1/Source/WebInspectorUI/Configurations/Version.xcconfig	2017-05-05 22:53:05 UTC (rev 216286)
+++ tags/Safari-604.1.21.0.1/Source/WebInspectorUI/Configurations/Version.xcconfig	2017-05-05 22:53:09 UTC (rev 216287)
@@ -2,8 +2,8 @@
 MINOR_VERSION = 1;
 TINY_VERSION = 21;
 MICRO_VERSION = 0;
-NANO_VERSION = 0;
-FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);
+NANO_VERSION = 1;
+FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION).$(NANO_VERSION);
 
 // The system version prefix is based on the current system version.
 SYSTEM_VERSION_PREFIX[sdk=iphone*] = 8;


Modified: tags/Safari-604.1.21.0.1/Source/WebKit/mac/Configurations/Version.xcconfig (216286 => 216287)

--- tags/Safari-604.1.21.0.1/Source/WebKit/mac/Configurations/Version.xcconfig	2017-05-05 22:53:05 UTC (rev 216286)
+++ tags/Safari-604.1.21.0.1/Source/WebKit/mac/Configurations/Version.xcconfig	2017-05-05

[webkit-changes] [216286] tags/Safari-604.1.21.0.1/Source

2017-05-05 Thread matthew_hanson

Title: [216286] tags/Safari-604.1.21.0.1/Source








Revision 216286
Author matthew_han...@apple.com
Date 2017-05-05 15:53:05 -0700 (Fri, 05 May 2017)


Log Message
Cherry-pick r216229. rdar://problem/31978703

Modified Paths

tags/Safari-604.1.21.0.1/Source/WebCore/ChangeLog
tags/Safari-604.1.21.0.1/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm
tags/Safari-604.1.21.0.1/Source/WebKit/mac/ChangeLog
tags/Safari-604.1.21.0.1/Source/WebKit/mac/WebView/WebView.mm




Diff

Modified: tags/Safari-604.1.21.0.1/Source/WebCore/ChangeLog (216285 => 216286)

--- tags/Safari-604.1.21.0.1/Source/WebCore/ChangeLog	2017-05-05 22:50:56 UTC (rev 216285)
+++ tags/Safari-604.1.21.0.1/Source/WebCore/ChangeLog	2017-05-05 22:53:05 UTC (rev 216286)
@@ -1,3 +1,24 @@
+2017-05-05  Matthew Hanson  
+
+Cherry-pick r216229. rdar://problem/31978703
+
+2017-05-04  Jeremy Jones  
+
+UIColor +whiteColor and +clearColor are ambiguous and need to be casted when soft linked.
+https://bugs.webkit.org/show_bug.cgi?id=171704
+
+Reviewed by Jer Noble.
+
+No new tests because no behavior change.
+
+Fix build by casting result of +clearColor to UIColor.
+
+* platform/ios/WebVideoFullscreenInterfaceAVKit.mm:
+(clearUIColor):
+(WebVideoFullscreenInterfaceAVKit::setupFullscreen):
+(WebVideoFullscreenInterfaceAVKit::exitFullscreen):
+(WebVideoFullscreenInterfaceAVKit::didStopPictureInPicture):
+
 2017-05-03  John Wilander  
 
 Resource Load Statistics: Remove all statistics for modifiedSince website data removals


Modified: tags/Safari-604.1.21.0.1/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm (216285 => 216286)

--- tags/Safari-604.1.21.0.1/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm	2017-05-05 22:50:56 UTC (rev 216285)
+++ tags/Safari-604.1.21.0.1/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm	2017-05-05 22:53:05 UTC (rev 216286)
@@ -75,6 +75,11 @@
 SOFT_LINK_CLASS(UIKit, UIColor)
 SOFT_LINK_CONSTANT(UIKit, UIRemoteKeyboardLevel, UIWindowLevel)
 
+static UIColor *clearUIColor()
+{
+return (UIColor *)[getUIColorClass() clearColor];
+}
+
 #if !LOG_DISABLED
 static const char* boolString(bool val)
 {
@@ -602,7 +607,7 @@
 if (![[parentView window] _isHostedInAnotherProcess]) {
 if (!m_window)
 m_window = adoptNS([allocUIWindowInstance() initWithFrame:[[getUIScreenClass() mainScreen] bounds]]);
-[m_window setBackgroundColor:[getUIColorClass() clearColor]];
+[m_window setBackgroundColor:clearUIColor()];
 if (!m_viewController)
 m_viewController = adoptNS([allocUIViewControllerInstance() init]);
 [[m_viewController view] setFrame:[m_window bounds]];
@@ -615,7 +620,7 @@
 if (!m_playerLayerView)
 m_playerLayerView = adoptNS([[getWebAVPlayerLayerViewClass() alloc] init]);
 [m_playerLayerView setHidden:[playerController() isExternalPlaybackActive]];
-[m_playerLayerView setBackgroundColor:[getUIColorClass() clearColor]];
+[m_playerLayerView setBackgroundColor:clearUIColor()];
 
 if (!isInPictureInPictureMode) {
 [m_playerLayerView setVideoView:];
@@ -646,7 +651,7 @@
 
 [m_playerViewController view].frame = [parentView convertRect:initialRect toView:[m_playerViewController view].superview];
 
-[[m_playerViewController view] setBackgroundColor:[getUIColorClass() clearColor]];
+[[m_playerViewController view] setBackgroundColor:clearUIColor()];
 [[m_playerViewController view] setAutoresizingMask:(UIViewAutoresizingFlexibleBottomMargin | UIViewAutoresizingFlexibleRightMargin)];
 
 [[m_playerViewController view] setNeedsLayout];
@@ -748,8 +753,8 @@
 
 [CATransaction begin];
 [CATransaction setDisableActions:YES];
-[m_playerLayerView setBackgroundColor:[getUIColorClass() clearColor]];
-[[m_playerViewController view] setBackgroundColor:[getUIColorClass() clearColor]];
+[m_playerLayerView setBackgroundColor:clearUIColor()];
+[[m_playerViewController view] setBackgroundColor:clearUIColor()];
 [CATransaction commit];
 
 dispatch_async(dispatch_get_main_queue(), [protectedThis, this]() {
@@ -930,8 +935,8 @@
 
 m_exitCompleted = true;
 
-[m_playerLayerView setBackgroundColor:[getUIColorClass() clearColor]];
-[[m_playerViewController view] setBackgroundColor:[getUIColorClass() clearColor]];
+[m_playerLayerView setBackgroundColor:clearUIColor()];
+[[m_playerViewController view] setBackgroundColor:clearUIColor()];
 
 clearMode(HTMLMediaElementEnums::VideoFullscreenModePictureInPicture);
 


Modified: tags/Safari-604.1.21.0.1/Source/WebKit/mac/ChangeLog (216285 => 216286)

--- tags/Safari-604.1.21.0.1/Source/WebKit/mac/ChangeLog	2017-05-05 22:50:56 UTC

[webkit-changes] [216284] tags/Safari-604.1.21.0.1/

2017-05-05 Thread matthew_hanson

Title: [216284] tags/Safari-604.1.21.0.1/








Revision 216284
Author matthew_han...@apple.com
Date 2017-05-05 15:48:59 -0700 (Fri, 05 May 2017)


Log Message
New tag.

Added Paths

tags/Safari-604.1.21.0.1/




Diff




___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [216283] tags/Safari-604.1.22/

2017-05-05 Thread matthew_hanson

Title: [216283] tags/Safari-604.1.22/








Revision 216283
Author matthew_han...@apple.com
Date 2017-05-05 15:48:20 -0700 (Fri, 05 May 2017)


Log Message
Delete tag.

Removed Paths

tags/Safari-604.1.22/




Diff




___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [216281] tags/Safari-604.1.21/Source

2017-05-05 Thread matthew_hanson

Title: [216281] tags/Safari-604.1.21/Source








Revision 216281
Author matthew_han...@apple.com
Date 2017-05-05 15:45:57 -0700 (Fri, 05 May 2017)


Log Message
Revert r216270.

Modified Paths

tags/Safari-604.1.21/Source/_javascript_Core/Configurations/Version.xcconfig
tags/Safari-604.1.21/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig
tags/Safari-604.1.21/Source/WebCore/Configurations/Version.xcconfig
tags/Safari-604.1.21/Source/WebCore/PAL/Configurations/Version.xcconfig
tags/Safari-604.1.21/Source/WebInspectorUI/Configurations/Version.xcconfig
tags/Safari-604.1.21/Source/WebKit/mac/Configurations/Version.xcconfig
tags/Safari-604.1.21/Source/WebKit2/Configurations/Version.xcconfig




Diff

Modified: tags/Safari-604.1.21/Source/_javascript_Core/Configurations/Version.xcconfig (216280 => 216281)

--- tags/Safari-604.1.21/Source/_javascript_Core/Configurations/Version.xcconfig	2017-05-05 22:43:43 UTC (rev 216280)
+++ tags/Safari-604.1.21/Source/_javascript_Core/Configurations/Version.xcconfig	2017-05-05 22:45:57 UTC (rev 216281)
@@ -25,8 +25,8 @@
 MINOR_VERSION = 1;
 TINY_VERSION = 21;
 MICRO_VERSION = 0;
-NANO_VERSION = 1;
-FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION).$(NANO_VERSION);
+NANO_VERSION = 0;
+FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);
 
 // The bundle version and short version string are set based on the current build configuration, see below.
 BUNDLE_VERSION = $(BUNDLE_VERSION_$(CONFIGURATION));


Modified: tags/Safari-604.1.21/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig (216280 => 216281)

--- tags/Safari-604.1.21/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig	2017-05-05 22:43:43 UTC (rev 216280)
+++ tags/Safari-604.1.21/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig	2017-05-05 22:45:57 UTC (rev 216281)
@@ -25,8 +25,8 @@
 MINOR_VERSION = 1;
 TINY_VERSION = 21;
 MICRO_VERSION = 0;
-NANO_VERSION = 1;
-FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION).$(NANO_VERSION);
+NANO_VERSION = 0;
+FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);
 
 // The bundle version and short version string are set based on the current build configuration, see below.
 BUNDLE_VERSION = $(BUNDLE_VERSION_$(CONFIGURATION));


Modified: tags/Safari-604.1.21/Source/WebCore/Configurations/Version.xcconfig (216280 => 216281)

--- tags/Safari-604.1.21/Source/WebCore/Configurations/Version.xcconfig	2017-05-05 22:43:43 UTC (rev 216280)
+++ tags/Safari-604.1.21/Source/WebCore/Configurations/Version.xcconfig	2017-05-05 22:45:57 UTC (rev 216281)
@@ -25,8 +25,8 @@
 MINOR_VERSION = 1;
 TINY_VERSION = 21;
 MICRO_VERSION = 0;
-NANO_VERSION = 1;
-FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION).$(NANO_VERSION);
+NANO_VERSION = 0;
+FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);
 
 // The bundle version and short version string are set based on the current build configuration, see below.
 BUNDLE_VERSION = $(BUNDLE_VERSION_$(CONFIGURATION));


Modified: tags/Safari-604.1.21/Source/WebCore/PAL/Configurations/Version.xcconfig (216280 => 216281)

--- tags/Safari-604.1.21/Source/WebCore/PAL/Configurations/Version.xcconfig	2017-05-05 22:43:43 UTC (rev 216280)
+++ tags/Safari-604.1.21/Source/WebCore/PAL/Configurations/Version.xcconfig	2017-05-05 22:45:57 UTC (rev 216281)
@@ -25,8 +25,8 @@
 MINOR_VERSION = 1;
 TINY_VERSION = 21;
 MICRO_VERSION = 0;
-NANO_VERSION = 1;
-FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION).$(NANO_VERSION);
+NANO_VERSION = 0;
+FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);
 
 // The bundle version and short version string are set based on the current build configuration, see below.
 BUNDLE_VERSION = $(BUNDLE_VERSION_$(CONFIGURATION));


Modified: tags/Safari-604.1.21/Source/WebInspectorUI/Configurations/Version.xcconfig (216280 => 216281)

--- tags/Safari-604.1.21/Source/WebInspectorUI/Configurations/Version.xcconfig	2017-05-05 22:43:43 UTC (rev 216280)
+++ tags/Safari-604.1.21/Source/WebInspectorUI/Configurations/Version.xcconfig	2017-05-05 22:45:57 UTC (rev 216281)
@@ -2,8 +2,8 @@
 MINOR_VERSION = 1;
 TINY_VERSION = 21;
 MICRO_VERSION = 0;
-NANO_VERSION = 1;
-FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION).$(NANO_VERSION);
+NANO_VERSION = 0;
+FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);
 
 // The system version prefix is based on the current system version.
 SYSTEM_VERSION_PREFIX[sdk=iphone*] = 8;


Modified: tags/Safari-604.1.21/Source/WebKit/mac/Configurations/Version.xcconfig (216280 => 216281)

--- tags/Safari-604.1.21/Source/WebKit/mac/Configurations/Version.xcconfig	2017-05-05 22:43:43 UTC (rev 216280)
+++ tags/Safari-604.1.21/Source/WebKit/mac/Configurations/Version.xcconfig	2017-05-05 22:45:57 UTC (rev 216281)
@@ -25,8 +25,8 @@
 MINOR_VERSION = 1;
 TINY_VERSION = 21;
 MICRO_VERSION = 0;

[webkit-changes] [216282] tags/Safari-604.1.21/Source

2017-05-05 Thread matthew_hanson

Title: [216282] tags/Safari-604.1.21/Source








Revision 216282
Author matthew_han...@apple.com
Date 2017-05-05 15:46:02 -0700 (Fri, 05 May 2017)


Log Message
Revert r216268. rdar://problem/31978703

Modified Paths

tags/Safari-604.1.21/Source/WebCore/ChangeLog
tags/Safari-604.1.21/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm
tags/Safari-604.1.21/Source/WebKit/mac/ChangeLog
tags/Safari-604.1.21/Source/WebKit/mac/WebView/WebView.mm




Diff

Modified: tags/Safari-604.1.21/Source/WebCore/ChangeLog (216281 => 216282)

--- tags/Safari-604.1.21/Source/WebCore/ChangeLog	2017-05-05 22:45:57 UTC (rev 216281)
+++ tags/Safari-604.1.21/Source/WebCore/ChangeLog	2017-05-05 22:46:02 UTC (rev 216282)
@@ -1,38 +1,21 @@
 2017-05-05  Matthew Hanson  
 
-Cherry-pick r216229. rdar://problem/31978703
+Revert r216268. rdar://problem/31978703
 
-2017-05-04  Jeremy Jones  
+2017-05-03  John Wilander  
 
-UIColor +whiteColor and +clearColor are ambiguous and need to be casted when soft linked.
-https://bugs.webkit.org/show_bug.cgi?id=171704
+Resource Load Statistics: Remove all statistics for modifiedSince website data removals
+https://bugs.webkit.org/show_bug.cgi?id=171584
+
 
-Reviewed by Jer Noble.
+Reviewed by Brent Fulgham.
 
-No new tests because no behavior change.
+Test: http/tests/loading/resourceLoadStatistics/clear-in-memory-and-persistent-store-one-hour.html
 
-Fix build by casting result of +clearColor to UIColor.
+* loader/ResourceLoadObserver.cpp:
+(WebCore::ResourceLoadObserver::clearInMemoryAndPersistentStore):
+Now clears all regardless of the modifiedSince parameter's value.
 
-* platform/ios/WebVideoFullscreenInterfaceAVKit.mm:
-(clearUIColor):
-(WebVideoFullscreenInterfaceAVKit::setupFullscreen):
-(WebVideoFullscreenInterfaceAVKit::exitFullscreen):
-(WebVideoFullscreenInterfaceAVKit::didStopPictureInPicture):
-
-2017-05-03  John Wilander  
-
-Resource Load Statistics: Remove all statistics for modifiedSince website data removals
-https://bugs.webkit.org/show_bug.cgi?id=171584
-
-
-Reviewed by Brent Fulgham.
-
-Test: http/tests/loading/resourceLoadStatistics/clear-in-memory-and-persistent-store-one-hour.html
-
-* loader/ResourceLoadObserver.cpp:
-(WebCore::ResourceLoadObserver::clearInMemoryAndPersistentStore):
-Now clears all regardless of the modifiedSince parameter's value.
-
 2017-05-03  Andy Estes  
 
 Try to fix the macOS Public SDK build


Modified: tags/Safari-604.1.21/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm (216281 => 216282)

--- tags/Safari-604.1.21/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm	2017-05-05 22:45:57 UTC (rev 216281)
+++ tags/Safari-604.1.21/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm	2017-05-05 22:46:02 UTC (rev 216282)
@@ -75,11 +75,6 @@
 SOFT_LINK_CLASS(UIKit, UIColor)
 SOFT_LINK_CONSTANT(UIKit, UIRemoteKeyboardLevel, UIWindowLevel)
 
-static UIColor *clearUIColor()
-{
-return (UIColor *)[getUIColorClass() clearColor];
-}
-
 #if !LOG_DISABLED
 static const char* boolString(bool val)
 {
@@ -607,7 +602,7 @@
 if (![[parentView window] _isHostedInAnotherProcess]) {
 if (!m_window)
 m_window = adoptNS([allocUIWindowInstance() initWithFrame:[[getUIScreenClass() mainScreen] bounds]]);
-[m_window setBackgroundColor:clearUIColor()];
+[m_window setBackgroundColor:[getUIColorClass() clearColor]];
 if (!m_viewController)
 m_viewController = adoptNS([allocUIViewControllerInstance() init]);
 [[m_viewController view] setFrame:[m_window bounds]];
@@ -620,7 +615,7 @@
 if (!m_playerLayerView)
 m_playerLayerView = adoptNS([[getWebAVPlayerLayerViewClass() alloc] init]);
 [m_playerLayerView setHidden:[playerController() isExternalPlaybackActive]];
-[m_playerLayerView setBackgroundColor:clearUIColor()];
+[m_playerLayerView setBackgroundColor:[getUIColorClass() clearColor]];
 
 if (!isInPictureInPictureMode) {
 [m_playerLayerView setVideoView:];
@@ -651,7 +646,7 @@
 
 [m_playerViewController view].frame = [parentView convertRect:initialRect toView:[m_playerViewController view].superview];
 
-[[m_playerViewController view] setBackgroundColor:clearUIColor()];
+[[m_playerViewController view] setBackgroundColor:[getUIColorClass() clearColor]];
 [[m_playerViewController view] setAutoresizingMask:(UIViewAutoresizingFlexibleBottomMargin | UIViewAutoresizingFlexibleRightMargin)];
 
 [[m_playerViewController view] setNeedsLayout];
@@ -753,8 +748,8 @@
 
 [CATransaction begin];

[webkit-changes] [216276] tags/Safari-604.1.22/

2017-05-05 Thread matthew_hanson

Title: [216276] tags/Safari-604.1.22/








Revision 216276
Author matthew_han...@apple.com
Date 2017-05-05 15:03:18 -0700 (Fri, 05 May 2017)


Log Message
New tag.

Added Paths

tags/Safari-604.1.22/




Diff




___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [216270] tags/Safari-604.1.21/Source

2017-05-05 Thread matthew_hanson

Title: [216270] tags/Safari-604.1.21/Source








Revision 216270
Author matthew_han...@apple.com
Date 2017-05-05 13:52:21 -0700 (Fri, 05 May 2017)


Log Message
Versioning.

Modified Paths

tags/Safari-604.1.21/Source/_javascript_Core/Configurations/Version.xcconfig
tags/Safari-604.1.21/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig
tags/Safari-604.1.21/Source/WebCore/Configurations/Version.xcconfig
tags/Safari-604.1.21/Source/WebCore/PAL/Configurations/Version.xcconfig
tags/Safari-604.1.21/Source/WebInspectorUI/Configurations/Version.xcconfig
tags/Safari-604.1.21/Source/WebKit/mac/Configurations/Version.xcconfig
tags/Safari-604.1.21/Source/WebKit2/Configurations/Version.xcconfig




Diff

Modified: tags/Safari-604.1.21/Source/_javascript_Core/Configurations/Version.xcconfig (216269 => 216270)

--- tags/Safari-604.1.21/Source/_javascript_Core/Configurations/Version.xcconfig	2017-05-05 20:36:24 UTC (rev 216269)
+++ tags/Safari-604.1.21/Source/_javascript_Core/Configurations/Version.xcconfig	2017-05-05 20:52:21 UTC (rev 216270)
@@ -25,8 +25,8 @@
 MINOR_VERSION = 1;
 TINY_VERSION = 21;
 MICRO_VERSION = 0;
-NANO_VERSION = 0;
-FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);
+NANO_VERSION = 1;
+FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION).$(NANO_VERSION);
 
 // The bundle version and short version string are set based on the current build configuration, see below.
 BUNDLE_VERSION = $(BUNDLE_VERSION_$(CONFIGURATION));


Modified: tags/Safari-604.1.21/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig (216269 => 216270)

--- tags/Safari-604.1.21/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig	2017-05-05 20:36:24 UTC (rev 216269)
+++ tags/Safari-604.1.21/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig	2017-05-05 20:52:21 UTC (rev 216270)
@@ -25,8 +25,8 @@
 MINOR_VERSION = 1;
 TINY_VERSION = 21;
 MICRO_VERSION = 0;
-NANO_VERSION = 0;
-FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);
+NANO_VERSION = 1;
+FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION).$(NANO_VERSION);
 
 // The bundle version and short version string are set based on the current build configuration, see below.
 BUNDLE_VERSION = $(BUNDLE_VERSION_$(CONFIGURATION));


Modified: tags/Safari-604.1.21/Source/WebCore/Configurations/Version.xcconfig (216269 => 216270)

--- tags/Safari-604.1.21/Source/WebCore/Configurations/Version.xcconfig	2017-05-05 20:36:24 UTC (rev 216269)
+++ tags/Safari-604.1.21/Source/WebCore/Configurations/Version.xcconfig	2017-05-05 20:52:21 UTC (rev 216270)
@@ -25,8 +25,8 @@
 MINOR_VERSION = 1;
 TINY_VERSION = 21;
 MICRO_VERSION = 0;
-NANO_VERSION = 0;
-FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);
+NANO_VERSION = 1;
+FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION).$(NANO_VERSION);
 
 // The bundle version and short version string are set based on the current build configuration, see below.
 BUNDLE_VERSION = $(BUNDLE_VERSION_$(CONFIGURATION));


Modified: tags/Safari-604.1.21/Source/WebCore/PAL/Configurations/Version.xcconfig (216269 => 216270)

--- tags/Safari-604.1.21/Source/WebCore/PAL/Configurations/Version.xcconfig	2017-05-05 20:36:24 UTC (rev 216269)
+++ tags/Safari-604.1.21/Source/WebCore/PAL/Configurations/Version.xcconfig	2017-05-05 20:52:21 UTC (rev 216270)
@@ -25,8 +25,8 @@
 MINOR_VERSION = 1;
 TINY_VERSION = 21;
 MICRO_VERSION = 0;
-NANO_VERSION = 0;
-FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);
+NANO_VERSION = 1;
+FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION).$(NANO_VERSION);
 
 // The bundle version and short version string are set based on the current build configuration, see below.
 BUNDLE_VERSION = $(BUNDLE_VERSION_$(CONFIGURATION));


Modified: tags/Safari-604.1.21/Source/WebInspectorUI/Configurations/Version.xcconfig (216269 => 216270)

--- tags/Safari-604.1.21/Source/WebInspectorUI/Configurations/Version.xcconfig	2017-05-05 20:36:24 UTC (rev 216269)
+++ tags/Safari-604.1.21/Source/WebInspectorUI/Configurations/Version.xcconfig	2017-05-05 20:52:21 UTC (rev 216270)
@@ -2,8 +2,8 @@
 MINOR_VERSION = 1;
 TINY_VERSION = 21;
 MICRO_VERSION = 0;
-NANO_VERSION = 0;
-FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);
+NANO_VERSION = 1;
+FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION).$(NANO_VERSION);
 
 // The system version prefix is based on the current system version.
 SYSTEM_VERSION_PREFIX[sdk=iphone*] = 8;


Modified: tags/Safari-604.1.21/Source/WebKit/mac/Configurations/Version.xcconfig (216269 => 216270)

--- tags/Safari-604.1.21/Source/WebKit/mac/Configurations/Version.xcconfig	2017-05-05 20:36:24 UTC (rev 216269)
+++ tags/Safari-604.1.21/Source/WebKit/mac/Configurations/Version.xcconfig	2017-05-05 20:52:21 UTC (rev 216270)
@@ -25,8 +25,8 @@
 MINOR_VERSION = 1;
 TINY_VERSION = 21;
 MICRO_VERSION = 0;

[webkit-changes] [216268] tags/Safari-604.1.21/Source

2017-05-05 Thread matthew_hanson

Title: [216268] tags/Safari-604.1.21/Source








Revision 216268
Author matthew_han...@apple.com
Date 2017-05-05 13:33:47 -0700 (Fri, 05 May 2017)


Log Message
Cherry-pick r216229. rdar://problem/31978703

Modified Paths

tags/Safari-604.1.21/Source/WebCore/ChangeLog
tags/Safari-604.1.21/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm
tags/Safari-604.1.21/Source/WebKit/mac/ChangeLog
tags/Safari-604.1.21/Source/WebKit/mac/WebView/WebView.mm




Diff

Modified: tags/Safari-604.1.21/Source/WebCore/ChangeLog (216267 => 216268)

--- tags/Safari-604.1.21/Source/WebCore/ChangeLog	2017-05-05 20:31:56 UTC (rev 216267)
+++ tags/Safari-604.1.21/Source/WebCore/ChangeLog	2017-05-05 20:33:47 UTC (rev 216268)
@@ -1,3 +1,24 @@
+2017-05-05  Matthew Hanson  
+
+Cherry-pick r216229. rdar://problem/31978703
+
+2017-05-04  Jeremy Jones  
+
+UIColor +whiteColor and +clearColor are ambiguous and need to be casted when soft linked.
+https://bugs.webkit.org/show_bug.cgi?id=171704
+
+Reviewed by Jer Noble.
+
+No new tests because no behavior change.
+
+Fix build by casting result of +clearColor to UIColor.
+
+* platform/ios/WebVideoFullscreenInterfaceAVKit.mm:
+(clearUIColor):
+(WebVideoFullscreenInterfaceAVKit::setupFullscreen):
+(WebVideoFullscreenInterfaceAVKit::exitFullscreen):
+(WebVideoFullscreenInterfaceAVKit::didStopPictureInPicture):
+
 2017-05-03  John Wilander  
 
 Resource Load Statistics: Remove all statistics for modifiedSince website data removals


Modified: tags/Safari-604.1.21/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm (216267 => 216268)

--- tags/Safari-604.1.21/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm	2017-05-05 20:31:56 UTC (rev 216267)
+++ tags/Safari-604.1.21/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm	2017-05-05 20:33:47 UTC (rev 216268)
@@ -75,6 +75,11 @@
 SOFT_LINK_CLASS(UIKit, UIColor)
 SOFT_LINK_CONSTANT(UIKit, UIRemoteKeyboardLevel, UIWindowLevel)
 
+static UIColor *clearUIColor()
+{
+return (UIColor *)[getUIColorClass() clearColor];
+}
+
 #if !LOG_DISABLED
 static const char* boolString(bool val)
 {
@@ -602,7 +607,7 @@
 if (![[parentView window] _isHostedInAnotherProcess]) {
 if (!m_window)
 m_window = adoptNS([allocUIWindowInstance() initWithFrame:[[getUIScreenClass() mainScreen] bounds]]);
-[m_window setBackgroundColor:[getUIColorClass() clearColor]];
+[m_window setBackgroundColor:clearUIColor()];
 if (!m_viewController)
 m_viewController = adoptNS([allocUIViewControllerInstance() init]);
 [[m_viewController view] setFrame:[m_window bounds]];
@@ -615,7 +620,7 @@
 if (!m_playerLayerView)
 m_playerLayerView = adoptNS([[getWebAVPlayerLayerViewClass() alloc] init]);
 [m_playerLayerView setHidden:[playerController() isExternalPlaybackActive]];
-[m_playerLayerView setBackgroundColor:[getUIColorClass() clearColor]];
+[m_playerLayerView setBackgroundColor:clearUIColor()];
 
 if (!isInPictureInPictureMode) {
 [m_playerLayerView setVideoView:];
@@ -646,7 +651,7 @@
 
 [m_playerViewController view].frame = [parentView convertRect:initialRect toView:[m_playerViewController view].superview];
 
-[[m_playerViewController view] setBackgroundColor:[getUIColorClass() clearColor]];
+[[m_playerViewController view] setBackgroundColor:clearUIColor()];
 [[m_playerViewController view] setAutoresizingMask:(UIViewAutoresizingFlexibleBottomMargin | UIViewAutoresizingFlexibleRightMargin)];
 
 [[m_playerViewController view] setNeedsLayout];
@@ -748,8 +753,8 @@
 
 [CATransaction begin];
 [CATransaction setDisableActions:YES];
-[m_playerLayerView setBackgroundColor:[getUIColorClass() clearColor]];
-[[m_playerViewController view] setBackgroundColor:[getUIColorClass() clearColor]];
+[m_playerLayerView setBackgroundColor:clearUIColor()];
+[[m_playerViewController view] setBackgroundColor:clearUIColor()];
 [CATransaction commit];
 
 dispatch_async(dispatch_get_main_queue(), [protectedThis, this]() {
@@ -930,8 +935,8 @@
 
 m_exitCompleted = true;
 
-[m_playerLayerView setBackgroundColor:[getUIColorClass() clearColor]];
-[[m_playerViewController view] setBackgroundColor:[getUIColorClass() clearColor]];
+[m_playerLayerView setBackgroundColor:clearUIColor()];
+[[m_playerViewController view] setBackgroundColor:clearUIColor()];
 
 clearMode(HTMLMediaElementEnums::VideoFullscreenModePictureInPicture);
 


Modified: tags/Safari-604.1.21/Source/WebKit/mac/ChangeLog (216267 => 216268)

--- tags/Safari-604.1.21/Source/WebKit/mac/ChangeLog	2017-05-05 20:31:56 UTC (rev 216267)
+++

[webkit-changes] [215876] tags/Safari-604.1.19/Source/WebCore

2017-04-27 Thread matthew_hanson

Title: [215876] tags/Safari-604.1.19/Source/WebCore








Revision 215876
Author matthew_han...@apple.com
Date 2017-04-27 10:02:13 -0700 (Thu, 27 Apr 2017)


Log Message
Cherry-pick r215870. rdar://problem/31845349

Modified Paths

tags/Safari-604.1.19/Source/WebCore/ChangeLog
tags/Safari-604.1.19/Source/WebCore/platform/mac/WebPlaybackControlsManager.h




Diff

Modified: tags/Safari-604.1.19/Source/WebCore/ChangeLog (215875 => 215876)

--- tags/Safari-604.1.19/Source/WebCore/ChangeLog	2017-04-27 16:55:12 UTC (rev 215875)
+++ tags/Safari-604.1.19/Source/WebCore/ChangeLog	2017-04-27 17:02:13 UTC (rev 215876)
@@ -1,3 +1,13 @@
+2017-04-27  Matthew Hanson  
+
+Cherry-pick r215870. rdar://problem/31845349
+
+2017-04-27  Andy Estes  
+
+Fix the macOS build.
+
+* platform/mac/WebPlaybackControlsManager.h:
+
 2017-04-27  Dean Jackson  
 
 Use the correct modern-media-controls


Modified: tags/Safari-604.1.19/Source/WebCore/platform/mac/WebPlaybackControlsManager.h (215875 => 215876)

--- tags/Safari-604.1.19/Source/WebCore/platform/mac/WebPlaybackControlsManager.h	2017-04-27 16:55:12 UTC (rev 215875)
+++ tags/Safari-604.1.19/Source/WebCore/platform/mac/WebPlaybackControlsManager.h	2017-04-27 17:02:13 UTC (rev 215876)
@@ -65,8 +65,8 @@
 @property (getter=isPlaying) BOOL playing;
 @property BOOL canTogglePlayback;
 @property (nonatomic) float rate;
-@property (nonatomic) BOOL allowsPictureInPicturePlayback;
-@property (nonatomic, getter=isPictureInPictureActive) BOOL pictureInPictureActive;
+@property BOOL allowsPictureInPicturePlayback;
+@property (getter=isPictureInPictureActive) BOOL pictureInPictureActive;
 
 - (AVTouchBarMediaSelectionOption *)currentAudioTouchBarMediaSelectionOption;
 - (void)setCurrentAudioTouchBarMediaSelectionOption:(AVTouchBarMediaSelectionOption *)option;






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [215781] branches/safari-603-branch/Source

2017-04-25 Thread matthew_hanson

Title: [215781] branches/safari-603-branch/Source








Revision 215781
Author matthew_han...@apple.com
Date 2017-04-25 18:11:56 -0700 (Tue, 25 Apr 2017)


Log Message
Versioning.

Modified Paths

branches/safari-603-branch/Source/_javascript_Core/Configurations/Version.xcconfig
branches/safari-603-branch/Source/WebCore/Configurations/Version.xcconfig
branches/safari-603-branch/Source/WebInspectorUI/Configurations/Version.xcconfig
branches/safari-603-branch/Source/WebKit/mac/Configurations/Version.xcconfig
branches/safari-603-branch/Source/WebKit2/Configurations/Version.xcconfig




Diff

Modified: branches/safari-603-branch/Source/_javascript_Core/Configurations/Version.xcconfig (215780 => 215781)

--- branches/safari-603-branch/Source/_javascript_Core/Configurations/Version.xcconfig	2017-04-26 01:11:11 UTC (rev 215780)
+++ branches/safari-603-branch/Source/_javascript_Core/Configurations/Version.xcconfig	2017-04-26 01:11:56 UTC (rev 215781)
@@ -23,7 +23,7 @@
 
 MAJOR_VERSION = 603;
 MINOR_VERSION = 2;
-TINY_VERSION = 5;
+TINY_VERSION = 6;
 MICRO_VERSION = 0;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);


Modified: branches/safari-603-branch/Source/WebCore/Configurations/Version.xcconfig (215780 => 215781)

--- branches/safari-603-branch/Source/WebCore/Configurations/Version.xcconfig	2017-04-26 01:11:11 UTC (rev 215780)
+++ branches/safari-603-branch/Source/WebCore/Configurations/Version.xcconfig	2017-04-26 01:11:56 UTC (rev 215781)
@@ -23,7 +23,7 @@
 
 MAJOR_VERSION = 603;
 MINOR_VERSION = 2;
-TINY_VERSION = 5;
+TINY_VERSION = 6;
 MICRO_VERSION = 0;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);


Modified: branches/safari-603-branch/Source/WebInspectorUI/Configurations/Version.xcconfig (215780 => 215781)

--- branches/safari-603-branch/Source/WebInspectorUI/Configurations/Version.xcconfig	2017-04-26 01:11:11 UTC (rev 215780)
+++ branches/safari-603-branch/Source/WebInspectorUI/Configurations/Version.xcconfig	2017-04-26 01:11:56 UTC (rev 215781)
@@ -1,6 +1,6 @@
 MAJOR_VERSION = 603;
 MINOR_VERSION = 2;
-TINY_VERSION = 5;
+TINY_VERSION = 6;
 MICRO_VERSION = 0;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);


Modified: branches/safari-603-branch/Source/WebKit/mac/Configurations/Version.xcconfig (215780 => 215781)

--- branches/safari-603-branch/Source/WebKit/mac/Configurations/Version.xcconfig	2017-04-26 01:11:11 UTC (rev 215780)
+++ branches/safari-603-branch/Source/WebKit/mac/Configurations/Version.xcconfig	2017-04-26 01:11:56 UTC (rev 215781)
@@ -23,7 +23,7 @@
 
 MAJOR_VERSION = 603;
 MINOR_VERSION = 2;
-TINY_VERSION = 5;
+TINY_VERSION = 6;
 MICRO_VERSION = 0;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);


Modified: branches/safari-603-branch/Source/WebKit2/Configurations/Version.xcconfig (215780 => 215781)

--- branches/safari-603-branch/Source/WebKit2/Configurations/Version.xcconfig	2017-04-26 01:11:11 UTC (rev 215780)
+++ branches/safari-603-branch/Source/WebKit2/Configurations/Version.xcconfig	2017-04-26 01:11:56 UTC (rev 215781)
@@ -23,7 +23,7 @@
 
 MAJOR_VERSION = 603;
 MINOR_VERSION = 2;
-TINY_VERSION = 5;
+TINY_VERSION = 6;
 MICRO_VERSION = 0;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [215742] tags/Safari-603.2.5/

2017-04-25 Thread matthew_hanson

Title: [215742] tags/Safari-603.2.5/








Revision 215742
Author matthew_han...@apple.com
Date 2017-04-25 10:14:57 -0700 (Tue, 25 Apr 2017)


Log Message
Tag Safari-603.2.5.

Added Paths

tags/Safari-603.2.5/




Diff




___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [214681] tags/Safari-604.1.15.2/

2017-03-31 Thread matthew_hanson

Title: [214681] tags/Safari-604.1.15.2/








Revision 214681
Author matthew_han...@apple.com
Date 2017-03-31 12:40:15 -0700 (Fri, 31 Mar 2017)


Log Message
New Tag.

Added Paths

tags/Safari-604.1.15.2/




Diff




___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [214548] branches/safari-604.1.14-branch/

2017-03-29 Thread matthew_hanson

Title: [214548] branches/safari-604.1.14-branch/








Revision 214548
Author matthew_han...@apple.com
Date 2017-03-29 11:27:44 -0700 (Wed, 29 Mar 2017)


Log Message
New branch.

Added Paths

branches/safari-604.1.14-branch/




Diff




___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [214185] branches/safari-603-branch/LayoutTests

2017-03-20 Thread matthew_hanson

Title: [214185] branches/safari-603-branch/LayoutTests








Revision 214185
Author matthew_han...@apple.com
Date 2017-03-20 11:51:54 -0700 (Mon, 20 Mar 2017)


Log Message
Merge r214095.

Modified Paths

branches/safari-603-branch/LayoutTests/ChangeLog
branches/safari-603-branch/LayoutTests/workers/sab/postMessage-clones.html




Diff

Modified: branches/safari-603-branch/LayoutTests/ChangeLog (214184 => 214185)

--- branches/safari-603-branch/LayoutTests/ChangeLog	2017-03-20 18:51:52 UTC (rev 214184)
+++ branches/safari-603-branch/LayoutTests/ChangeLog	2017-03-20 18:51:54 UTC (rev 214185)
@@ -1,5 +1,22 @@
 2017-03-20  Jason Marcell  
 
+Merge r214095.
+
+2017-03-16  Ryan Haddad  
+
+Merge r212132.
+
+2017-02-10  Filip Pizlo  
+
+LayoutTest workers/sab/postMessage-clones.html is a flaky failure
+https://bugs.webkit.org/show_bug.cgi?id=168129
+
+Unreviewed, make this test more deterministic.
+
+* workers/sab/postMessage-clones.html:
+
+2017-03-20  Jason Marcell  
+
 Merge r214094.
 
 2017-03-16  Ryan Haddad  


Modified: branches/safari-603-branch/LayoutTests/workers/sab/postMessage-clones.html (214184 => 214185)

--- branches/safari-603-branch/LayoutTests/workers/sab/postMessage-clones.html	2017-03-20 18:51:52 UTC (rev 214184)
+++ branches/safari-603-branch/LayoutTests/workers/sab/postMessage-clones.html	2017-03-20 18:51:54 UTC (rev 214185)
@@ -26,7 +26,11 @@
 testRunner.notifyDone();
 });
 
-postMessage(memory, "*");
+window.setTimeout(
+function() {
+window.postMessage(memory, "*");
+},
+0);

[webkit-changes] [214184] branches/safari-603-branch/LayoutTests

2017-03-20 Thread matthew_hanson

Title: [214184] branches/safari-603-branch/LayoutTests








Revision 214184
Author matthew_han...@apple.com
Date 2017-03-20 11:51:52 -0700 (Mon, 20 Mar 2017)


Log Message
Merge r214094.

Modified Paths

branches/safari-603-branch/LayoutTests/ChangeLog


Added Paths

branches/safari-603-branch/LayoutTests/platform/mac-wk1/fast/canvas/
branches/safari-603-branch/LayoutTests/platform/mac-wk1/fast/canvas/webgl/
branches/safari-603-branch/LayoutTests/platform/mac-wk1/fast/canvas/webgl/context-creation-attributes-expected.txt




Diff

Modified: branches/safari-603-branch/LayoutTests/ChangeLog (214183 => 214184)

--- branches/safari-603-branch/LayoutTests/ChangeLog	2017-03-20 18:51:49 UTC (rev 214183)
+++ branches/safari-603-branch/LayoutTests/ChangeLog	2017-03-20 18:51:52 UTC (rev 214184)
@@ -1,5 +1,16 @@
 2017-03-20  Jason Marcell  
 
+Merge r214094.
+
+2017-03-16  Ryan Haddad  
+
+Add baseline for fast/canvas/webgl/context-creation-attributes.html.
+Unreviewed test gardening.
+
+* platform/mac-wk1/fast/canvas/webgl/context-creation-attributes-expected.txt: Added.
+
+2017-03-20  Jason Marcell  
+
 Merge r214081.
 
 2017-03-16  Ryan Haddad  


Added: branches/safari-603-branch/LayoutTests/platform/mac-wk1/fast/canvas/webgl/context-creation-attributes-expected.txt (0 => 214184)

--- branches/safari-603-branch/LayoutTests/platform/mac-wk1/fast/canvas/webgl/context-creation-attributes-expected.txt	(rev 0)
+++ branches/safari-603-branch/LayoutTests/platform/mac-wk1/fast/canvas/webgl/context-creation-attributes-expected.txt	2017-03-20 18:51:52 UTC (rev 214184)
@@ -0,0 +1,6 @@
+Note that some of the values tested here might not be supported, and thus should return the default values.
+
+{"alpha":true,"antialias":true,"depth":true,"failIfMajorPerformanceCaveat":false,"powerPreference":"low-power","premultipliedAlpha":true,"preserveDrawingBuffer":false,"stencil":false}
+{"alpha":true,"antialias":true,"depth":true,"failIfMajorPerformanceCaveat":false,"powerPreference":"low-power","premultipliedAlpha":true,"preserveDrawingBuffer":false,"stencil":true}
+{"alpha":true,"antialias":true,"depth":true,"failIfMajorPerformanceCaveat":false,"powerPreference":"low-power","premultipliedAlpha":true,"preserveDrawingBuffer":false,"stencil":false}
+{"alpha":true,"antialias":true,"depth":true,"failIfMajorPerformanceCaveat":true,"powerPreference":"low-power","premultipliedAlpha":true,"preserveDrawingBuffer":false,"stencil":false}






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [214186] branches/safari-603-branch/LayoutTests

2017-03-20 Thread matthew_hanson

Title: [214186] branches/safari-603-branch/LayoutTests








Revision 214186
Author matthew_han...@apple.com
Date 2017-03-20 11:51:56 -0700 (Mon, 20 Mar 2017)


Log Message
Merge r214096.

Modified Paths

branches/safari-603-branch/LayoutTests/ChangeLog
branches/safari-603-branch/LayoutTests/workers/sab/postMessage-clones-expected.txt
branches/safari-603-branch/LayoutTests/workers/sab/postMessage-clones.html




Diff

Modified: branches/safari-603-branch/LayoutTests/ChangeLog (214185 => 214186)

--- branches/safari-603-branch/LayoutTests/ChangeLog	2017-03-20 18:51:54 UTC (rev 214185)
+++ branches/safari-603-branch/LayoutTests/ChangeLog	2017-03-20 18:51:56 UTC (rev 214186)
@@ -1,5 +1,24 @@
 2017-03-20  Jason Marcell  
 
+Merge r214096.
+
+2017-03-16  Ryan Haddad  
+
+Merge r213174.
+
+2017-02-28  Alexey Proskuryakov  
+
+LayoutTest workers/sab/postMessage-clones.html is a flaky failure
+https://bugs.webkit.org/show_bug.cgi?id=168129
+
+Reviewed by Tim Horton.
+
+* workers/sab/postMessage-clones-expected.txt:
+* workers/sab/postMessage-clones.html:
+Fix raciness, and update the test to modern style.
+
+2017-03-20  Jason Marcell  
+
 Merge r214095.
 
 2017-03-16  Ryan Haddad  


Modified: branches/safari-603-branch/LayoutTests/workers/sab/postMessage-clones-expected.txt (214185 => 214186)

--- branches/safari-603-branch/LayoutTests/workers/sab/postMessage-clones-expected.txt	2017-03-20 18:51:54 UTC (rev 214185)
+++ branches/safari-603-branch/LayoutTests/workers/sab/postMessage-clones-expected.txt	2017-03-20 18:51:56 UTC (rev 214186)
@@ -3,11 +3,11 @@
 On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
 
 
-PASS successfullyParsed is true
-
-TEST COMPLETE
 PASS memory[0] is 42
 PASS otherMemory[0] is 0
 PASS memory[0] is 42
 PASS otherMemory[0] is 43
+PASS successfullyParsed is true
 
+TEST COMPLETE
+


Modified: branches/safari-603-branch/LayoutTests/workers/sab/postMessage-clones.html (214185 => 214186)

--- branches/safari-603-branch/LayoutTests/workers/sab/postMessage-clones.html	2017-03-20 18:51:54 UTC (rev 214185)
+++ branches/safari-603-branch/LayoutTests/workers/sab/postMessage-clones.html	2017-03-20 18:51:56 UTC (rev 214186)
@@ -1,14 +1,13 @@
-
+
 
 
-+