[webkit-changes] [226878] trunk/Source/WTF

[commit-queue]

Title: [226878] trunk/Source/WTF








Revision 226878
Author commit-qu...@webkit.org
Date 2018-01-11 22:53:51 -0800 (Thu, 11 Jan 2018)


Log Message
Remove noexcept from definition of std::tie()
https://bugs.webkit.org/show_bug.cgi?id=181577

Patch by Basuke Suzuki  on 2018-01-11
Reviewed by Yusuke Suzuki.

* wtf/StdLibExtras.h:
(WTF::tie):

Modified Paths

trunk/Source/WTF/ChangeLog
trunk/Source/WTF/wtf/StdLibExtras.h




Diff

Modified: trunk/Source/WTF/ChangeLog (226877 => 226878)

--- trunk/Source/WTF/ChangeLog	2018-01-12 06:31:22 UTC (rev 226877)
+++ trunk/Source/WTF/ChangeLog	2018-01-12 06:53:51 UTC (rev 226878)
@@ -1,3 +1,13 @@
+2018-01-11  Basuke Suzuki  
+
+Remove noexcept from definition of std::tie()
+https://bugs.webkit.org/show_bug.cgi?id=181577
+
+Reviewed by Yusuke Suzuki.
+
+* wtf/StdLibExtras.h:
+(WTF::tie):
+
 2018-01-11  Filip Pizlo  
 
 Reserve a fast TLS key for GC TLC


Modified: trunk/Source/WTF/wtf/StdLibExtras.h (226877 => 226878)

--- trunk/Source/WTF/wtf/StdLibExtras.h	2018-01-12 06:31:22 UTC (rev 226877)
+++ trunk/Source/WTF/wtf/StdLibExtras.h	2018-01-12 06:53:51 UTC (rev 226878)
@@ -450,7 +450,7 @@
 // This workaround can be removed after 2019-04 and all users of WTF::tie can be converted to std::tie
 // For more info see: https://bugs.webkit.org/show_bug.cgi?id=180692 and https://gcc.gnu.org/bugzilla/show_bug.cgi?id=65978
 template 
-inline constexpr std::tuple tie(Args&... values) noexcept
+inline constexpr std::tuple tie(Args&... values)
 {
 return std::tuple(values...);
 }






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

[webkit-changes] [226877] branches/safari-605-branch/Source/WebKit

[jmarcell]

Title: [226877] branches/safari-605-branch/Source/WebKit








Revision 226877
Author jmarc...@apple.com
Date 2018-01-11 22:31:22 -0800 (Thu, 11 Jan 2018)


Log Message
Cherry-pick r226826. rdar://problem/36458927

Modified Paths

branches/safari-605-branch/Source/WebKit/ChangeLog
branches/safari-605-branch/Source/WebKit/Platform/spi/ios/UIKitSPI.h
branches/safari-605-branch/Source/WebKit/UIProcess/ios/WKContentViewInteraction.h
branches/safari-605-branch/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm




Diff

Modified: branches/safari-605-branch/Source/WebKit/ChangeLog (226876 => 226877)

--- branches/safari-605-branch/Source/WebKit/ChangeLog	2018-01-12 06:31:19 UTC (rev 226876)
+++ branches/safari-605-branch/Source/WebKit/ChangeLog	2018-01-12 06:31:22 UTC (rev 226877)
@@ -1,5 +1,27 @@
 2018-01-11  Jason Marcell  
 
+Cherry-pick r226826. rdar://problem/36458927
+
+2018-01-11  Megan Gardner  
+
+Implement MultiDocument protocol for restoring focus to a WKWebView
+https://bugs.webkit.org/show_bug.cgi?id=181510
+
+Reviewed by Dan Bernstein.
+
+Support the UIKit protocol for restoring focus to a what previously had focus.
+WebKit already has a method to silently remove and replace focus, without telling the
+web process about the unfocus and refocusing, so we're just using that.
+
+* Platform/spi/ios/UIKitSPI.h:
+* UIProcess/ios/WKContentViewInteraction.h:
+* UIProcess/ios/WKContentViewInteraction.mm:
+(-[WKContentView _restoreFocusWithToken:]):
+(-[WKContentView _preserveFocusWithToken:destructively:]):
+
+
+2018-01-11  Jason Marcell  
+
 Cherry-pick r226753. rdar://problem/36429138
 
 2018-01-10  Wenson Hsieh  


Modified: branches/safari-605-branch/Source/WebKit/Platform/spi/ios/UIKitSPI.h (226876 => 226877)

--- branches/safari-605-branch/Source/WebKit/Platform/spi/ios/UIKitSPI.h	2018-01-12 06:31:19 UTC (rev 226876)
+++ branches/safari-605-branch/Source/WebKit/Platform/spi/ios/UIKitSPI.h	2018-01-12 06:31:22 UTC (rev 226877)
@@ -378,6 +378,12 @@
 @interface UITextInputTraits : NSObject 
 @end
 
+@protocol UITextInputMultiDocument 
+@optional
+- (void)_restoreFocusWithToken:(id )token completion:(void (^)(BOOL didRestore))completion;
+- (void)_preserveFocusWithToken:(id )token destructively:(BOOL)destructively;
+@end
+
 @interface UITextInteractionAssistant : NSObject
 @end
 


Modified: branches/safari-605-branch/Source/WebKit/UIProcess/ios/WKContentViewInteraction.h (226876 => 226877)

--- branches/safari-605-branch/Source/WebKit/UIProcess/ios/WKContentViewInteraction.h	2018-01-12 06:31:19 UTC (rev 226876)
+++ branches/safari-605-branch/Source/WebKit/UIProcess/ios/WKContentViewInteraction.h	2018-01-12 06:31:22 UTC (rev 226877)
@@ -242,7 +242,7 @@
 
 @end
 
-@interface WKContentView (WKInteraction)  226877)

--- branches/safari-605-branch/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm	2018-01-12 06:31:19 UTC (rev 226876)
+++ branches/safari-605-branch/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm	2018-01-12 06:31:22 UTC (rev 226877)
@@ -4073,6 +4073,18 @@
 _fileUploadPanel = nil;
 }
 
+#pragma mark - UITextInputMultiDocument
+
+- (void)_restoreFocusWithToken:(id )token
+{
+--_webView->_activeFocusedStateRetainCount;
+}
+
+- (void)_preserveFocusWithToken:(id )token destructively:(BOOL)destructively
+{
+++_webView->_activeFocusedStateRetainCount;
+}
+
 #pragma mark - Implementation of UIWebTouchEventsGestureRecognizerDelegate.
 
 // FIXME: Remove once -gestureRecognizer:shouldIgnoreWebTouchWithEvent: is in UIWebTouchEventsGestureRecognizer.h. Refer to  for more details.






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

[webkit-changes] [226873] branches/safari-605-branch/LayoutTests

[jmarcell]

Title: [226873] branches/safari-605-branch/LayoutTests








Revision 226873
Author jmarc...@apple.com
Date 2018-01-11 22:31:09 -0800 (Thu, 11 Jan 2018)


Log Message
Cherry-pick r226798. rdar://problem/36450812

Modified Paths

branches/safari-605-branch/LayoutTests/ChangeLog
branches/safari-605-branch/LayoutTests/media/event-queue-crash-expected.txt




Diff

Modified: branches/safari-605-branch/LayoutTests/ChangeLog (226872 => 226873)

--- branches/safari-605-branch/LayoutTests/ChangeLog	2018-01-12 06:31:07 UTC (rev 226872)
+++ branches/safari-605-branch/LayoutTests/ChangeLog	2018-01-12 06:31:09 UTC (rev 226873)
@@ -1,5 +1,17 @@
 2018-01-11  Jason Marcell  
 
+Cherry-pick r226798. rdar://problem/36450812
+
+2018-01-11  Matt Lewis  
+
+Rebaseline of media/event-queue-crash.html after r226785
+
+Unreviewed test gardening.
+
+* media/event-queue-crash-expected.txt:
+
+2018-01-11  Jason Marcell  
+
 Cherry-pick r226796. rdar://problem/36450730
 
 2018-01-11  Antoine Quint  


Modified: branches/safari-605-branch/LayoutTests/media/event-queue-crash-expected.txt (226872 => 226873)

--- branches/safari-605-branch/LayoutTests/media/event-queue-crash-expected.txt	2018-01-12 06:31:07 UTC (rev 226872)
+++ branches/safari-605-branch/LayoutTests/media/event-queue-crash-expected.txt	2018-01-12 06:31:09 UTC (rev 226873)
@@ -1,4 +1,3 @@
-CONSOLE MESSAGE: line 34: SyntaxError: Unexpected token '}'. Expected '(' to start an 'if' condition.
 When an element containing video is removed, WebKit should not crash.
 
 PASS. WebKit didn't crash.






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

[webkit-changes] [226874] branches/safari-605-branch

[jmarcell]

Title: [226874] branches/safari-605-branch








Revision 226874
Author jmarc...@apple.com
Date 2018-01-11 22:31:13 -0800 (Thu, 11 Jan 2018)


Log Message
Cherry-pick r226804. rdar://problem/36450810

Modified Paths

branches/safari-605-branch/LayoutTests/ChangeLog
branches/safari-605-branch/LayoutTests/platform/mac-wk1/TestExpectations
branches/safari-605-branch/Source/WebCore/ChangeLog
branches/safari-605-branch/Source/WebCore/Modules/mediastream/RTCController.cpp
branches/safari-605-branch/Source/WebCore/Modules/mediastream/RTCController.h
branches/safari-605-branch/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp
branches/safari-605-branch/Source/WebCore/Modules/mediastream/UserMediaRequest.cpp
branches/safari-605-branch/Source/WebCore/page/Page.cpp
branches/safari-605-branch/Source/WebCore/testing/Internals.cpp


Added Paths

branches/safari-605-branch/LayoutTests/http/wpt/webrtc/
branches/safari-605-branch/LayoutTests/http/wpt/webrtc/resources/
branches/safari-605-branch/LayoutTests/http/wpt/webrtc/resources/third-party-frame-ice-candidate-filtering-iframe.html
branches/safari-605-branch/LayoutTests/http/wpt/webrtc/third-party-frame-ice-candidate-filtering-expected.txt
branches/safari-605-branch/LayoutTests/http/wpt/webrtc/third-party-frame-ice-candidate-filtering.html




Diff

Modified: branches/safari-605-branch/LayoutTests/ChangeLog (226873 => 226874)

--- branches/safari-605-branch/LayoutTests/ChangeLog	2018-01-12 06:31:09 UTC (rev 226873)
+++ branches/safari-605-branch/LayoutTests/ChangeLog	2018-01-12 06:31:13 UTC (rev 226874)
@@ -1,5 +1,20 @@
 2018-01-11  Jason Marcell  
 
+Cherry-pick r226804. rdar://problem/36450810
+
+2018-01-11  Youenn Fablet  
+
+RTCController should disable ICE candidate filtering in case of getUserMedia based on the RTCPerrConnection origin
+https://bugs.webkit.org/show_bug.cgi?id=180851
+
+Reviewed by Eric Carlson.
+
+* http/wpt/webrtc/resources/third-party-frame-ice-candidate-filtering-iframe.html: Added.
+* http/wpt/webrtc/third-party-frame-ice-candidate-filtering-expected.txt: Added.
+* http/wpt/webrtc/third-party-frame-ice-candidate-filtering.html: Added.
+
+2018-01-11  Jason Marcell  
+
 Cherry-pick r226798. rdar://problem/36450812
 
 2018-01-11  Matt Lewis  


Added: branches/safari-605-branch/LayoutTests/http/wpt/webrtc/resources/third-party-frame-ice-candidate-filtering-iframe.html (0 => 226874)

--- branches/safari-605-branch/LayoutTests/http/wpt/webrtc/resources/third-party-frame-ice-candidate-filtering-iframe.html	(rev 0)
+++ branches/safari-605-branch/LayoutTests/http/wpt/webrtc/resources/third-party-frame-ice-candidate-filtering-iframe.html	2018-01-12 06:31:13 UTC (rev 226874)
@@ -0,0 +1,40 @@
+
+
+function isFilteringEnabled()
+{
+var pc = new RTCPeerConnection();
+pc.createDataChannel("");
+
+var candidates = [];
+return new Promise((resolve, reject) => {
+pc._onicecandidate_ = (event) => {
+if (event.candidate === null) {
+resolve(!candidates.length);
+return;
+}
+candidates.push(event.candidate.candidate);
+};
+pc.createOffer().then((offer) => {
+pc.setLocalDescription(offer);
+});
+});
+}
+
+async function doGetUserMedia() {
+var result = await navigator.mediaDevices.getUserMedia({video:true});
+return true;
+}
+
+window._onmessage_ = async (event) => {
+if (event.data ="" "checkFiltering") {
+event.source.postMessage(await isFilteringEnabled(), event.origin);
+return;
+}
+if (event.data ="" "capture") {
+event.source.postMessage(await doGetUserMedia(), event.origin);
+return;
+}
+event.source.postMessage("unknown message", event.origin);
+}
+
+


Added: branches/safari-605-branch/LayoutTests/http/wpt/webrtc/third-party-frame-ice-candidate-filtering-expected.txt (0 => 226874)

--- branches/safari-605-branch/LayoutTests/http/wpt/webrtc/third-party-frame-ice-candidate-filtering-expected.txt	(rev 0)
+++ branches/safari-605-branch/LayoutTests/http/wpt/webrtc/third-party-frame-ice-candidate-filtering-expected.txt	2018-01-12 06:31:13 UTC (rev 226874)
@@ -0,0 +1,8 @@
+  
+
+PASS Setup test 
+PASS getUserMedia on third party iframe and check same frame filtering 
+PASS Check same origin filtering as top frame 
+PASS Check same origin filtering as capturing frame 
+PASS Check filtering of frame with different origin as top and capturing frame origins 
+


Added: branches/safari-605-branch/LayoutTests/http/wpt/webrtc/third-party-frame-ice-candidate-filtering.html (0 => 226874)

--- branches/safari-605-branch/LayoutTests/http/wpt/webrtc/third-party-frame-ice-candidate-filtering.html	(rev 0)
+++ 

[webkit-changes] [226870] branches/safari-605-branch

[jmarcell]

Title: [226870] branches/safari-605-branch








Revision 226870
Author jmarc...@apple.com
Date 2018-01-11 22:31:00 -0800 (Thu, 11 Jan 2018)


Log Message
Cherry-pick r226791. rdar://problem/36450803

Modified Paths

branches/safari-605-branch/LayoutTests/ChangeLog
branches/safari-605-branch/LayoutTests/fast/visual-viewport/client-coordinates-relative-to-layout-viewport-expected.txt
branches/safari-605-branch/LayoutTests/fast/visual-viewport/client-rects-relative-to-layout-viewport-expected.txt
branches/safari-605-branch/LayoutTests/fast/visual-viewport/client-rects-relative-to-layout-viewport-zoomed.html
branches/safari-605-branch/LayoutTests/fast/visual-viewport/zoomed-fixed-expected.txt
branches/safari-605-branch/LayoutTests/fast/visual-viewport/zoomed-fixed-header-and-footer-expected.txt
branches/safari-605-branch/LayoutTests/fast/zooming/client-rect-in-fixed-zoomed-expected.txt
branches/safari-605-branch/LayoutTests/fast/zooming/client-rect-in-fixed-zoomed.html
branches/safari-605-branch/Source/WebCore/ChangeLog
branches/safari-605-branch/Source/WebCore/page/FrameView.cpp




Diff

Modified: branches/safari-605-branch/LayoutTests/ChangeLog (226869 => 226870)

--- branches/safari-605-branch/LayoutTests/ChangeLog	2018-01-12 06:30:57 UTC (rev 226869)
+++ branches/safari-605-branch/LayoutTests/ChangeLog	2018-01-12 06:31:00 UTC (rev 226870)
@@ -1,5 +1,27 @@
 2018-01-11  Jason Marcell  
 
+Cherry-pick r226791. rdar://problem/36450803
+
+2018-01-10  Simon Fraser  
+
+On macOS, getBoundingClientRect gives incorrect values when pinch-zoomed
+https://bugs.webkit.org/show_bug.cgi?id=181511
+rdar://problem/33741427
+
+Reviewed by Zalan Bujtas.
+
+New results in tests that get client coordinates after zooming.
+
+* fast/visual-viewport/client-coordinates-relative-to-layout-viewport-expected.txt:
+* fast/visual-viewport/client-rects-relative-to-layout-viewport-expected.txt:
+* fast/visual-viewport/client-rects-relative-to-layout-viewport-zoomed.html:
+* fast/visual-viewport/zoomed-fixed-expected.txt:
+* fast/visual-viewport/zoomed-fixed-header-and-footer-expected.txt:
+* fast/zooming/client-rect-in-fixed-zoomed-expected.txt:
+* fast/zooming/client-rect-in-fixed-zoomed.html: Change the test to create passing results.
+
+2018-01-11  Jason Marcell  
+
 Cherry-pick r226766. rdar://problem/36459143
 
 2018-01-10  Andy Estes  


Modified: branches/safari-605-branch/LayoutTests/fast/visual-viewport/client-coordinates-relative-to-layout-viewport-expected.txt (226869 => 226870)

--- branches/safari-605-branch/LayoutTests/fast/visual-viewport/client-coordinates-relative-to-layout-viewport-expected.txt	2018-01-12 06:30:57 UTC (rev 226869)
+++ branches/safari-605-branch/LayoutTests/fast/visual-viewport/client-coordinates-relative-to-layout-viewport-expected.txt	2018-01-12 06:31:00 UTC (rev 226870)
@@ -6,16 +6,16 @@
   RenderBlock {P} at (0,0) size 2000x18
 RenderText {#text} at (0,0) size 79x18
   text run at (0,0) width 79: "Got click at "
-RenderInline {SPAN} at (0,0) size 104x18
-  RenderText {#text} at (78,0) size 104x18
-text run at (78,0) width 104: "clicked at 52, -6"
-layer at (38,-20) size 28x28 backgroundClip at (0,0) size 2008x3024 clip at (0,0) size 2008x3024
-  RenderBlock (positioned) {DIV} at (38,-20) size 28x28 [bgcolor=#FF]
+RenderInline {SPAN} at (0,0) size 122x18
+  RenderText {#text} at (78,0) size 122x18
+text run at (78,0) width 122: "clicked at 172, 117"
+layer at (158,103) size 28x28
+  RenderBlock (positioned) {DIV} at (158,103) size 28x28 [bgcolor=#FF]
 layer at (280,228) size 25x25
   RenderBlock (positioned) {DIV} at (279,227) size 26x26 [bgcolor=#008000]
 layer at (281,229) size 22x22
   RenderBlock (positioned) {DIV} at (281,229) size 22x22 [bgcolor=#FFA500]
-layer at (44,-14) size 16x16 backgroundClip at (0,0) size 2008x3024 clip at (0,0) size 2008x3024
-  RenderBlock (positioned) {DIV} at (44,-14) size 16x16 [bgcolor=#FF]
+layer at (164,109) size 16x16
+  RenderBlock (positioned) {DIV} at (164,109) size 16x16 [bgcolor=#FF]
 caret: position 12 of child 0 {#text} of child 9 {P} of body
 scrolled to 120,123


Modified: branches/safari-605-branch/LayoutTests/fast/visual-viewport/client-rects-relative-to-layout-viewport-expected.txt (226869 => 226870)

--- branches/safari-605-branch/LayoutTests/fast/visual-viewport/client-rects-relative-to-layout-viewport-expected.txt	2018-01-12 06:30:57 UTC (rev 226869)
+++ branches/safari-605-branch/LayoutTests/fast/visual-viewport/client-rects-relative-to-layout-viewport-expected.txt	2018-01-12 06:31:00 UTC (rev 226870)
@@ -13,26 +13,26 @@
 Scrolled to 476, 526
 layoutViewport: 83.5, 233.5 - 785 x 585
 visualViewportRect: 

[webkit-changes] [226875] branches/safari-605-branch

[jmarcell]

Title: [226875] branches/safari-605-branch








Revision 226875
Author jmarc...@apple.com
Date 2018-01-11 22:31:16 -0800 (Thu, 11 Jan 2018)


Log Message
Cherry-pick r226811. rdar://problem/36458907

Modified Paths

branches/safari-605-branch/JSTests/ChangeLog
branches/safari-605-branch/Source/_javascript_Core/ChangeLog
branches/safari-605-branch/Source/_javascript_Core/bytecode/InlineCallFrame.h
branches/safari-605-branch/Source/_javascript_Core/dfg/DFGByteCodeParser.cpp


Added Paths

branches/safari-605-branch/JSTests/stress/proper-flushing-when-we-insert-unreachable-after-force-exit-in-bytecode-parser.js




Diff

Modified: branches/safari-605-branch/JSTests/ChangeLog (226874 => 226875)

--- branches/safari-605-branch/JSTests/ChangeLog	2018-01-12 06:31:13 UTC (rev 226874)
+++ branches/safari-605-branch/JSTests/ChangeLog	2018-01-12 06:31:16 UTC (rev 226875)
@@ -1,5 +1,19 @@
 2018-01-11  Jason Marcell  
 
+Cherry-pick r226811. rdar://problem/36458907
+
+2018-01-11  Saam Barati  
+
+When inserting Unreachable in byte code parser we need to flush all the right things
+https://bugs.webkit.org/show_bug.cgi?id=181509
+
+
+Reviewed by Mark Lam.
+
+* stress/proper-flushing-when-we-insert-unreachable-after-force-exit-in-bytecode-parser.js: Added.
+
+2018-01-11  Jason Marcell  
+
 Cherry-pick r226767. rdar://problem/36450818
 
 2018-01-11  Saam Barati  


Added: branches/safari-605-branch/JSTests/stress/proper-flushing-when-we-insert-unreachable-after-force-exit-in-bytecode-parser.js (0 => 226875)

--- branches/safari-605-branch/JSTests/stress/proper-flushing-when-we-insert-unreachable-after-force-exit-in-bytecode-parser.js	(rev 0)
+++ branches/safari-605-branch/JSTests/stress/proper-flushing-when-we-insert-unreachable-after-force-exit-in-bytecode-parser.js	2018-01-12 06:31:16 UTC (rev 226875)
@@ -0,0 +1,27 @@
+function test(b, f) {
+if (b)
+return f(b);
+}
+noInline(test);
+
+function throwError(b) {
+if (b) {
+try {
+throw new Error;
+} catch(e) { }
+}
+return 2;
+}
+noInline(throwError);
+
+function makeFoo() {
+return function foo(b) {
+throwError(b);
+OSRExit();
+}
+}
+
+let foos = [makeFoo(), makeFoo()];
+for (let i = 0; i < 1; ++i) {
+test(!!(i%2), foos[((Math.random() * 100) | 0) % foos.length]);
+}


Modified: branches/safari-605-branch/Source/_javascript_Core/ChangeLog (226874 => 226875)

--- branches/safari-605-branch/Source/_javascript_Core/ChangeLog	2018-01-12 06:31:13 UTC (rev 226874)
+++ branches/safari-605-branch/Source/_javascript_Core/ChangeLog	2018-01-12 06:31:16 UTC (rev 226875)
@@ -1,5 +1,35 @@
 2018-01-11  Jason Marcell  
 
+Cherry-pick r226811. rdar://problem/36458907
+
+2018-01-11  Saam Barati  
+
+When inserting Unreachable in byte code parser we need to flush all the right things
+https://bugs.webkit.org/show_bug.cgi?id=181509
+
+
+Reviewed by Mark Lam.
+
+I added code in r226655 that had its own mechanism for preserving liveness when
+inserting Unreachable nodes after ForceOSRExit. There are two ways to preserve
+liveness: PhantomLocal and Flush. Certain values *must* be flushed to the stack.
+I got some of these values wrong, which was leading to a crash when recovering the
+callee value from an inlined frame. Instead of making the same mistake and repeating
+similar code again, this patch refactors this logic to be shared with the other
+liveness preservation code in the DFG bytecode parser. This is what I should have
+done in my initial patch.
+
+* bytecode/InlineCallFrame.h:
+(JSC::remapOperand):
+* dfg/DFGByteCodeParser.cpp:
+(JSC::DFG::flushImpl):
+(JSC::DFG::flushForTerminalImpl):
+(JSC::DFG::ByteCodeParser::flush):
+(JSC::DFG::ByteCodeParser::flushForTerminal):
+(JSC::DFG::ByteCodeParser::parse):
+
+2018-01-11  Jason Marcell  
+
 Cherry-pick r226788. rdar://problem/36450828
 
 2018-01-11  Michael Saboff  


Modified: branches/safari-605-branch/Source/_javascript_Core/bytecode/InlineCallFrame.h (226874 => 226875)

--- branches/safari-605-branch/Source/_javascript_Core/bytecode/InlineCallFrame.h	2018-01-12 06:31:13 UTC (rev 226874)
+++ branches/safari-605-branch/Source/_javascript_Core/bytecode/InlineCallFrame.h	2018-01-12 06:31:16 UTC (rev 226875)
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2015 Apple Inc. All rights reserved.
+ * Copyright (C) 2011-2018 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, 

[webkit-changes] [226872] branches/safari-605-branch

[jmarcell]

Title: [226872] branches/safari-605-branch








Revision 226872
Author jmarc...@apple.com
Date 2018-01-11 22:31:07 -0800 (Thu, 11 Jan 2018)


Log Message
Cherry-pick r226796. rdar://problem/36450730

Modified Paths

branches/safari-605-branch/LayoutTests/ChangeLog
branches/safari-605-branch/Source/WebCore/ChangeLog
branches/safari-605-branch/Source/WebCore/Modules/modern-media-controls/controls/media-controls.js
branches/safari-605-branch/Source/WebCore/Modules/modern-media-controls/media/airplay-support.js
branches/safari-605-branch/Source/WebCore/Modules/modern-media-controls/media/media-controller-support.js
branches/safari-605-branch/Source/WebCore/Modules/modern-media-controls/media/media-controller.js


Added Paths

branches/safari-605-branch/LayoutTests/media/modern-media-controls/airplay-support/airplay-support-disable-event-listeners-with-hidden-controls-expected.txt
branches/safari-605-branch/LayoutTests/media/modern-media-controls/airplay-support/airplay-support-disable-event-listeners-with-hidden-controls.html




Diff

Modified: branches/safari-605-branch/LayoutTests/ChangeLog (226871 => 226872)

--- branches/safari-605-branch/LayoutTests/ChangeLog	2018-01-12 06:31:03 UTC (rev 226871)
+++ branches/safari-605-branch/LayoutTests/ChangeLog	2018-01-12 06:31:07 UTC (rev 226872)
@@ -1,5 +1,24 @@
 2018-01-11  Jason Marcell  
 
+Cherry-pick r226796. rdar://problem/36450730
+
+2018-01-11  Antoine Quint  
+
+Only listen to webkitplaybacktargetavailabilitychanged when media controls are visible to the user
+https://bugs.webkit.org/show_bug.cgi?id=181547
+
+
+Reviewed by Eric Carlson.
+
+Add a test that checks that enabling AirPlay routes when the controls are not visible to the user
+does not incur any change, and that making the controls visible again shows the controls in the
+expected state.
+
+* media/modern-media-controls/airplay-support/airplay-support-disable-event-listeners-with-hidden-controls-expected.txt: Added.
+* media/modern-media-controls/airplay-support/airplay-support-disable-event-listeners-with-hidden-controls.html: Added.
+
+2018-01-11  Jason Marcell  
+
 Cherry-pick r226795. rdar://problem/36450750
 
 2018-01-11  Antoine Quint  


Added: branches/safari-605-branch/LayoutTests/media/modern-media-controls/airplay-support/airplay-support-disable-event-listeners-with-hidden-controls-expected.txt (0 => 226872)

--- branches/safari-605-branch/LayoutTests/media/modern-media-controls/airplay-support/airplay-support-disable-event-listeners-with-hidden-controls-expected.txt	(rev 0)
+++ branches/safari-605-branch/LayoutTests/media/modern-media-controls/airplay-support/airplay-support-disable-event-listeners-with-hidden-controls-expected.txt	2018-01-12 06:31:07 UTC (rev 226872)
@@ -0,0 +1,28 @@
+Testing AirPlaySupport stops listening to webkitplaybacktargetavailabilitychanged events when the controls are not visible to the user.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+Starting test.
+PASS controls.visible is true
+PASS controls.faded is false
+
+Now we wait for the controls to fade after a period of inactivity.
+PASS controls.faded became true
+
+Before turning AirPlay routes on, we check the AirPlay control state.
+PASS controls.airplayButton.enabled is false
+
+Making AirPlay routes available.
+PASS controls.airplayButton.enabled is false
+
+We pause the media so that controls can show again.
+
+Media paused, the AirPlay button should be enabled now that controls are visible.
+PASS controls.faded is false
+PASS controls.airplayButton.enabled became true
+
+PASS successfullyParsed is true
+
+TEST COMPLETE
+


Added: branches/safari-605-branch/LayoutTests/media/modern-media-controls/airplay-support/airplay-support-disable-event-listeners-with-hidden-controls.html (0 => 226872)

--- branches/safari-605-branch/LayoutTests/media/modern-media-controls/airplay-support/airplay-support-disable-event-listeners-with-hidden-controls.html	(rev 0)
+++ branches/safari-605-branch/LayoutTests/media/modern-media-controls/airplay-support/airplay-support-disable-event-listeners-with-hidden-controls.html	2018-01-12 06:31:07 UTC (rev 226872)
@@ -0,0 +1,88 @@
+
+
+
+
+
+
+window.jsTestIsAsync = true;
+
+description("Testing AirPlaySupport stops listening to webkitplaybacktargetavailabilitychanged events when the controls are not visible to the user.");
+
+const container = document.querySelector("div#host");
+const media = document.querySelector("video");
+const mediaController = createControls(container, media, null);
+const controls = mediaController.controls;
+
+controls.autoHideController.autoHideDelay = 100;
+
+media.addEventListener("canplay", startTest);
+
+function startTest()
+{
+

[webkit-changes] [226869] branches/safari-605-branch/Source/JavaScriptCore

[jmarcell]

Title: [226869] branches/safari-605-branch/Source/_javascript_Core








Revision 226869
Author jmarc...@apple.com
Date 2018-01-11 22:30:57 -0800 (Thu, 11 Jan 2018)


Log Message
Cherry-pick r226788. rdar://problem/36450828

Modified Paths

branches/safari-605-branch/Source/_javascript_Core/ChangeLog
branches/safari-605-branch/Source/_javascript_Core/assembler/MacroAssemblerARM64.h




Diff

Modified: branches/safari-605-branch/Source/_javascript_Core/ChangeLog (226868 => 226869)

--- branches/safari-605-branch/Source/_javascript_Core/ChangeLog	2018-01-12 06:30:55 UTC (rev 226868)
+++ branches/safari-605-branch/Source/_javascript_Core/ChangeLog	2018-01-12 06:30:57 UTC (rev 226869)
@@ -1,5 +1,22 @@
 2018-01-11  Jason Marcell  
 
+Cherry-pick r226788. rdar://problem/36450828
+
+2018-01-11  Michael Saboff  
+
+Ensure there are no unsafe uses of MacroAssemblerARM64::dataTempRegister
+https://bugs.webkit.org/show_bug.cgi?id=181512
+
+Reviewed by Saam Barati.
+
+* assembler/MacroAssemblerARM64.h:
+(JSC::MacroAssemblerARM64::abortWithReason):
+(JSC::MacroAssemblerARM64::pushToSaveImmediateWithoutTouchingRegisters):
+All current uses of dataTempRegister in these functions are safe, but it makes sense to
+fix them in case they might be used elsewhere.
+
+2018-01-11  Jason Marcell  
+
 Cherry-pick r226778. rdar://problem/36450800
 
 2018-01-11  Michael Saboff  


Modified: branches/safari-605-branch/Source/_javascript_Core/assembler/MacroAssemblerARM64.h (226868 => 226869)

--- branches/safari-605-branch/Source/_javascript_Core/assembler/MacroAssemblerARM64.h	2018-01-12 06:30:55 UTC (rev 226868)
+++ branches/safari-605-branch/Source/_javascript_Core/assembler/MacroAssemblerARM64.h	2018-01-12 06:30:57 UTC (rev 226869)
@@ -1105,13 +1105,13 @@
 
 void abortWithReason(AbortReason reason)
 {
-move(TrustedImm32(reason), dataTempRegister);
+move(TrustedImm32(reason), getCachedDataTempRegisterIDAndInvalidate());
 breakpoint();
 }
 
 void abortWithReason(AbortReason reason, intptr_t misc)
 {
-move(TrustedImm64(misc), memoryTempRegister);
+move(TrustedImm64(misc), getCachedMemoryTempRegisterIDAndInvalidate());
 abortWithReason(reason);
 }
 
@@ -2201,7 +2201,7 @@
 
 void pushToSaveImmediateWithoutTouchingRegisters(TrustedImm32 imm)
 {
-RegisterID reg = dataTempRegister;
+RegisterID reg = getCachedDataTempRegisterIDAndInvalidate();
 pushPair(reg, reg);
 move(imm, reg);
 store64(reg, stackPointerRegister);






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

[webkit-changes] [226863] branches/safari-605-branch/Source/JavaScriptCore

[jmarcell]

Title: [226863] branches/safari-605-branch/Source/_javascript_Core








Revision 226863
Author jmarc...@apple.com
Date 2018-01-11 22:30:35 -0800 (Thu, 11 Jan 2018)


Log Message
Cherry-pick r226655. rdar://problem/36450822

Modified Paths

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




Diff

Modified: branches/safari-605-branch/Source/_javascript_Core/ChangeLog (226862 => 226863)

--- branches/safari-605-branch/Source/_javascript_Core/ChangeLog	2018-01-12 05:29:01 UTC (rev 226862)
+++ branches/safari-605-branch/Source/_javascript_Core/ChangeLog	2018-01-12 06:30:35 UTC (rev 226863)
@@ -1,5 +1,44 @@
 2018-01-11  Jason Marcell  
 
+Cherry-pick r226655. rdar://problem/36450822
+
+2018-01-09  Saam Barati  
+
+Reduce graph size by replacing terminal nodes in blocks that have a ForceOSRExit with Unreachable
+https://bugs.webkit.org/show_bug.cgi?id=181409
+
+Reviewed by Keith Miller.
+
+When I was looking at profiler data for Speedometer, I noticed that one of
+the hottest functions in Speedometer is around 1100 bytecode operations long.
+Only about 100 of those bytecode ops ever execute. However, we ended up
+spending a lot of time compiling basic blocks that never executed. We often
+plant ForceOSRExit nodes when we parse bytecodes that have a null value profile.
+This is the case when such a node never executes.
+
+This patch makes it so that anytime a block has a ForceOSRExit, we replace its
+terminal node with an Unreachable node (and remove all nodes after the
+ForceOSRExit). This will cut down on graph size when such a block dominates
+other blocks in the CFG. This allows us to get rid of huge chunks of the CFG
+in certain programs. When doing this transformation, we also insert
+Flushes/PhantomLocals to ensure we can recover values that are bytecode
+live-in to the ForceOSRExit.
+
+Using ForceOSRExit as the signal for this is a bit of a hack. It definitely
+does not get rid of all the CFG that it could. If we decide it's worth
+it, we could use additional inputs into this mechanism. For example, we could
+profile if a basic block ever executes inside the LLInt/Baseline, and
+remove parts of the CFG based on that.
+
+When running Speedometer with the concurrent JIT turned off, this patch
+improves DFG/FTL compile times by around 5%.
+
+* dfg/DFGByteCodeParser.cpp:
+(JSC::DFG::ByteCodeParser::addToGraph):
+(JSC::DFG::ByteCodeParser::parse):
+
+2018-01-11  Jason Marcell  
+
 Cherry-pick r226650. rdar://problem/36429150
 
 2018-01-09  Mark Lam  


Modified: branches/safari-605-branch/Source/_javascript_Core/dfg/DFGByteCodeParser.cpp (226862 => 226863)

--- branches/safari-605-branch/Source/_javascript_Core/dfg/DFGByteCodeParser.cpp	2018-01-12 05:29:01 UTC (rev 226862)
+++ branches/safari-605-branch/Source/_javascript_Core/dfg/DFGByteCodeParser.cpp	2018-01-12 06:30:35 UTC (rev 226863)
@@ -694,7 +694,10 @@
 
 Node* addToGraph(Node* node)
 {
+m_hasAnyForceOSRExits |= (node->op() == ForceOSRExit);
+
 VERBOSE_LOG("appended ", node, " ", Graph::opName(node->op()), "\n");
+
 m_currentBlock->append(node);
 if (clobbersExitState(m_graph, node))
 m_exitOK = false;
@@ -1141,6 +1144,7 @@
 
 Instruction* m_currentInstruction;
 bool m_hasDebuggerEnabled;
+bool m_hasAnyForceOSRExits { false };
 };
 
 BasicBlock* ByteCodeParser::allocateTargetableBlock(unsigned bytecodeIndex)
@@ -6559,6 +6563,67 @@
 parseCodeBlock();
 linkBlocks(inlineStackEntry.m_unlinkedBlocks, inlineStackEntry.m_blockLinkingTargets);
 
+if (m_hasAnyForceOSRExits) {
+InsertionSet insertionSet(m_graph);
+Operands mapping(OperandsLike, m_graph.block(0)->variablesAtHead);
+
+for (BasicBlock* block : m_graph.blocksInNaturalOrder()) {
+mapping.fill(nullptr);
+if (validationEnabled()) {
+// Verify that it's correct to fill mapping with nullptr.
+for (unsigned i = 0; i < block->variablesAtHead.size(); ++i) {
+Node* node = block->variablesAtHead.at(i);
+RELEASE_ASSERT(!node);
+}
+}
+
+for (unsigned nodeIndex = 0; nodeIndex < block->size(); ++nodeIndex) {
+Node* node = block->at(nodeIndex);
+
+if (node->hasVariableAccessData(m_graph))
+mapping.operand(node->local()) = node->variableAccessData();
+
+if (node->op() == 

[webkit-changes] [226871] branches/safari-605-branch

[jmarcell]

Title: [226871] branches/safari-605-branch








Revision 226871
Author jmarc...@apple.com
Date 2018-01-11 22:31:03 -0800 (Thu, 11 Jan 2018)


Log Message
Cherry-pick r226795. rdar://problem/36450750

Modified Paths

branches/safari-605-branch/LayoutTests/ChangeLog
branches/safari-605-branch/LayoutTests/media/modern-media-controls/media-controller/ios/media-controller-stop-updates-in-fullscreen-expected.txt
branches/safari-605-branch/LayoutTests/media/modern-media-controls/media-controller/ios/media-controller-stop-updates-in-fullscreen.html
branches/safari-605-branch/Source/WebCore/ChangeLog
branches/safari-605-branch/Source/WebCore/Modules/modern-media-controls/media/media-controller.js




Diff

Modified: branches/safari-605-branch/LayoutTests/ChangeLog (226870 => 226871)

--- branches/safari-605-branch/LayoutTests/ChangeLog	2018-01-12 06:31:00 UTC (rev 226870)
+++ branches/safari-605-branch/LayoutTests/ChangeLog	2018-01-12 06:31:03 UTC (rev 226871)
@@ -1,5 +1,22 @@
 2018-01-11  Jason Marcell  
 
+Cherry-pick r226795. rdar://problem/36450750
+
+2018-01-11  Antoine Quint  
+
+[iOS] There should be no controls markup generated in fullscreen
+https://bugs.webkit.org/show_bug.cgi?id=181540
+
+
+Reviewed by Eric Carlson.
+
+We update this test to simply check that we're removing all child nodes.
+
+* media/modern-media-controls/media-controller/ios/media-controller-stop-updates-in-fullscreen-expected.txt:
+* media/modern-media-controls/media-controller/ios/media-controller-stop-updates-in-fullscreen.html:
+
+2018-01-11  Jason Marcell  
+
 Cherry-pick r226791. rdar://problem/36450803
 
 2018-01-10  Simon Fraser  


Modified: branches/safari-605-branch/LayoutTests/media/modern-media-controls/media-controller/ios/media-controller-stop-updates-in-fullscreen-expected.txt (226870 => 226871)

--- branches/safari-605-branch/LayoutTests/media/modern-media-controls/media-controller/ios/media-controller-stop-updates-in-fullscreen-expected.txt	2018-01-12 06:31:00 UTC (rev 226870)
+++ branches/safari-605-branch/LayoutTests/media/modern-media-controls/media-controller/ios/media-controller-stop-updates-in-fullscreen-expected.txt	2018-01-12 06:31:03 UTC (rev 226871)
@@ -8,17 +8,12 @@
 
 Entering fullscreen.
 
-Obtained a webkitpresentationmodechanged event
-media.webkitDisplayingFullscreen = true.
+Entered fullscreen
 PASS media.paused is false
+PASS window.internals.shadowRoot(media).querySelector('.media-controls').childElementCount became 0
 
-Time progressed.
-PASS elapsedTimeWhenEnteringFullscreen === elapsedTime() is true
+Exited fullscreen
 
-Obtained a webkitpresentationmodechanged event
-media.webkitDisplayingFullscreen = false.
-PASS elapsedTimeWhenEnteringFullscreen === elapsedTime() became false
-
 PASS successfullyParsed is true
 
 TEST COMPLETE


Modified: branches/safari-605-branch/LayoutTests/media/modern-media-controls/media-controller/ios/media-controller-stop-updates-in-fullscreen.html (226870 => 226871)

--- branches/safari-605-branch/LayoutTests/media/modern-media-controls/media-controller/ios/media-controller-stop-updates-in-fullscreen.html	2018-01-12 06:31:00 UTC (rev 226870)
+++ branches/safari-605-branch/LayoutTests/media/modern-media-controls/media-controller/ios/media-controller-stop-updates-in-fullscreen.html	2018-01-12 06:31:03 UTC (rev 226871)
@@ -14,31 +14,21 @@
 button.textContent = "Enter Fullscreen";
 button.style = "position: absolute; left: 0; top: 0";
 
-let elapsedTimeWhenEnteringFullscreen;
-
 media.addEventListener("webkitpresentationmodechanged", () => {
-debug("");
-debug("Obtained a webkitpresentationmodechanged event");
-debug(`media.webkitDisplayingFullscreen = ${media.webkitDisplayingFullscreen}.`);
+if (media.webkitDisplayingFullscreen) {
+debug("");
+debug("Entered fullscreen");
 
-if (media.webkitDisplayingFullscreen) {
 shouldBeFalse("media.paused");
-elapsedTimeWhenEnteringFullscreen = elapsedTime();
-
-// Let time progress and check after a while that we didn't update the tree.
-let timeupdateEventCount = 0;
-media.addEventListener("timeupdate", () => {
-timeupdateEventCount++;
-if (timeupdateEventCount == 5) {
-debug("");
-debug("Time progressed.");
-shouldBeTrue("elapsedTimeWhenEnteringFullscreen === elapsedTime()");
-media.pause();
-media.webkitExitFullscreen();
-}
+shouldBecomeEqual("window.internals.shadowRoot(media).querySelector('.media-controls').childElementCount", "0", () => {
+media.pause();
+media.webkitExitFullscreen();
 });
-} else
-shouldBecomeEqual("elapsedTimeWhenEnteringFullscreen === elapsedTime()", "false", endTest);
+} 

[webkit-changes] [226867] branches/safari-605-branch/Source

[jmarcell]

Title: [226867] branches/safari-605-branch/Source








Revision 226867
Author jmarc...@apple.com
Date 2018-01-11 22:30:52 -0800 (Thu, 11 Jan 2018)


Log Message
Cherry-pick r226778. rdar://problem/36450800

Modified Paths

branches/safari-605-branch/Source/_javascript_Core/ChangeLog
branches/safari-605-branch/Source/_javascript_Core/runtime/Options.h
branches/safari-605-branch/Source/WebCore/CMakeLists.txt
branches/safari-605-branch/Source/WebCore/ChangeLog
branches/safari-605-branch/Source/WebCore/DerivedSources.make
branches/safari-605-branch/Source/WebCore/Sources.txt
branches/safari-605-branch/Source/WebCore/WebCore.xcodeproj/project.pbxproj
branches/safari-605-branch/Source/WebCore/bindings/js/WebCoreBuiltinNames.h
branches/safari-605-branch/Source/WebCore/page/RuntimeEnabledFeatures.cpp
branches/safari-605-branch/Source/WebCore/page/RuntimeEnabledFeatures.h


Added Paths

branches/safari-605-branch/Source/WebCore/dom/SpectreGadget.cpp
branches/safari-605-branch/Source/WebCore/dom/SpectreGadget.h
branches/safari-605-branch/Source/WebCore/dom/SpectreGadget.idl




Diff

Modified: branches/safari-605-branch/Source/_javascript_Core/ChangeLog (226866 => 226867)

--- branches/safari-605-branch/Source/_javascript_Core/ChangeLog	2018-01-12 06:30:48 UTC (rev 226866)
+++ branches/safari-605-branch/Source/_javascript_Core/ChangeLog	2018-01-12 06:30:52 UTC (rev 226867)
@@ -1,5 +1,18 @@
 2018-01-11  Jason Marcell  
 
+Cherry-pick r226778. rdar://problem/36450800
+
+2018-01-11  Michael Saboff  
+
+Add a DOM gadget for Spectre testing
+https://bugs.webkit.org/show_bug.cgi?id=181351
+
+Reviewed by Ryosuke Niwa.
+
+* runtime/Options.h:
+
+2018-01-11  Jason Marcell  
+
 Cherry-pick r226767. rdar://problem/36450818
 
 2018-01-11  Saam Barati  


Modified: branches/safari-605-branch/Source/_javascript_Core/runtime/Options.h (226866 => 226867)

--- branches/safari-605-branch/Source/_javascript_Core/runtime/Options.h	2018-01-12 06:30:48 UTC (rev 226866)
+++ branches/safari-605-branch/Source/_javascript_Core/runtime/Options.h	2018-01-12 06:30:52 UTC (rev 226867)
@@ -460,6 +460,8 @@
 \
 v(bool, enableSpectreMitigations, true, Restricted, "Enable Spectre mitigations.") \
 \
+v(bool, enableSpectreGadgets, false, Restricted, "enable gadgets to test Spectre mitigations.") \
+\
 v(bool, useAsyncIterator, enableAsyncIteration, Normal, "Allow to use Async Iterator in JS.") \
 \
 v(bool, failToCompileWebAssemblyCode, false, Normal, "If true, no Wasm::Plan will sucessfully compile a function.") \


Modified: branches/safari-605-branch/Source/WebCore/CMakeLists.txt (226866 => 226867)

--- branches/safari-605-branch/Source/WebCore/CMakeLists.txt	2018-01-12 06:30:48 UTC (rev 226866)
+++ branches/safari-605-branch/Source/WebCore/CMakeLists.txt	2018-01-12 06:30:52 UTC (rev 226867)
@@ -595,6 +595,7 @@
 dom/ShadowRoot.idl
 dom/ShadowRootMode.idl
 dom/Slotable.idl
+dom/SpectreGadget.idl
 dom/StaticRange.idl
 dom/StringCallback.idl
 dom/Text.idl


Modified: branches/safari-605-branch/Source/WebCore/ChangeLog (226866 => 226867)

--- branches/safari-605-branch/Source/WebCore/ChangeLog	2018-01-12 06:30:48 UTC (rev 226866)
+++ branches/safari-605-branch/Source/WebCore/ChangeLog	2018-01-12 06:30:52 UTC (rev 226867)
@@ -1,5 +1,39 @@
 2018-01-11  Jason Marcell  
 
+Cherry-pick r226778. rdar://problem/36450800
+
+2018-01-11  Michael Saboff  
+
+Add a DOM gadget for Spectre testing
+https://bugs.webkit.org/show_bug.cgi?id=181351
+
+Reviewed by Ryosuke Niwa.
+
+This change is used to test Spectre mitigations.
+
+Added a new DOM class to test for Spectre issues in the DOM layer.
+This additional functionality is disabled by default and must be enabled
+through the JSC option "enableSpectreGadgets".
+
+* CMakeLists.txt:
+* DerivedSources.make:
+* Sources.txt:
+* WebCore.xcodeproj/project.pbxproj:
+* bindings/js/WebCoreBuiltinNames.h:
+* dom/SpectreGadget.cpp: Added.
+(WebCore::SpectreGadget::SpectreGadget):
+(WebCore::SpectreGadget::create):
+(WebCore::SpectreGadget::setReadLength):
+(WebCore::SpectreGadget::charCodeAt):
+(WebCore::SpectreGadget::clflushReadLength):
+* dom/SpectreGadget.h: Added.
+* dom/SpectreGadget.idl: Added.
+* page/RuntimeEnabledFeatures.cpp:
+(WebCore::RuntimeEnabledFeatures::spectreGadgetsEnabled const):
+* page/RuntimeEnabledFeatures.h:
+
+2018-01-11  Jason Marcell  
+
 Cherry-pick r226766. rdar://problem/36459143
 
 2018-01-10  Andy Estes  

[webkit-changes] [226864] branches/safari-605-branch

[jmarcell]

Title: [226864] branches/safari-605-branch








Revision 226864
Author jmarc...@apple.com
Date 2018-01-11 22:30:38 -0800 (Thu, 11 Jan 2018)


Log Message
Cherry-pick r226758. rdar://problem/36450739

Modified Paths

branches/safari-605-branch/ChangeLog
branches/safari-605-branch/Source/cmake/OptionsWin.cmake




Diff

Modified: branches/safari-605-branch/ChangeLog (226863 => 226864)

--- branches/safari-605-branch/ChangeLog	2018-01-12 06:30:35 UTC (rev 226863)
+++ branches/safari-605-branch/ChangeLog	2018-01-12 06:30:38 UTC (rev 226864)
@@ -1,3 +1,18 @@
+2018-01-11  Jason Marcell  
+
+Cherry-pick r226758. rdar://problem/36450739
+
+2018-01-10  Per Arne Vollan  
+
+[Win] WebKitLegacy should be a dll, not a static library.
+https://bugs.webkit.org/show_bug.cgi?id=181500
+
+Reviewed by Alex Christensen.
+
+Set WebKitLegacy library type to shared.
+
+* Source/cmake/OptionsWin.cmake:
+
 2018-01-05  Fujii Hironori  
 
 REGRESSION(r226306)[Win][CMake] Unnecessary recompilations triggered by unconditionally copied header files of DerivedSources


Modified: branches/safari-605-branch/Source/cmake/OptionsWin.cmake (226863 => 226864)

--- branches/safari-605-branch/Source/cmake/OptionsWin.cmake	2018-01-12 06:30:35 UTC (rev 226863)
+++ branches/safari-605-branch/Source/cmake/OptionsWin.cmake	2018-01-12 06:30:38 UTC (rev 226864)
@@ -141,5 +141,7 @@
 set(PORT Win)
 set(_javascript_Core_LIBRARY_TYPE SHARED)
 set(WTF_LIBRARY_TYPE SHARED)
+set(PAL_LIBRARY_TYPE STATIC)
+set(WebKitLegacy_LIBRARY_TYPE SHARED)
 
 find_package(ICU REQUIRED)






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

[webkit-changes] [226868] branches/safari-605-branch/Source/WTF

[jmarcell]

Title: [226868] branches/safari-605-branch/Source/WTF








Revision 226868
Author jmarc...@apple.com
Date 2018-01-11 22:30:55 -0800 (Thu, 11 Jan 2018)


Log Message
Cherry-pick r226784. rdar://problem/36450746

Modified Paths

branches/safari-605-branch/Source/WTF/ChangeLog
branches/safari-605-branch/Source/WTF/wtf/FastTLS.h




Diff

Modified: branches/safari-605-branch/Source/WTF/ChangeLog (226867 => 226868)

--- branches/safari-605-branch/Source/WTF/ChangeLog	2018-01-12 06:30:52 UTC (rev 226867)
+++ branches/safari-605-branch/Source/WTF/ChangeLog	2018-01-12 06:30:55 UTC (rev 226868)
@@ -1,3 +1,25 @@
+2018-01-11  Jason Marcell  
+
+Cherry-pick r226784. rdar://problem/36450746
+
+2018-01-11  Filip Pizlo  
+
+Reserve a fast TLS key for GC TLC
+https://bugs.webkit.org/show_bug.cgi?id=181539
+
+Reviewed by Alexey Proskuryakov.
+
+Who knew that thread-local caches would be a mitigation for timing attacks. Here's how it
+works: if we have TLCs then we can "context switch" them when we "context switch" origins.
+This allows us to put some minimal distance between objects from different origins, which
+gives us the ability to allow small overflows when doing certain bounds checks without
+creating a useful Spectre information leak.
+
+So I think that means we have to implement thread-local caches (also known as thread-local
+allocation buffers, but I prefer the TLC terminology).
+
+* wtf/FastTLS.h:
+
 2018-01-09  Jason Marcell  
 
 Cherry-pick r226530. rdar://problem/36392325


Modified: branches/safari-605-branch/Source/WTF/wtf/FastTLS.h (226867 => 226868)

--- branches/safari-605-branch/Source/WTF/wtf/FastTLS.h	2018-01-12 06:30:52 UTC (rev 226867)
+++ branches/safari-605-branch/Source/WTF/wtf/FastTLS.h	2018-01-12 06:30:55 UTC (rev 226868)
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Apple Inc. All rights reserved.
+ * Copyright (C) 2017-2018 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -45,7 +45,8 @@
 
 #define WTF_THREAD_DATA_KEY WTF_FAST_TLS_KEY0
 #define WTF_WASM_CONTEXT_KEY WTF_FAST_TLS_KEY1
-#define WTF_TESTING_KEY WTF_FAST_TLS_KEY2
+#define WTF_TESTING_KEY WTF_WASM_CONTEXT_KEY // So far, this key is only used in places that don't do WebAssembly, so it's OK that they share the same key.
+#define WTF_GC_TLC_KEY WTF_FAST_TLS_KEY2
 
 #if ENABLE(FAST_TLS_JIT)
 inline unsigned fastTLSOffsetForKey(unsigned long slot)






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

[webkit-changes] [226861] branches/safari-605-branch/LayoutTests

[jmarcell]

Title: [226861] branches/safari-605-branch/LayoutTests








Revision 226861
Author jmarc...@apple.com
Date 2018-01-11 20:53:14 -0800 (Thu, 11 Jan 2018)


Log Message
Cherry-pick r226646. rdar://problem/36429142

Modified Paths

branches/safari-605-branch/LayoutTests/ChangeLog
branches/safari-605-branch/LayoutTests/imported/w3c/ChangeLog
branches/safari-605-branch/LayoutTests/imported/w3c/web-platform-tests/service-workers/service-worker/register-closed-window.https-expected.txt
branches/safari-605-branch/LayoutTests/imported/w3c/web-platform-tests/service-workers/service-worker/resources/register-closed-window-iframe.html
branches/safari-605-branch/LayoutTests/platform/ios-wk2/TestExpectations




Diff

Modified: branches/safari-605-branch/LayoutTests/ChangeLog (226860 => 226861)

--- branches/safari-605-branch/LayoutTests/ChangeLog	2018-01-12 04:53:11 UTC (rev 226860)
+++ branches/safari-605-branch/LayoutTests/ChangeLog	2018-01-12 04:53:14 UTC (rev 226861)
@@ -1,5 +1,19 @@
 2018-01-11  Jason Marcell  
 
+Cherry-pick r226646. rdar://problem/36429142
+
+2018-01-09  Youenn Fablet  
+
+[iOS Debug WK2] Layout Test imported/w3c/web-platform-tests/service-workers/service-worker/register-closed-window.https.html is flaky
+https://bugs.webkit.org/show_bug.cgi?id=181087
+
+
+Reviewed by Chris Dumez.
+
+* platform/ios-wk2/TestExpectations: Removed flaky expectation.
+
+2018-01-11  Jason Marcell  
+
 Cherry-pick r226755. rdar://problem/36429123
 
 2018-01-10  Matt Baker  


Modified: branches/safari-605-branch/LayoutTests/imported/w3c/ChangeLog (226860 => 226861)

--- branches/safari-605-branch/LayoutTests/imported/w3c/ChangeLog	2018-01-12 04:53:11 UTC (rev 226860)
+++ branches/safari-605-branch/LayoutTests/imported/w3c/ChangeLog	2018-01-12 04:53:14 UTC (rev 226861)
@@ -1,3 +1,20 @@
+2018-01-11  Jason Marcell  
+
+Cherry-pick r226646. rdar://problem/36429142
+
+2018-01-09  Youenn Fablet  
+
+[iOS Debug WK2] Layout Test imported/w3c/web-platform-tests/service-workers/service-worker/register-closed-window.https.html is flaky
+https://bugs.webkit.org/show_bug.cgi?id=181087
+
+
+Reviewed by Chris Dumez.
+
+Updated test to get a more deterministic output.
+
+* web-platform-tests/service-workers/service-worker/register-closed-window.https-expected.txt:
+* web-platform-tests/service-workers/service-worker/resources/register-closed-window-iframe.html:
+
 2018-01-09  Jason Marcell  
 
 Cherry-pick r226628. rdar://problem/36392341


Modified: branches/safari-605-branch/LayoutTests/imported/w3c/web-platform-tests/service-workers/service-worker/register-closed-window.https-expected.txt (226860 => 226861)

--- branches/safari-605-branch/LayoutTests/imported/w3c/web-platform-tests/service-workers/service-worker/register-closed-window.https-expected.txt	2018-01-12 04:53:11 UTC (rev 226860)
+++ branches/safari-605-branch/LayoutTests/imported/w3c/web-platform-tests/service-workers/service-worker/register-closed-window.https-expected.txt	2018-01-12 04:53:14 UTC (rev 226861)
@@ -1,4 +1,4 @@
-CONSOLE MESSAGE: Unhandled Promise Rejection: TypeError: serviceWorker.register() must be called with a valid relative script URL
+CONSOLE MESSAGE: line 11: Unhandled Promise Rejection: TypeError: serviceWorker.register() must be called with a valid relative script URL
 
 PASS Call register() on ServiceWorkerContainer owned by closed window. 
 


Modified: branches/safari-605-branch/LayoutTests/imported/w3c/web-platform-tests/service-workers/service-worker/resources/register-closed-window-iframe.html (226860 => 226861)

--- branches/safari-605-branch/LayoutTests/imported/w3c/web-platform-tests/service-workers/service-worker/resources/register-closed-window-iframe.html	2018-01-12 04:53:11 UTC (rev 226860)
+++ branches/safari-605-branch/LayoutTests/imported/w3c/web-platform-tests/service-workers/service-worker/resources/register-closed-window-iframe.html	2018-01-12 04:53:14 UTC (rev 226861)
@@ -1,14 +1,17 @@
 
 
 
-window.addEventListener('message', function(evt) {
+window.addEventListener('message', async function(evt) {
   if (evt.data ="" 'START') {
 var w = window.open('./');
 var sw = w.navigator.serviceWorker;
 w.close();
 w = null;
-sw.register('doesntmatter.js');
-parent.postMessage('OK', '*');
+try {
+  await sw.register('doesntmatter.js');
+} finally {
+  parent.postMessage('OK', '*');
+}
   }
 });
 


Modified: 

[webkit-changes] [226859] branches/safari-605-branch

[jmarcell]

Title: [226859] branches/safari-605-branch








Revision 226859
Author jmarc...@apple.com
Date 2018-01-11 20:53:08 -0800 (Thu, 11 Jan 2018)


Log Message
Cherry-pick r226753. rdar://problem/36429138

Modified Paths

branches/safari-605-branch/LayoutTests/ChangeLog
branches/safari-605-branch/Source/WebCore/ChangeLog
branches/safari-605-branch/Source/WebCore/rendering/InlineTextBox.cpp
branches/safari-605-branch/Source/WebKit/ChangeLog
branches/safari-605-branch/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp
branches/safari-605-branch/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundlePagePrivate.h
branches/safari-605-branch/Source/WebKit/WebProcess/WebPage/WebPage.cpp
branches/safari-605-branch/Source/WebKit/WebProcess/WebPage/WebPage.h
branches/safari-605-branch/Tools/ChangeLog
branches/safari-605-branch/Tools/DumpRenderTree/ios/TextInputControllerIOS.m
branches/safari-605-branch/Tools/DumpRenderTree/mac/TextInputControllerMac.m
branches/safari-605-branch/Tools/WebKitTestRunner/InjectedBundle/Bindings/TextInputController.idl
branches/safari-605-branch/Tools/WebKitTestRunner/InjectedBundle/TextInputController.cpp
branches/safari-605-branch/Tools/WebKitTestRunner/InjectedBundle/TextInputController.h


Added Paths

branches/safari-605-branch/LayoutTests/editing/marked-text-appearance-expected-mismatch.html
branches/safari-605-branch/LayoutTests/editing/marked-text-appearance.html




Diff

Modified: branches/safari-605-branch/LayoutTests/ChangeLog (226858 => 226859)

--- branches/safari-605-branch/LayoutTests/ChangeLog	2018-01-12 04:53:02 UTC (rev 226858)
+++ branches/safari-605-branch/LayoutTests/ChangeLog	2018-01-12 04:53:08 UTC (rev 226859)
@@ -1,5 +1,23 @@
 2018-01-11  Jason Marcell  
 
+Cherry-pick r226753. rdar://problem/36429138
+
+2018-01-10  Wenson Hsieh  
+
+REGRESSION(r222507): Composition highlight doesn't render when using IME
+https://bugs.webkit.org/show_bug.cgi?id=181485
+
+
+Reviewed by Ryosuke Niwa.
+
+Add a new layout test to ensure that in the absence of custom composition underlines, a marked composition
+string appears different once it is confirmed.
+
+* editing/marked-text-appearance-expected-mismatch.html: Added.
+* editing/marked-text-appearance.html: Added.
+
+2018-01-11  Jason Marcell  
+
 Cherry-pick r226750. rdar://problem/36429156
 
 2018-01-10  Tim Horton  


Added: branches/safari-605-branch/LayoutTests/editing/marked-text-appearance-expected-mismatch.html (0 => 226859)

--- branches/safari-605-branch/LayoutTests/editing/marked-text-appearance-expected-mismatch.html	(rev 0)
+++ branches/safari-605-branch/LayoutTests/editing/marked-text-appearance-expected-mismatch.html	2018-01-12 04:53:08 UTC (rev 226859)
@@ -0,0 +1,9 @@
+
+
+
+document.body.focus();
+if (window.textInputController) {
+textInputController.setMarkedText("^", 0, 5, true);
+textInputController.insertText("^");
+}
+


Added: branches/safari-605-branch/LayoutTests/editing/marked-text-appearance.html (0 => 226859)

--- branches/safari-605-branch/LayoutTests/editing/marked-text-appearance.html	(rev 0)
+++ branches/safari-605-branch/LayoutTests/editing/marked-text-appearance.html	2018-01-12 04:53:08 UTC (rev 226859)
@@ -0,0 +1,7 @@
+
+
+
+document.body.focus();
+if (window.textInputController)
+textInputController.setMarkedText("^", 0, 5, true);
+


Modified: branches/safari-605-branch/Source/WebCore/ChangeLog (226858 => 226859)

--- branches/safari-605-branch/Source/WebCore/ChangeLog	2018-01-12 04:53:02 UTC (rev 226858)
+++ branches/safari-605-branch/Source/WebCore/ChangeLog	2018-01-12 04:53:08 UTC (rev 226859)
@@ -1,5 +1,24 @@
 2018-01-11  Jason Marcell  
 
+Cherry-pick r226753. rdar://problem/36429138
+
+2018-01-10  Wenson Hsieh  
+
+REGRESSION(r222507): Composition highlight doesn't render when using IME
+https://bugs.webkit.org/show_bug.cgi?id=181485
+
+
+Reviewed by Ryosuke Niwa.
+
+Fixes the order of arguments passed to paintTextSubrangeBackground from paintCompositionBackground.
+
+Test: editing/marked-text-appearance.html
+
+* rendering/InlineTextBox.cpp:
+(WebCore::InlineTextBox::paintCompositionBackground):
+
+2018-01-11  Jason Marcell  
+
 Cherry-pick r226721. rdar://problem/36429159
 
 2018-01-10  Antti Koivisto  


Modified: branches/safari-605-branch/Source/WebCore/rendering/InlineTextBox.cpp (226858 => 226859)

--- branches/safari-605-branch/Source/WebCore/rendering/InlineTextBox.cpp	2018-01-12 04:53:02 UTC (rev 226858)
+++ 

[webkit-changes] [226854] branches/safari-605-branch

[jmarcell]

Title: [226854] branches/safari-605-branch








Revision 226854
Author jmarc...@apple.com
Date 2018-01-11 20:52:48 -0800 (Thu, 11 Jan 2018)


Log Message
Cherry-pick r226677. rdar://problem/36429157

Modified Paths

branches/safari-605-branch/LayoutTests/ChangeLog
branches/safari-605-branch/Source/WebCore/ChangeLog
branches/safari-605-branch/Source/WebCore/dom/Document.cpp
branches/safari-605-branch/Source/WebCore/history/PageCache.cpp
branches/safari-605-branch/Source/WebCore/page/DiagnosticLoggingKeys.cpp
branches/safari-605-branch/Source/WebCore/page/DiagnosticLoggingKeys.h


Added Paths

branches/safari-605-branch/LayoutTests/http/tests/workers/service/client-added-to-clients-when-restored-from-page-cache-expected.txt
branches/safari-605-branch/LayoutTests/http/tests/workers/service/client-added-to-clients-when-restored-from-page-cache.html
branches/safari-605-branch/LayoutTests/http/tests/workers/service/client-removed-from-clients-while-in-page-cache-expected.txt
branches/safari-605-branch/LayoutTests/http/tests/workers/service/client-removed-from-clients-while-in-page-cache.html
branches/safari-605-branch/LayoutTests/http/tests/workers/service/no-page-cache-when-controlled-expected.txt
branches/safari-605-branch/LayoutTests/http/tests/workers/service/no-page-cache-when-controlled.html
branches/safari-605-branch/LayoutTests/http/tests/workers/service/other_resources/
branches/safari-605-branch/LayoutTests/http/tests/workers/service/other_resources/test.html
branches/safari-605-branch/LayoutTests/http/tests/workers/service/resources/getClientCount-worker.js




Diff

Modified: branches/safari-605-branch/LayoutTests/ChangeLog (226853 => 226854)

--- branches/safari-605-branch/LayoutTests/ChangeLog	2018-01-12 04:52:42 UTC (rev 226853)
+++ branches/safari-605-branch/LayoutTests/ChangeLog	2018-01-12 04:52:48 UTC (rev 226854)
@@ -1,5 +1,29 @@
 2018-01-11  Jason Marcell  
 
+Cherry-pick r226677. rdar://problem/36429157
+
+2018-01-09  Chris Dumez  
+
+Make service workers behave correctly with regards to Page Cache
+https://bugs.webkit.org/show_bug.cgi?id=181446
+
+
+Reviewed by Youenn Fablet.
+
+Add layout test coverage.
+
+* http/tests/workers/service/client-added-to-clients-when-restored-from-page-cache-expected.txt: Added.
+* http/tests/workers/service/client-added-to-clients-when-restored-from-page-cache.html: Added.
+* http/tests/workers/service/client-removed-from-clients-while-in-page-cache-expected.txt: Added.
+* http/tests/workers/service/client-removed-from-clients-while-in-page-cache.html: Added.
+* http/tests/workers/service/no-page-cache-when-controlled-expected.txt: Added.
+* http/tests/workers/service/no-page-cache-when-controlled.html: Added.
+* http/tests/workers/service/other_resources/test.html: Added.
+* http/tests/workers/service/resources/getClientCount-worker.js: Added.
+(event.then):
+
+2018-01-11  Jason Marcell  
+
 Cherry-pick r226668. rdar://problem/36429139
 
 2018-01-09  Myles C. Maxfield  


Added: branches/safari-605-branch/LayoutTests/http/tests/workers/service/client-added-to-clients-when-restored-from-page-cache-expected.txt (0 => 226854)

--- branches/safari-605-branch/LayoutTests/http/tests/workers/service/client-added-to-clients-when-restored-from-page-cache-expected.txt	(rev 0)
+++ branches/safari-605-branch/LayoutTests/http/tests/workers/service/client-added-to-clients-when-restored-from-page-cache-expected.txt	2018-01-12 04:52:48 UTC (rev 226854)
@@ -0,0 +1,6 @@
+* Tests that a client is re-added to the list of service worker clients when it is restored from the page cache
+
+PASS: service worker has initially 2 clients
+PASS: page is about to enter page cache
+PASS: service worker now has 2 clients again after restoring the second one from page cache
+


Added: branches/safari-605-branch/LayoutTests/http/tests/workers/service/client-added-to-clients-when-restored-from-page-cache.html (0 => 226854)

--- branches/safari-605-branch/LayoutTests/http/tests/workers/service/client-added-to-clients-when-restored-from-page-cache.html	(rev 0)
+++ branches/safari-605-branch/LayoutTests/http/tests/workers/service/client-added-to-clients-when-restored-from-page-cache.html	2018-01-12 04:52:48 UTC (rev 226854)
@@ -0,0 +1,69 @@
+
+
+
+
+log("* Tests that a client is re-added to the list of service worker clients when it is restored from the page cache");
+log("");
+
+if (window.testRunner) {
+  testRunner.setCanOpenWindows();
+  testRunner.overridePreference("WebKitUsesPageCachePreferenceKey", 1);
+}
+
+navigator.serviceWorker.addEventListener("message", function(event) {
+  if (step == "BothClientsInitiallyActive") {
+if (event.data != 2) {
+  log("FAIL: 

[webkit-changes] [226846] branches/safari-605-branch/Source/WebCore

[jmarcell]

Title: [226846] branches/safari-605-branch/Source/WebCore








Revision 226846
Author jmarc...@apple.com
Date 2018-01-11 20:52:01 -0800 (Thu, 11 Jan 2018)


Log Message
Revert r226127. rdar://problem/36123315

Modified Paths

branches/safari-605-branch/Source/WebCore/ChangeLog
branches/safari-605-branch/Source/WebCore/Sources.txt
branches/safari-605-branch/Source/WebCore/WebCore.xcodeproj/project.pbxproj
branches/safari-605-branch/Source/WebCore/rendering/RenderTableRow.cpp
branches/safari-605-branch/Source/WebCore/rendering/updating/RenderTreeBuilder.cpp
branches/safari-605-branch/Source/WebCore/rendering/updating/RenderTreeBuilder.h


Removed Paths

branches/safari-605-branch/Source/WebCore/rendering/updating/RenderTreeBuilderTable.cpp
branches/safari-605-branch/Source/WebCore/rendering/updating/RenderTreeBuilderTable.h




Diff

Modified: branches/safari-605-branch/Source/WebCore/ChangeLog (226845 => 226846)

--- branches/safari-605-branch/Source/WebCore/ChangeLog	2018-01-12 04:51:58 UTC (rev 226845)
+++ branches/safari-605-branch/Source/WebCore/ChangeLog	2018-01-12 04:52:01 UTC (rev 226846)
@@ -1,5 +1,9 @@
 2018-01-11  Jason Marcell  
 
+Revert r226127. rdar://problem/36123315
+
+2018-01-11  Jason Marcell  
+
 Revert r226140. rdar://problem/36139222
 
 2018-01-11  Jason Marcell  


Modified: branches/safari-605-branch/Source/WebCore/Sources.txt (226845 => 226846)

--- branches/safari-605-branch/Source/WebCore/Sources.txt	2018-01-12 04:51:58 UTC (rev 226845)
+++ branches/safari-605-branch/Source/WebCore/Sources.txt	2018-01-12 04:52:01 UTC (rev 226846)
@@ -1984,7 +1984,6 @@
 rendering/svg/SVGTextQuery.cpp
 
 rendering/updating/RenderTreeBuilder.cpp
-rendering/updating/RenderTreeBuilderTable.cpp
 rendering/updating/RenderTreePosition.cpp
 rendering/updating/RenderTreeUpdater.cpp
 rendering/updating/RenderTreeUpdaterFirstLetter.cpp


Modified: branches/safari-605-branch/Source/WebCore/WebCore.xcodeproj/project.pbxproj (226845 => 226846)

--- branches/safari-605-branch/Source/WebCore/WebCore.xcodeproj/project.pbxproj	2018-01-12 04:51:58 UTC (rev 226845)
+++ branches/safari-605-branch/Source/WebCore/WebCore.xcodeproj/project.pbxproj	2018-01-12 04:52:01 UTC (rev 226846)
@@ -390,7 +390,6 @@
 		10FB084B14E15C7E00A3DB98 /* PublicURLManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 10FB084A14E15C7E00A3DB98 /* PublicURLManager.h */; };
 		112B34D51E60B98300BB310A /* SimpleLineLayoutPagination.h in Headers */ = {isa = PBXBuildFile; fileRef = 112B34D41E60B98300BB310A /* SimpleLineLayoutPagination.h */; };
 		113D0B521F9FDD2B00F611BB /* LayoutContext.h in Headers */ = {isa = PBXBuildFile; fileRef = 113D0B501F9FDD2B00F611BB /* LayoutContext.h */; settings = {ATTRIBUTES = (Private, ); }; };
-		119340791FE8B92300935F1E /* RenderTreeBuilderTable.h in Headers */ = {isa = PBXBuildFile; fileRef = 119340771FE8B92300935F1E /* RenderTreeBuilderTable.h */; };
 		11E067EE1E6246E500162D16 /* SimpleLineLayoutCoverage.h in Headers */ = {isa = PBXBuildFile; fileRef = 11E067ED1E6246E500162D16 /* SimpleLineLayoutCoverage.h */; settings = {ATTRIBUTES = (Private, ); }; };
 		1400D7A817136EA70077CE05 /* ScriptWrappableInlines.h in Headers */ = {isa = PBXBuildFile; fileRef = 1400D7A717136EA70077CE05 /* ScriptWrappableInlines.h */; settings = {ATTRIBUTES = (Private, ); }; };
 		1403B99709EB13AF00797C7F /* DOMWindow.h in Headers */ = {isa = PBXBuildFile; fileRef = 1403B99509EB13AF00797C7F /* DOMWindow.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -5580,8 +5579,6 @@
 		112B34D41E60B98300BB310A /* SimpleLineLayoutPagination.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SimpleLineLayoutPagination.h; sourceTree = ""; };
 		113D0B4F1F9FDD2B00F611BB /* LayoutContext.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = LayoutContext.cpp; sourceTree = ""; };
 		113D0B501F9FDD2B00F611BB /* LayoutContext.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LayoutContext.h; sourceTree = ""; };
-		119340761FE8B92300935F1E /* RenderTreeBuilderTable.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = RenderTreeBuilderTable.cpp; sourceTree = ""; };
-		119340771FE8B92300935F1E /* RenderTreeBuilderTable.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RenderTreeBuilderTable.h; sourceTree = ""; };
 		11E067EB1E62461300162D16 /* SimpleLineLayoutCoverage.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SimpleLineLayoutCoverage.cpp; sourceTree = ""; };
 		11E067ED1E6246E500162D16 /* SimpleLineLayoutCoverage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SimpleLineLayoutCoverage.h; sourceTree = ""; };
 		1400D7A717136EA70077CE05 /* ScriptWrappableInlines.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = 

[webkit-changes] [226855] branches/safari-605-branch/Source/WebCore

[jmarcell]

Title: [226855] branches/safari-605-branch/Source/WebCore








Revision 226855
Author jmarc...@apple.com
Date 2018-01-11 20:52:50 -0800 (Thu, 11 Jan 2018)


Log Message
Cherry-pick r226705. rdar://problem/36429137

Modified Paths

branches/safari-605-branch/Source/WebCore/ChangeLog
branches/safari-605-branch/Source/WebCore/workers/service/server/RegistrationDatabase.cpp




Diff

Modified: branches/safari-605-branch/Source/WebCore/ChangeLog (226854 => 226855)

--- branches/safari-605-branch/Source/WebCore/ChangeLog	2018-01-12 04:52:48 UTC (rev 226854)
+++ branches/safari-605-branch/Source/WebCore/ChangeLog	2018-01-12 04:52:50 UTC (rev 226855)
@@ -1,5 +1,29 @@
 2018-01-11  Jason Marcell  
 
+Cherry-pick r226705. rdar://problem/36429137
+
+2018-01-10  Youenn Fablet  
+
+Add Service Worker CSP persistency
+https://bugs.webkit.org/show_bug.cgi?id=181434
+
+Reviewed by Alex Christensen.
+
+Covered by manual testing.
+Future work on service worker test infrastructure should allow automating such tests.
+
+Add support for service worker CSP data persistency.
+Add a version parameter to increment each time the schema is changing.
+This allows the same store to be used by multiple WebKits.
+
+* workers/service/server/RegistrationDatabase.cpp:
+(WebCore::v1RecordsTableSchema):
+(WebCore::RegistrationDatabase::openSQLiteDatabase):
+(WebCore::RegistrationDatabase::doPushChanges):
+(WebCore::RegistrationDatabase::importRecords):
+
+2018-01-11  Jason Marcell  
+
 Cherry-pick r226677. rdar://problem/36429157
 
 2018-01-09  Chris Dumez  


Modified: branches/safari-605-branch/Source/WebCore/workers/service/server/RegistrationDatabase.cpp (226854 => 226855)

--- branches/safari-605-branch/Source/WebCore/workers/service/server/RegistrationDatabase.cpp	2018-01-12 04:52:48 UTC (rev 226854)
+++ branches/safari-605-branch/Source/WebCore/workers/service/server/RegistrationDatabase.cpp	2018-01-12 04:52:50 UTC (rev 226855)
@@ -40,12 +40,17 @@
 #include 
 #include 
 #include 
+#include 
+#include 
+#include 
 
 namespace WebCore {
 
+static const int schemaVersion = 1;
+
 static const String v1RecordsTableSchema(const String& tableName)
 {
-return makeString("CREATE TABLE ", tableName, " (key TEXT NOT NULL ON CONFLICT FAIL UNIQUE ON CONFLICT REPLACE, origin TEXT NOT NULL ON CONFLICT FAIL, scopeURL TEXT NOT NULL ON CONFLICT FAIL, topOrigin TEXT NOT NULL ON CONFLICT FAIL, lastUpdateCheckTime DOUBLE NOT NULL ON CONFLICT FAIL, updateViaCache TEXT NOT NULL ON CONFLICT FAIL, scriptURL TEXT NOT NULL ON CONFLICT FAIL, script TEXT NOT NULL ON CONFLICT FAIL, workerType TEXT NOT NULL ON CONFLICT FAIL)");
+return makeString("CREATE TABLE ", tableName, " (key TEXT NOT NULL ON CONFLICT FAIL UNIQUE ON CONFLICT REPLACE, origin TEXT NOT NULL ON CONFLICT FAIL, scopeURL TEXT NOT NULL ON CONFLICT FAIL, topOrigin TEXT NOT NULL ON CONFLICT FAIL, lastUpdateCheckTime DOUBLE NOT NULL ON CONFLICT FAIL, updateViaCache TEXT NOT NULL ON CONFLICT FAIL, scriptURL TEXT NOT NULL ON CONFLICT FAIL, script TEXT NOT NULL ON CONFLICT FAIL, workerType TEXT NOT NULL ON CONFLICT FAIL, contentSecurityPolicy BLOB NOT NULL ON CONFLICT FAIL)");
 }
 
 static const String v1RecordsTableSchema()
@@ -65,7 +70,7 @@
 static const String& databaseFilename()
 {
 ASSERT(isMainThread());
-static NeverDestroyed filename = "ServiceWorkerRegistrations.sqlite3";
+static NeverDestroyed filename = makeString("ServiceWorkerRegistrations-", String::number(schemaVersion), ".sqlite3");
 return filename;
 }
 
@@ -118,7 +123,7 @@
 errorMessage = importRecords();
 if (!errorMessage.isNull())
 return;
-
+
 scopeExit.release();
 }
 
@@ -258,7 +263,7 @@
 SQLiteTransaction transaction(*m_database);
 transaction.begin();
 
-SQLiteStatement sql(*m_database, ASCIILiteral("INSERT INTO Records VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)"));
+SQLiteStatement sql(*m_database, ASCIILiteral("INSERT INTO Records VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)"));
 if (sql.prepare() != SQLITE_OK) {
 RELEASE_LOG_ERROR(ServiceWorker, "Failed to prepare statement to store registration data into records table (%i) - %s", m_database->lastError(), m_database->lastErrorMsg());
 return;
@@ -277,6 +282,9 @@
 continue;
 }
 
+WTF::Persistence::Encoder encoder;
+data.contentSecurityPolicy.encode(encoder);
+
 if (sql.bindText(1, data.registration.key.toDatabaseKey()) != SQLITE_OK
 || sql.bindText(2, data.registration.scopeURL.protocolHostAndPort()) != SQLITE_OK
 || sql.bindText(3, data.registration.scopeURL.path()) != SQLITE_OK
@@ -286,6 +294,7 @@
 || sql.bindText(7, data.scriptURL.string()) != SQLITE_OK
 || 

[webkit-changes] [226858] branches/safari-605-branch

[jmarcell]

Title: [226858] branches/safari-605-branch








Revision 226858
Author jmarc...@apple.com
Date 2018-01-11 20:53:02 -0800 (Thu, 11 Jan 2018)


Log Message
Cherry-pick r226750. rdar://problem/36429156

Modified Paths

branches/safari-605-branch/LayoutTests/ChangeLog
branches/safari-605-branch/LayoutTests/platform/mac/TestExpectations
branches/safari-605-branch/Source/WebKit/ChangeLog
branches/safari-605-branch/Source/WebKit/Platform/spi/ios/UIKitSPI.h
branches/safari-605-branch/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm
branches/safari-605-branch/Source/WebKit/UIProcess/API/Cocoa/WKWebViewPrivate.h
branches/safari-605-branch/Source/WebKit/UIProcess/Cocoa/ViewGestureController.h
branches/safari-605-branch/Source/WebKit/UIProcess/Cocoa/WebViewImpl.h
branches/safari-605-branch/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm
branches/safari-605-branch/Source/WebKit/UIProcess/ios/ViewGestureControllerIOS.mm
branches/safari-605-branch/Source/WebKit/UIProcess/mac/ViewGestureControllerMac.mm
branches/safari-605-branch/Tools/ChangeLog
branches/safari-605-branch/Tools/DumpRenderTree/ios/UIScriptControllerIOS.mm
branches/safari-605-branch/Tools/TestRunnerShared/UIScriptContext/UIScriptController.cpp
branches/safari-605-branch/Tools/WebKitTestRunner/ios/PlatformWebViewIOS.mm
branches/safari-605-branch/Tools/WebKitTestRunner/ios/UIScriptControllerIOS.mm


Added Paths

branches/safari-605-branch/LayoutTests/swipe/pushstate-with-manual-scrollrestoration-expected.txt
branches/safari-605-branch/LayoutTests/swipe/pushstate-with-manual-scrollrestoration.html




Diff

Modified: branches/safari-605-branch/LayoutTests/ChangeLog (226857 => 226858)

--- branches/safari-605-branch/LayoutTests/ChangeLog	2018-01-12 04:52:55 UTC (rev 226857)
+++ branches/safari-605-branch/LayoutTests/ChangeLog	2018-01-12 04:53:02 UTC (rev 226858)
@@ -1,5 +1,23 @@
 2018-01-11  Jason Marcell  
 
+Cherry-pick r226750. rdar://problem/36429156
+
+2018-01-10  Tim Horton  
+
+REGRESSION (r213590): Swipe from edge to go to previous page is significantly slower than tapping back button on Twitter
+https://bugs.webkit.org/show_bug.cgi?id=181269
+
+
+Reviewed by Simon Fraser.
+
+* swipe/pushstate-with-manual-scrollrestoration-expected.txt: Added.
+* swipe/pushstate-with-manual-scrollrestoration.html: Added.
+Add a test (which previously would complain about taking too long)
+that using manual scroll position restoration and pushState together
+doesn't cause swipes to hang until the watchdog fires.
+
+2018-01-11  Jason Marcell  
+
 Cherry-pick r226677. rdar://problem/36429157
 
 2018-01-09  Chris Dumez  


Modified: branches/safari-605-branch/LayoutTests/platform/mac/TestExpectations (226857 => 226858)

--- branches/safari-605-branch/LayoutTests/platform/mac/TestExpectations	2018-01-12 04:52:55 UTC (rev 226857)
+++ branches/safari-605-branch/LayoutTests/platform/mac/TestExpectations	2018-01-12 04:53:02 UTC (rev 226858)
@@ -1758,3 +1758,5 @@
 webkit.org/b/180675 accessibility/mac/search-field-cancel-button.html [ Pass Failure ]
 
 webkit.org/b/181098 fast/workers/worker-terminate.html [ Pass Timeout ]
+
+webkit.org/b/181502 swipe/pushstate-with-manual-scrollrestoration.html [ Failure ]
\ No newline at end of file


Added: branches/safari-605-branch/LayoutTests/swipe/pushstate-with-manual-scrollrestoration-expected.txt (0 => 226858)

--- branches/safari-605-branch/LayoutTests/swipe/pushstate-with-manual-scrollrestoration-expected.txt	(rev 0)
+++ branches/safari-605-branch/LayoutTests/swipe/pushstate-with-manual-scrollrestoration-expected.txt	2018-01-12 04:53:02 UTC (rev 226858)
@@ -0,0 +1,6 @@
+startSwipeGesture
+didBeginSwipe
+completeSwipeGesture
+didEndSwipe
+didRemoveSwipeSnapshot
+


Added: branches/safari-605-branch/LayoutTests/swipe/pushstate-with-manual-scrollrestoration.html (0 => 226858)

--- branches/safari-605-branch/LayoutTests/swipe/pushstate-with-manual-scrollrestoration.html	(rev 0)
+++ branches/safari-605-branch/LayoutTests/swipe/pushstate-with-manual-scrollrestoration.html	2018-01-12 04:53:02 UTC (rev 226858)
@@ -0,0 +1,60 @@
+
+
+html {
+font-size: 32pt;
+}
+
+
+history.scrollRestoration = "manual";
+
+function didBeginSwipeCallback()
+{
+log("didBeginSwipe");
+
+completeSwipeGesture();
+}
+
+function didEndSwipeCallback()
+{
+log("didEndSwipe");
+
+startMeasuringDuration("snapshotRemoval");
+}
+
+function didRemoveSwipeSnapshotCallback()
+{
+log("didRemoveSwipeSnapshot");
+
+measuredDurationShouldBeLessThan("snapshotRemoval", 1000, "Because we're using the page cache, it shouldn't be long between the gesture completing and the snapshot being removed.")
+
+testComplete();
+}
+
+window._onload_ = function () {
+if (!window.eventSender || 

[webkit-changes] [226851] branches/safari-605-branch

[jmarcell]

Title: [226851] branches/safari-605-branch








Revision 226851
Author jmarc...@apple.com
Date 2018-01-11 20:52:26 -0800 (Thu, 11 Jan 2018)


Log Message
Cherry-pick r226650. rdar://problem/36429150

Modified Paths

branches/safari-605-branch/JSTests/ChangeLog
branches/safari-605-branch/Source/_javascript_Core/ChangeLog
branches/safari-605-branch/Source/_javascript_Core/bytecompiler/NodesCodegen.cpp
branches/safari-605-branch/Source/_javascript_Core/parser/NodeConstructors.h
branches/safari-605-branch/Source/_javascript_Core/parser/Nodes.h


Added Paths

branches/safari-605-branch/JSTests/stress/regress-181388.js




Diff

Modified: branches/safari-605-branch/JSTests/ChangeLog (226850 => 226851)

--- branches/safari-605-branch/JSTests/ChangeLog	2018-01-12 04:52:23 UTC (rev 226850)
+++ branches/safari-605-branch/JSTests/ChangeLog	2018-01-12 04:52:26 UTC (rev 226851)
@@ -1,3 +1,17 @@
+2018-01-11  Jason Marcell  
+
+Cherry-pick r226650. rdar://problem/36429150
+
+2018-01-09  Mark Lam  
+
+ASSERTION FAILED: pair.second->m_type & PropertyNode::Getter
+https://bugs.webkit.org/show_bug.cgi?id=181388
+
+
+Reviewed by Saam Barati.
+
+* stress/regress-181388.js: Added.
+
 2018-01-09  Jason Marcell  
 
 Cherry-pick r226615. rdar://problem/36392328


Added: branches/safari-605-branch/JSTests/stress/regress-181388.js (0 => 226851)

--- branches/safari-605-branch/JSTests/stress/regress-181388.js	(rev 0)
+++ branches/safari-605-branch/JSTests/stress/regress-181388.js	2018-01-12 04:52:26 UTC (rev 226851)
@@ -0,0 +1,71 @@
+function assert(x) {
+if (!x)
+throw "FAIL";
+}
+
+(function() {
+var trace = [];
+
+var foo = {
+value: 5,
+get bar() {
+trace.push("get");
+return this.value;
+},
+set bar(x) {
+throw "Should not be reached";
+},
+set bar(x) {
+trace.push("set2");
+this.value = x + 1;
+return this.value;
+}
+}
+
+assert(foo.value == 5);
+assert(trace == "");
+assert(foo.bar == 5);
+assert(trace == "get");
+
+foo.bar = 20;
+assert(trace == "get,set2");
+
+assert(foo.value == 10020);
+assert(trace == "get,set2");
+assert(foo.bar == 10020);
+assert(trace == "get,set2,get");
+})();
+
+(function() {
+var trace = [];
+
+var foo = {
+value: 5,
+set bar(x) {
+trace.push("set");
+this.value = x;
+return this.value;
+},
+get bar() {
+throw "Should not be reached";
+},
+get bar() {
+trace.push("get2");
+this.value += 1;
+return this.value;
+},
+}
+
+assert(foo.value == 5);
+assert(trace == "");
+assert(foo.bar == 10005);
+assert(trace == "get2");
+
+foo.bar = 20;
+assert(trace == "get2,set");
+
+assert(foo.value == 20);
+assert(trace == "get2,set");
+assert(foo.bar == 10020);
+assert(trace == "get2,set,get2");
+})();


Modified: branches/safari-605-branch/Source/_javascript_Core/ChangeLog (226850 => 226851)

--- branches/safari-605-branch/Source/_javascript_Core/ChangeLog	2018-01-12 04:52:23 UTC (rev 226850)
+++ branches/safari-605-branch/Source/_javascript_Core/ChangeLog	2018-01-12 04:52:26 UTC (rev 226851)
@@ -1,3 +1,27 @@
+2018-01-11  Jason Marcell  
+
+Cherry-pick r226650. rdar://problem/36429150
+
+2018-01-09  Mark Lam  
+
+ASSERTION FAILED: pair.second->m_type & PropertyNode::Getter
+https://bugs.webkit.org/show_bug.cgi?id=181388
+
+
+Reviewed by Saam Barati.
+
+When there are duplicate setters or getters, we may end up overwriting a getter
+with a setter, or vice versa.  This patch adds tracking for getters/setters that
+have been overwritten with duplicates and ignore them.
+
+* bytecompiler/NodesCodegen.cpp:
+(JSC::PropertyListNode::emitBytecode):
+* parser/NodeConstructors.h:
+(JSC::PropertyNode::PropertyNode):
+* parser/Nodes.h:
+(JSC::PropertyNode::isOverriddenByDuplicate const):
+(JSC::PropertyNode::setIsOverriddenByDuplicate):
+
 2018-01-09  Jason Marcell  
 
 Cherry-pick r226672. rdar://problem/36397330


Modified: branches/safari-605-branch/Source/_javascript_Core/bytecompiler/NodesCodegen.cpp (226850 => 226851)

--- branches/safari-605-branch/Source/_javascript_Core/bytecompiler/NodesCodegen.cpp	2018-01-12 04:52:23 UTC (rev 226850)
+++ branches/safari-605-branch/Source/_javascript_Core/bytecompiler/NodesCodegen.cpp	2018-01-12 04:52:26 UTC (rev 226851)
@@ -1,7 +1,7 @@
 /*
 *  Copyright (C) 1999-2002 Harri Porten 

[webkit-changes] [226852] branches/safari-605-branch

[jmarcell]

Title: [226852] branches/safari-605-branch








Revision 226852
Author jmarc...@apple.com
Date 2018-01-11 20:52:30 -0800 (Thu, 11 Jan 2018)


Log Message
Cherry-pick r226653. rdar://problem/36429147

Modified Paths

branches/safari-605-branch/LayoutTests/ChangeLog
branches/safari-605-branch/Source/WebCore/ChangeLog
branches/safari-605-branch/Source/WebCore/html/HTMLLinkElement.cpp


Added Paths

branches/safari-605-branch/LayoutTests/http/tests/local/loading-stylesheet-import-remove-expected.html
branches/safari-605-branch/LayoutTests/http/tests/local/loading-stylesheet-import-remove.html
branches/safari-605-branch/LayoutTests/http/tests/local/resources/slow-import.css




Diff

Modified: branches/safari-605-branch/LayoutTests/ChangeLog (226851 => 226852)

--- branches/safari-605-branch/LayoutTests/ChangeLog	2018-01-12 04:52:26 UTC (rev 226851)
+++ branches/safari-605-branch/LayoutTests/ChangeLog	2018-01-12 04:52:30 UTC (rev 226852)
@@ -1,5 +1,21 @@
 2018-01-11  Jason Marcell  
 
+Cherry-pick r226653. rdar://problem/36429147
+
+2018-01-09  Antti Koivisto  
+
+Blank page except for inner iframes because pending stylesheets cause style.isNotFinal() to be true
+https://bugs.webkit.org/show_bug.cgi?id=180940
+
+
+Reviewed by Darin Adler.
+
+* http/tests/local/loading-stylesheet-import-remove.html: Added.
+* http/tests/local/loading-stylesheet-import-remove-expected.html: Added.
+* http/tests/local/resources/slow-import.css: Added.
+
+2018-01-11  Jason Marcell  
+
 Cherry-pick r226599. rdar://problem/36429130
 
 2018-01-08  Said Abou-Hallawa  


Added: branches/safari-605-branch/LayoutTests/http/tests/local/loading-stylesheet-import-remove-expected.html (0 => 226852)

--- branches/safari-605-branch/LayoutTests/http/tests/local/loading-stylesheet-import-remove-expected.html	(rev 0)
+++ branches/safari-605-branch/LayoutTests/http/tests/local/loading-stylesheet-import-remove-expected.html	2018-01-12 04:52:30 UTC (rev 226852)
@@ -0,0 +1,6 @@
+
+
+
+CAN YOU SEE ME NOW?
+
+


Added: branches/safari-605-branch/LayoutTests/http/tests/local/loading-stylesheet-import-remove.html (0 => 226852)

--- branches/safari-605-branch/LayoutTests/http/tests/local/loading-stylesheet-import-remove.html	(rev 0)
+++ branches/safari-605-branch/LayoutTests/http/tests/local/loading-stylesheet-import-remove.html	2018-01-12 04:52:30 UTC (rev 226852)
@@ -0,0 +1,19 @@
+
+
+
+
+if (window.testRunner)
+testRunner.waitUntilDone();
+setTimeout(() => {
+const stylesheet = document.querySelector('link');
+stylesheet.remove();
+if (window.testRunner)
+testRunner.notifyDone();
+}, 100);
+
+
+
+CAN YOU SEE ME NOW?
+
+


Added: branches/safari-605-branch/LayoutTests/http/tests/local/resources/slow-import.css (0 => 226852)

--- branches/safari-605-branch/LayoutTests/http/tests/local/resources/slow-import.css	(rev 0)
+++ branches/safari-605-branch/LayoutTests/http/tests/local/resources/slow-import.css	2018-01-12 04:52:30 UTC (rev 226852)
@@ -0,0 +1 @@
+@import url("../slow-css-pass.cgi");


Modified: branches/safari-605-branch/Source/WebCore/ChangeLog (226851 => 226852)

--- branches/safari-605-branch/Source/WebCore/ChangeLog	2018-01-12 04:52:26 UTC (rev 226851)
+++ branches/safari-605-branch/Source/WebCore/ChangeLog	2018-01-12 04:52:30 UTC (rev 226852)
@@ -1,5 +1,30 @@
 2018-01-11  Jason Marcell  
 
+Cherry-pick r226653. rdar://problem/36429147
+
+2018-01-09  Antti Koivisto  
+
+Blank page except for inner iframes because pending stylesheets cause style.isNotFinal() to be true
+https://bugs.webkit.org/show_bug.cgi?id=180940
+
+
+Reviewed by Darin Adler.
+
+Test: http/tests/local/loading-stylesheet-import-remove.html
+
+If a  referencing a stylesheet containing an @import that was still loading was removed
+from the document, the loading state was never cleared. For head stylesheets this blocked
+rendering permanently.
+
+Test reduction by Justin Ridgewell.
+
+* html/HTMLLinkElement.cpp:
+(WebCore::HTMLLinkElement::removedFromAncestor):
+
+Test if the stylesheet it loading before clearing the pointer.
+
+2018-01-11  Jason Marcell  
+
 Cherry-pick r226599. rdar://problem/36429130
 
 2018-01-08  Said Abou-Hallawa  


Modified: branches/safari-605-branch/Source/WebCore/html/HTMLLinkElement.cpp (226851 => 226852)

--- branches/safari-605-branch/Source/WebCore/html/HTMLLinkElement.cpp	2018-01-12 04:52:26 UTC (rev 226851)
+++ branches/safari-605-branch/Source/WebCore/html/HTMLLinkElement.cpp	2018-01-12 04:52:30 UTC (rev 226852)
@@ 

[webkit-changes] [226856] branches/safari-605-branch/Source/WebCore

[jmarcell]

Title: [226856] branches/safari-605-branch/Source/WebCore








Revision 226856
Author jmarc...@apple.com
Date 2018-01-11 20:52:53 -0800 (Thu, 11 Jan 2018)


Log Message
Cherry-pick r226721. rdar://problem/36429159

Modified Paths

branches/safari-605-branch/Source/WebCore/ChangeLog
branches/safari-605-branch/Source/WebCore/css/parser/CSSParser.cpp




Diff

Modified: branches/safari-605-branch/Source/WebCore/ChangeLog (226855 => 226856)

--- branches/safari-605-branch/Source/WebCore/ChangeLog	2018-01-12 04:52:50 UTC (rev 226855)
+++ branches/safari-605-branch/Source/WebCore/ChangeLog	2018-01-12 04:52:53 UTC (rev 226856)
@@ -1,5 +1,23 @@
 2018-01-11  Jason Marcell  
 
+Cherry-pick r226721. rdar://problem/36429159
+
+2018-01-10  Antti Koivisto  
+
+REGRESSION(r225650): The scores of MotionMark tests Multiply and Leaves dropped by 8%
+https://bugs.webkit.org/show_bug.cgi?id=181460
+
+
+Reviewed by Ryosuke Niwa.
+
+* css/parser/CSSParser.cpp:
+(WebCore::CSSParserContext::CSSParserContext):
+
+Don't do the expensive security origin test if the sheet base URL and document URL are identical.
+This is true for inline style and inline stylesheets.
+
+2018-01-11  Jason Marcell  
+
 Cherry-pick r226705. rdar://problem/36429137
 
 2018-01-10  Youenn Fablet  


Modified: branches/safari-605-branch/Source/WebCore/css/parser/CSSParser.cpp (226855 => 226856)

--- branches/safari-605-branch/Source/WebCore/css/parser/CSSParser.cpp	2018-01-12 04:52:50 UTC (rev 226855)
+++ branches/safari-605-branch/Source/WebCore/css/parser/CSSParser.cpp	2018-01-12 04:52:53 UTC (rev 226856)
@@ -78,7 +78,7 @@
 , mode(document.inQuirksMode() ? HTMLQuirksMode : HTMLStandardMode)
 , isHTMLDocument(document.isHTMLDocument())
 , cssGridLayoutEnabled(document.isCSSGridLayoutEnabled())
-, hasDocumentSecurityOrigin(document.securityOrigin().canRequest(baseURL))
+, hasDocumentSecurityOrigin(document.baseURL() == baseURL || document.securityOrigin().canRequest(baseURL))
 {
 needsSiteSpecificQuirks = document.settings().needsSiteSpecificQuirks();
 enforcesCSSMIMETypeInNoQuirksMode = document.settings().enforceCSSMIMETypeInNoQuirksMode();






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

[webkit-changes] [226857] branches/safari-605-branch/Source/WebKit

[jmarcell]

Title: [226857] branches/safari-605-branch/Source/WebKit








Revision 226857
Author jmarc...@apple.com
Date 2018-01-11 20:52:55 -0800 (Thu, 11 Jan 2018)


Log Message
Cherry-pick r226742. rdar://problem/36429136

Modified Paths

branches/safari-605-branch/Source/WebKit/ChangeLog
branches/safari-605-branch/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp




Diff

Modified: branches/safari-605-branch/Source/WebKit/ChangeLog (226856 => 226857)

--- branches/safari-605-branch/Source/WebKit/ChangeLog	2018-01-12 04:52:53 UTC (rev 226856)
+++ branches/safari-605-branch/Source/WebKit/ChangeLog	2018-01-12 04:52:55 UTC (rev 226857)
@@ -1,5 +1,23 @@
 2018-01-11  Jason Marcell  
 
+Cherry-pick r226742. rdar://problem/36429136
+
+2018-01-10  Brent Fulgham  
+
+Use protectedThis for the 'updatePrevalentDomainsToPartitionOrBlockCookies' lambda
+https://bugs.webkit.org/show_bug.cgi?id=181452
+
+
+Reviewed by Chris Dumez.
+
+We forgot to use a 'protectedThis' back in r225006 for one of the lambdas used by
+the WebsiteDataStore for processing.
+
+* UIProcess/WebsiteData/WebsiteDataStore.cpp:
+(WebKit::WebsiteDataStore::enableResourceLoadStatisticsAndSetTestingCallback):
+
+2018-01-11  Jason Marcell  
+
 Cherry-pick r226644. rdar://problem/36429133
 
 2018-01-09  Paul Knight  


Modified: branches/safari-605-branch/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp (226856 => 226857)

--- branches/safari-605-branch/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp	2018-01-12 04:52:53 UTC (rev 226856)
+++ branches/safari-605-branch/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp	2018-01-12 04:52:55 UTC (rev 226857)
@@ -1401,7 +1401,7 @@
 }
 
 #if HAVE(CFNETWORK_STORAGE_PARTITIONING)
-m_resourceLoadStatistics = WebResourceLoadStatisticsStore::create(m_configuration.resourceLoadStatisticsDirectory, WTFMove(callback), [this] (const Vector& domainsToPartition, const Vector& domainsToBlock, const Vector& domainsToNeitherPartitionNorBlock, ShouldClearFirst shouldClearFirst) {
+m_resourceLoadStatistics = WebResourceLoadStatisticsStore::create(m_configuration.resourceLoadStatisticsDirectory, WTFMove(callback), [this, protectedThis = makeRef(*this)] (const Vector& domainsToPartition, const Vector& domainsToBlock, const Vector& domainsToNeitherPartitionNorBlock, ShouldClearFirst shouldClearFirst) {
 updatePrevalentDomainsToPartitionOrBlockCookies(domainsToPartition, domainsToBlock, domainsToNeitherPartitionNorBlock, shouldClearFirst);
 }, [this, protectedThis = makeRef(*this)] (const String& resourceDomain, const String& firstPartyDomain, uint64_t frameID, uint64_t pageID, WTF::CompletionHandler&& callback) {
 hasStorageAccessForFrameHandler(resourceDomain, firstPartyDomain, frameID, pageID, WTFMove(callback));






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

[webkit-changes] [226848] branches/safari-605-branch/LayoutTests

[jmarcell]

Title: [226848] branches/safari-605-branch/LayoutTests








Revision 226848
Author jmarc...@apple.com
Date 2018-01-11 20:52:15 -0800 (Thu, 11 Jan 2018)


Log Message
Cherry-pick r226527. rdar://problem/36429143

Modified Paths

branches/safari-605-branch/LayoutTests/ChangeLog


Added Paths

branches/safari-605-branch/LayoutTests/platform/wincairo-win10/
branches/safari-605-branch/LayoutTests/platform/wincairo-win10/TestExpectations




Diff

Modified: branches/safari-605-branch/LayoutTests/ChangeLog (226847 => 226848)

--- branches/safari-605-branch/LayoutTests/ChangeLog	2018-01-12 04:52:12 UTC (rev 226847)
+++ branches/safari-605-branch/LayoutTests/ChangeLog	2018-01-12 04:52:15 UTC (rev 226848)
@@ -1,3 +1,16 @@
+2018-01-11  Jason Marcell  
+
+Cherry-pick r226527. rdar://problem/36429143
+
+2018-01-08  Basuke Suzuki  
+
+[WinCairo] Add default port TestExpectations for wincairo
+https://bugs.webkit.org/show_bug.cgi?id=179221
+
+Reviewed by Alex Christensen.
+
+* platform/wincairo-win10/TestExpectations: Added.
+
 2018-01-09  Jason Marcell  
 
 Cherry-pick r226638. rdar://problem/36392286


Added: branches/safari-605-branch/LayoutTests/platform/wincairo-win10/TestExpectations (0 => 226848)

--- branches/safari-605-branch/LayoutTests/platform/wincairo-win10/TestExpectations	(rev 0)
+++ branches/safari-605-branch/LayoutTests/platform/wincairo-win10/TestExpectations	2018-01-12 04:52:15 UTC (rev 226848)
@@ -0,0 +1,243 @@
+# These are the layout test expectations for WinCairo on Windows 10.
+#
+# See http://trac.webkit.org/wiki/TestExpectations for more information on this file.
+
+#//
+# Platform-specific directories. Skipped here, then re-enabled on the appropriate platform.
+#//
+
+#//
+# End platform-specific directories.
+#//
+
+#//
+# These areas are not implemented well on WinCairo
+#//
+
+accessibility [ Skip ]
+animations [ Skip ]
+canvas/philip [ Skip ]
+contentfiltering [ Skip ]
+credentials [ Skip ]
+crypto [ Skip ]
+css1 [ Skip ]
+css2.1 [ Skip ]
+css3 [ Skip ]
+editing [ Skip ]
+fullscreen [ Skip ]
+gamepad [ Skip ]
+imported [ Skip ]
+inspector [ Skip ]
+jquery [ Skip ]
+mathml [ Skip ]
+media [ Skip ]
+plugins [ Skip ]
+pointer-lock [ Skip ]
+security [ Skip ]
+storage/indexeddb [ Skip ]
+svg [ Skip ]
+tables/mozilla [ Skip ]
+wasm [ Skip ]
+webgl [ Skip ]
+webrtc [ Skip ]
+webaudio [ Skip ]
+webarchive [ Skip ]
+workers [ Skip ]
+
+fast/animation [ Skip ]
+fast/attachment [ Skip ]
+fast/block [ Skip ]
+fast/borders [ Skip ]
+fast/canvas/webgl [ Skip ]
+fast/css [ Skip ]
+fast/css3-text [ Skip ]
+fast/css-generated-content [ Skip ]
+fast/css-intrinsic-dimensions [ Skip ]
+fast/css-grid-layout [ Skip ]
+fast/dom/DeviceMotion [ Skip ]
+fast/dom/DeviceOrientation [ Skip ]
+fast/dom/Geolocation/ [ Skip ]
+fast/dom/HTMLLinkElement [ Skip ]
+fast/dynamic [ Skip ]
+fast/events/touch  [ Skip ]
+fast/files [ Skip ]
+fast/forms/file [ Skip ]
+fast/mediastream [ Skip ]
+fast/speechsynthesis [ Skip ]
+
+#//
+# Following tests are labeled "Skip" because not working well and causes crash or timeout
+#//
+
+fast/canvas/canvas-bg-multiple-removal.html [ Skip ]
+fast/canvas/canvas-createPattern-video-loading.html [ Skip ]
+fast/canvas/canvas-createPattern-video-modify.html [ Skip ]
+fast/canvas/webgpu/webgpu-dispatch.html [ Skip ]
+fast/dom/FileList-iterator-using-open-panel.html [ Skip ]
+fast/dom/MutationObserver/end-of-task-delivery.html [ Skip ]
+fast/dom/MutationObserver/inline-event-listener.html [ Skip ]
+fast/dom/Range/detach-range-during-deletecontents.html [ Skip ]
+fast/dom/SelectorAPI/bug-17313.html [ Skip ]
+fast/dom/Window/a-rel-noopener.html [ Skip ]
+fast/dom/Window/child-window-focus.html [ Skip ]
+fast/dom/Window/get-set-properties.html [ Skip ]
+fast/dom/Window/property-access-on-cached-window-after-frame-removed.html [ Skip ]
+fast/dom/Window/window-resize-contents.html [ Skip ]
+fast/dom/Window/window-resize-update-scrollbars.html [ Skip ]
+fast/dom/css-cached-import-rule.html [ Skip ]
+fast/dom/empty-hash-and-search.html [ Skip ]
+fast/dom/frame-loading-via-document-write.html [ Skip ]
+fast/dom/navigator-cookieEnabled-no-crash.html [ Skip ]

[webkit-changes] [226849] branches/safari-605-branch

[jmarcell]

Title: [226849] branches/safari-605-branch








Revision 226849
Author jmarc...@apple.com
Date 2018-01-11 20:52:20 -0800 (Thu, 11 Jan 2018)


Log Message
Cherry-pick r226599. rdar://problem/36429130

Modified Paths

branches/safari-605-branch/LayoutTests/ChangeLog
branches/safari-605-branch/Source/WebCore/ChangeLog
branches/safari-605-branch/Source/WebCore/html/ImageBitmap.cpp
branches/safari-605-branch/Source/WebCore/html/canvas/CanvasRenderingContext.cpp


Added Paths

branches/safari-605-branch/LayoutTests/svg/as-image/svg-canvas-data-url-svg-with-feimage-not-tainted-expected.txt
branches/safari-605-branch/LayoutTests/svg/as-image/svg-canvas-data-url-svg-with-feimage-not-tainted.html
branches/safari-605-branch/LayoutTests/svg/as-image/svg-canvas-data-url-svg-with-foreign-object-not-tainted-expected.txt
branches/safari-605-branch/LayoutTests/svg/as-image/svg-canvas-data-url-svg-with-foreign-object-not-tainted.html
branches/safari-605-branch/LayoutTests/svg/as-image/svg-canvas-data-url-svg-with-image-not-tainted-expected.txt
branches/safari-605-branch/LayoutTests/svg/as-image/svg-canvas-data-url-svg-with-image-not-tainted.html




Diff

Modified: branches/safari-605-branch/LayoutTests/ChangeLog (226848 => 226849)

--- branches/safari-605-branch/LayoutTests/ChangeLog	2018-01-12 04:52:15 UTC (rev 226848)
+++ branches/safari-605-branch/LayoutTests/ChangeLog	2018-01-12 04:52:20 UTC (rev 226849)
@@ -1,5 +1,23 @@
 2018-01-11  Jason Marcell  
 
+Cherry-pick r226599. rdar://problem/36429130
+
+2018-01-08  Said Abou-Hallawa  
+
+A canvas should not be tainted if it draws a data URL SVGImage with a 
+https://bugs.webkit.org/show_bug.cgi?id=180301
+
+Reviewed by Dean Jackson.
+
+* svg/as-image/svg-canvas-data-url-svg-with-feimage-not-tainted-expected.txt: Added.
+* svg/as-image/svg-canvas-data-url-svg-with-feimage-not-tainted.html: Added.
+* svg/as-image/svg-canvas-data-url-svg-with-foreign-object-not-tainted-expected.txt: Added.
+* svg/as-image/svg-canvas-data-url-svg-with-foreign-object-not-tainted.html: Added.
+* svg/as-image/svg-canvas-data-url-svg-with-image-not-tainted-expected.txt: Added.
+* svg/as-image/svg-canvas-data-url-svg-with-image-not-tainted.html: Added.
+
+2018-01-11  Jason Marcell  
+
 Cherry-pick r226527. rdar://problem/36429143
 
 2018-01-08  Basuke Suzuki  


Added: branches/safari-605-branch/LayoutTests/svg/as-image/svg-canvas-data-url-svg-with-feimage-not-tainted-expected.txt (0 => 226849)

--- branches/safari-605-branch/LayoutTests/svg/as-image/svg-canvas-data-url-svg-with-feimage-not-tainted-expected.txt	(rev 0)
+++ branches/safari-605-branch/LayoutTests/svg/as-image/svg-canvas-data-url-svg-with-feimage-not-tainted-expected.txt	2018-01-12 04:52:20 UTC (rev 226849)
@@ -0,0 +1,10 @@
+Canvas should not be tainted if a data url image with a data url  which has a  is drawn into the canvas.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS window.ctx.getImageData(0, 0, 1, 1) did not throw exception.
+PASS successfullyParsed is true
+
+TEST COMPLETE
+


Added: branches/safari-605-branch/LayoutTests/svg/as-image/svg-canvas-data-url-svg-with-feimage-not-tainted.html (0 => 226849)

--- branches/safari-605-branch/LayoutTests/svg/as-image/svg-canvas-data-url-svg-with-feimage-not-tainted.html	(rev 0)
+++ branches/safari-605-branch/LayoutTests/svg/as-image/svg-canvas-data-url-svg-with-feimage-not-tainted.html	2018-01-12 04:52:20 UTC (rev 226849)
@@ -0,0 +1,45 @@
+
+
+
+
+
+