[webkit-changes] [231734] tags/Safari-606.1.17.3/
Title: [231734] tags/Safari-606.1.17.3/ Revision 231734 Author bshaf...@apple.com Date 2018-05-11 21:36:46 -0700 (Fri, 11 May 2018) Log Message Tag Safari-606.1.17.3. Added Paths tags/Safari-606.1.17.3/ Diff ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [231732] branches/safari-606.1.17-branch/Source/WebCore/PAL
Title: [231732] branches/safari-606.1.17-branch/Source/WebCore/PAL Revision 231732 Author bshaf...@apple.com Date 2018-05-11 21:25:47 -0700 (Fri, 11 May 2018) Log Message Cherry-pick r231731. rdar://problem/39806412 Follow-up build fix to r231721. * pal/cf/CoreMediaSoftLink.cpp: * pal/cf/CoreMediaSoftLink.h: Unify the conditions between the header and the implementation files, and have watchOS and tvOS keyed off iOS. git-svn-id: https://svn.webkit.org/repository/webkit/trunk@231731 268f45cc-cd09-0410-ab3c-d52691b4dbfc Modified Paths branches/safari-606.1.17-branch/Source/WebCore/PAL/ChangeLog branches/safari-606.1.17-branch/Source/WebCore/PAL/pal/cf/CoreMediaSoftLink.cpp branches/safari-606.1.17-branch/Source/WebCore/PAL/pal/cf/CoreMediaSoftLink.h Diff Modified: branches/safari-606.1.17-branch/Source/WebCore/PAL/ChangeLog (231731 => 231732) --- branches/safari-606.1.17-branch/Source/WebCore/PAL/ChangeLog 2018-05-12 04:19:10 UTC (rev 231731) +++ branches/safari-606.1.17-branch/Source/WebCore/PAL/ChangeLog 2018-05-12 04:25:47 UTC (rev 231732) @@ -1,3 +1,27 @@ +2018-05-11 Babak Shafiei+ +Cherry-pick r231731. rdar://problem/39806412 + +Follow-up build fix to r231721. + +* pal/cf/CoreMediaSoftLink.cpp: +* pal/cf/CoreMediaSoftLink.h: + Unify the conditions between the header and the implementation files, and have watchOS and + tvOS keyed off iOS. + + + +git-svn-id: https://svn.webkit.org/repository/webkit/trunk@231731 268f45cc-cd09-0410-ab3c-d52691b4dbfc + +2018-05-11 Dan Bernstein + +Follow-up build fix to r231721. + +* pal/cf/CoreMediaSoftLink.cpp: +* pal/cf/CoreMediaSoftLink.h: + Unify the conditions between the header and the implementation files, and have watchOS and + tvOS keyed off iOS. + 2018-05-11 Jason Marcell Cherry-pick r231721. rdar://problem/39806412 Modified: branches/safari-606.1.17-branch/Source/WebCore/PAL/pal/cf/CoreMediaSoftLink.cpp (231731 => 231732) --- branches/safari-606.1.17-branch/Source/WebCore/PAL/pal/cf/CoreMediaSoftLink.cpp 2018-05-12 04:19:10 UTC (rev 231731) +++ branches/safari-606.1.17-branch/Source/WebCore/PAL/pal/cf/CoreMediaSoftLink.cpp 2018-05-12 04:25:47 UTC (rev 231732) @@ -35,7 +35,7 @@ #include #endif -#if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED <= 12) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED <= 101400) +#if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MAX_ALLOWED < 13) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED < 101500) #define CMSAMPLEBUFFERCALL_NOESCAPE #else #define CMSAMPLEBUFFERCALL_NOESCAPE CF_NOESCAPE Modified: branches/safari-606.1.17-branch/Source/WebCore/PAL/pal/cf/CoreMediaSoftLink.h (231731 => 231732) --- branches/safari-606.1.17-branch/Source/WebCore/PAL/pal/cf/CoreMediaSoftLink.h 2018-05-12 04:19:10 UTC (rev 231731) +++ branches/safari-606.1.17-branch/Source/WebCore/PAL/pal/cf/CoreMediaSoftLink.h 2018-05-12 04:25:47 UTC (rev 231732) @@ -37,7 +37,7 @@ #define SOFTLINK_AVKIT_FRAMEWORK() SOFT_LINK_FRAMEWORK_OPTIONAL(AVKit) #endif -#if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MAX_ALLOWED < 13) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED < 101500) || (PLATFORM(WATCHOS) && __WATCH_OS_VERSION_MAX_ALLOWED < 6) || (PLATFORM(TVOS) && __TV_OS_VERSION_MAX_ALLOWED < 13) +#if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MAX_ALLOWED < 13) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED < 101500) #define CMSAMPLEBUFFERCALL_NOESCAPE #else #define CMSAMPLEBUFFERCALL_NOESCAPE CF_NOESCAPE ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [231731] trunk/Source/WebCore/PAL
Title: [231731] trunk/Source/WebCore/PAL Revision 231731 Author m...@apple.com Date 2018-05-11 21:19:10 -0700 (Fri, 11 May 2018) Log Message Follow-up build fix to r231721. * pal/cf/CoreMediaSoftLink.cpp: * pal/cf/CoreMediaSoftLink.h: Unify the conditions between the header and the implementation files, and have watchOS and tvOS keyed off iOS. Modified Paths trunk/Source/WebCore/PAL/ChangeLog trunk/Source/WebCore/PAL/pal/cf/CoreMediaSoftLink.cpp trunk/Source/WebCore/PAL/pal/cf/CoreMediaSoftLink.h Diff Modified: trunk/Source/WebCore/PAL/ChangeLog (231730 => 231731) --- trunk/Source/WebCore/PAL/ChangeLog 2018-05-12 04:11:16 UTC (rev 231730) +++ trunk/Source/WebCore/PAL/ChangeLog 2018-05-12 04:19:10 UTC (rev 231731) @@ -1,3 +1,12 @@ +2018-05-11 Dan Bernstein+ +Follow-up build fix to r231721. + +* pal/cf/CoreMediaSoftLink.cpp: +* pal/cf/CoreMediaSoftLink.h: + Unify the conditions between the header and the implementation files, and have watchOS and + tvOS keyed off iOS. + 2018-05-11 Jer Noble Add CF_NOESCAPE decorators for tvOS and watchOS Modified: trunk/Source/WebCore/PAL/pal/cf/CoreMediaSoftLink.cpp (231730 => 231731) --- trunk/Source/WebCore/PAL/pal/cf/CoreMediaSoftLink.cpp 2018-05-12 04:11:16 UTC (rev 231730) +++ trunk/Source/WebCore/PAL/pal/cf/CoreMediaSoftLink.cpp 2018-05-12 04:19:10 UTC (rev 231731) @@ -35,7 +35,7 @@ #include #endif -#if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED <= 12) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED <= 101400) +#if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MAX_ALLOWED < 13) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED < 101500) #define CMSAMPLEBUFFERCALL_NOESCAPE #else #define CMSAMPLEBUFFERCALL_NOESCAPE CF_NOESCAPE Modified: trunk/Source/WebCore/PAL/pal/cf/CoreMediaSoftLink.h (231730 => 231731) --- trunk/Source/WebCore/PAL/pal/cf/CoreMediaSoftLink.h 2018-05-12 04:11:16 UTC (rev 231730) +++ trunk/Source/WebCore/PAL/pal/cf/CoreMediaSoftLink.h 2018-05-12 04:19:10 UTC (rev 231731) @@ -37,7 +37,7 @@ #define SOFTLINK_AVKIT_FRAMEWORK() SOFT_LINK_FRAMEWORK_OPTIONAL(AVKit) #endif -#if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MAX_ALLOWED < 13) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED < 101500) || (PLATFORM(WATCHOS) && __WATCH_OS_VERSION_MAX_ALLOWED < 6) || (PLATFORM(TVOS) && __TV_OS_VERSION_MAX_ALLOWED < 13) +#if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MAX_ALLOWED < 13) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED < 101500) #define CMSAMPLEBUFFERCALL_NOESCAPE #else #define CMSAMPLEBUFFERCALL_NOESCAPE CF_NOESCAPE ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [231730] trunk
Title: [231730] trunk Revision 231730 Author dba...@webkit.org Date 2018-05-11 21:11:16 -0700 (Fri, 11 May 2018) Log Message X-Frame-Options: SAMEORIGIN needs to check all ancestor frames https://bugs.webkit.org/show_bug.cgi?id=185567 Reviewed by Brent Fulgham. Source/WebCore: Change the behavior of "X-Frame-Options: SAMEORIGIN" to ensure that all ancestors frames are same-origin with the document that delivered this header. This prevents an intermediary malicious frame from clickjacking a child frame whose document is same-origin with the top- level frame. It also makes the behavior of X-Frame-Options in WebKit more closely match the behavior of X-Frame-Options in other browsers, including Chrome and Firefox. Currently a document delivered with "X-Frame-Options: SAMEORIGIN" must only be same-origin with the top-level frame's document in order to be displayed. This prevents clickjacking by a malicious page that embeds a page delivered with "X-Frame-Options: SAMEORIGIN". However, it does not protect against clickjacking of the "X-Frame-Options: SAMEORIGIN" page (victim) if embedded by an intermediate malicious iframe, say a "rogue ad", that was embedded in a document same origin with the victim page. We should protect against such attacks. Tests: http/tests/security/XFrameOptions/x-frame-options-ancestors-same-origin-allow.html http/tests/security/XFrameOptions/x-frame-options-ancestors-same-origin-deny.html * loader/FrameLoader.cpp: (WebCore::FrameLoader::shouldInterruptLoadForXFrameOptions): Source/WebKit: Change the behavior of "X-Frame-Options: SAMEORIGIN" to ensure that all ancestors frames are same-origin with the document that delivered this header. This prevents an intermediary malicious frame from clickjacking a child frame whose document is same-origin with the top- level frame. It also makes the behavior of X-Frame-Options in WebKit more closely match the behavior of X-Frame-Options in other browsers, including Chrome and Firefox. Currently a document delivered with "X-Frame-Options: SAMEORIGIN" must only be same-origin with the top-level frame's document in order to be displayed. This prevents clickjacking by a malicious page that embeds a page delivered with "X-Frame-Options: SAMEORIGIN". However, it does not protect against clickjacking of the "X-Frame-Options: SAMEORIGIN" page (victim) if embedded by an intermediate malicious iframe, say a "rogue ad", that was embedded in a document same origin with the victim page. We should protect against such attacks. * NetworkProcess/NetworkResourceLoader.cpp: (WebKit::NetworkResourceLoader::shouldInterruptLoadForXFrameOptions): LayoutTests: Add tests to ensure that "X-Frame-Options: SAMEORIGIN" checks ancestor frames. * http/tests/cookies/same-site/fetch-after-navigating-iframe-in-cross-origin-page.html: * http/tests/cookies/same-site/fetch-after-top-level-navigation-initiated-from-iframe-in-cross-origin-page.html: * http/tests/cookies/same-site/fetch-in-cross-origin-iframe.html: * http/tests/resources/echo-iframe-src.php: Copied from LayoutTests/http/tests/cookies/same-site/resources/echo-iframe-src.php. * http/tests/security/XFrameOptions/resources/x-frame-options-ancestors-same-origin-deny.html: Added. * http/tests/security/XFrameOptions/resources/x-frame-options-frame-ancestors-same-origin-allow.cgi: Added. * http/tests/security/XFrameOptions/resources/x-frame-options-frame-ancestors-same-origin-deny.cgi: Added. * http/tests/security/XFrameOptions/x-frame-options-ancestors-same-origin-allow-expected.txt: Added. * http/tests/security/XFrameOptions/x-frame-options-ancestors-same-origin-allow.html: Added. * http/tests/security/XFrameOptions/x-frame-options-ancestors-same-origin-deny-expected.txt: Added. * http/tests/security/XFrameOptions/x-frame-options-ancestors-same-origin-deny.html: Renamed from LayoutTests/http/tests/cookies/same-site/resources/echo-iframe-src.php. Modified Paths trunk/LayoutTests/ChangeLog trunk/LayoutTests/http/tests/cookies/same-site/fetch-after-navigating-iframe-in-cross-origin-page.html trunk/LayoutTests/http/tests/cookies/same-site/fetch-after-top-level-navigation-initiated-from-iframe-in-cross-origin-page.html trunk/LayoutTests/http/tests/cookies/same-site/fetch-in-cross-origin-iframe.html trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/loader/FrameLoader.cpp trunk/Source/WebKit/ChangeLog trunk/Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp Added Paths trunk/LayoutTests/http/tests/resources/echo-iframe-src.php trunk/LayoutTests/http/tests/security/XFrameOptions/resources/x-frame-options-ancestors-same-origin-deny.html trunk/LayoutTests/http/tests/security/XFrameOptions/resources/x-frame-options-frame-ancestors-same-origin-allow.cgi trunk/LayoutTests/http/tests/security/XFrameOptions/resources/x-frame-options-frame-ancestors-same-origin-deny.cgi trunk/LayoutTests/http/tests/security/XFrameOptions/x-frame-options-ancestors-same-origin-allow-expected.txt
[webkit-changes] [231729] trunk/Source/WebKit
Title: [231729] trunk/Source/WebKit Revision 231729 Author d...@apple.com Date 2018-05-11 19:11:05 -0700 (Fri, 11 May 2018) Log Message WKWebViewContentProvider should know what MIME type it was created to handle https://bugs.webkit.org/show_bug.cgi?id=185574 Reviewed by Tim Horton. Pass the MIME type of the downloaded asset into the WKWebViewContentProvider's init method, so it can choose to do something based on that information. The PDF and LegacyPDF views don't care because they, clearly, only handle PDF. But a WKSystemPreviewView can handle multiple types. * UIProcess/API/Cocoa/WKWebView.mm: (-[WKWebView _setHasCustomContentView:loadedMIMEType:]): Send the MIME type on to the WKWebViewContentProvider. * UIProcess/Cocoa/WKWebViewContentProvider.h: Add a new parameter to web_initWithFrame. * UIProcess/ios/WKLegacyPDFView.mm: (-[WKLegacyPDFView web_initWithFrame:webView:mimeType:]): (-[WKLegacyPDFView web_initWithFrame:webView:]): Deleted. * UIProcess/ios/WKPDFView.mm: (-[WKPDFView web_initWithFrame:webView:mimeType:]): (-[WKPDFView web_initWithFrame:webView:]): Deleted. * UIProcess/ios/WKSystemPreviewView.mm: (-[WKSystemPreviewView web_initWithFrame:webView:mimeType:]): (-[WKSystemPreviewView web_setContentProviderData:suggestedFilename:]): Actually use the MIME type to tell QuickLook what it will be getting, rather than basing it on the file extension. (-[WKSystemPreviewView web_initWithFrame:webView:]): Deleted. Modified Paths trunk/Source/WebKit/ChangeLog trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm trunk/Source/WebKit/UIProcess/Cocoa/WKWebViewContentProvider.h trunk/Source/WebKit/UIProcess/ios/WKLegacyPDFView.mm trunk/Source/WebKit/UIProcess/ios/WKPDFView.mm trunk/Source/WebKit/UIProcess/ios/WKSystemPreviewView.mm Diff Modified: trunk/Source/WebKit/ChangeLog (231728 => 231729) --- trunk/Source/WebKit/ChangeLog 2018-05-12 00:39:09 UTC (rev 231728) +++ trunk/Source/WebKit/ChangeLog 2018-05-12 02:11:05 UTC (rev 231729) @@ -1,3 +1,33 @@ +2018-05-11 Dean Jackson+ +WKWebViewContentProvider should know what MIME type it was created to handle +https://bugs.webkit.org/show_bug.cgi?id=185574 + + +Reviewed by Tim Horton. + +Pass the MIME type of the downloaded asset into the WKWebViewContentProvider's +init method, so it can choose to do something based on that information. The +PDF and LegacyPDF views don't care because they, clearly, only handle PDF. But +a WKSystemPreviewView can handle multiple types. + +* UIProcess/API/Cocoa/WKWebView.mm: +(-[WKWebView _setHasCustomContentView:loadedMIMEType:]): Send the MIME type on +to the WKWebViewContentProvider. +* UIProcess/Cocoa/WKWebViewContentProvider.h: Add a new parameter to web_initWithFrame. +* UIProcess/ios/WKLegacyPDFView.mm: +(-[WKLegacyPDFView web_initWithFrame:webView:mimeType:]): +(-[WKLegacyPDFView web_initWithFrame:webView:]): Deleted. +* UIProcess/ios/WKPDFView.mm: +(-[WKPDFView web_initWithFrame:webView:mimeType:]): +(-[WKPDFView web_initWithFrame:webView:]): Deleted. +* UIProcess/ios/WKSystemPreviewView.mm: +(-[WKSystemPreviewView web_initWithFrame:webView:mimeType:]): +(-[WKSystemPreviewView web_setContentProviderData:suggestedFilename:]): Actually use +the MIME type to tell QuickLook what it will be getting, rather than basing it on +the file extension. +(-[WKSystemPreviewView web_initWithFrame:webView:]): Deleted. + 2018-05-11 Brent Fulgham Allow the WebContent process to read global ViewBridge preferences Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm (231728 => 231729) --- trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm 2018-05-12 00:39:09 UTC (rev 231728) +++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm 2018-05-12 02:11:05 UTC (rev 231729) @@ -1457,7 +1457,7 @@ Class representationClass = [[_configuration _contentProviderRegistry] providerForMIMEType:mimeType]; ASSERT(representationClass); -_customContentView = adoptNS([[representationClass alloc] web_initWithFrame:self.bounds webView:self]); +_customContentView = adoptNS([[representationClass alloc] web_initWithFrame:self.bounds webView:self mimeType:mimeType]); _customContentFixedOverlayView = adoptNS([[UIView alloc] initWithFrame:self.bounds]); [_customContentFixedOverlayView layer].name = @"CustomContentFixedOverlay"; [_customContentFixedOverlayView setUserInteractionEnabled:NO]; Modified: trunk/Source/WebKit/UIProcess/Cocoa/WKWebViewContentProvider.h (231728 => 231729) --- trunk/Source/WebKit/UIProcess/Cocoa/WKWebViewContentProvider.h 2018-05-12 00:39:09 UTC (rev 231728) +++ trunk/Source/WebKit/UIProcess/Cocoa/WKWebViewContentProvider.h 2018-05-12 02:11:05 UTC (rev 231729) @@ -42,7 +42,7 @@ @protocol
[webkit-changes] [231728] trunk/Source/WebKit
Title: [231728] trunk/Source/WebKit Revision 231728 Author bfulg...@apple.com Date 2018-05-11 17:39:09 -0700 (Fri, 11 May 2018) Log Message Allow the WebContent process to read global ViewBridge preferences https://bugs.webkit.org/show_bug.cgi?id=185569 Reviewed by Eric Carlson. Allow reads of the global /Library/Preferences/com.apple.ViewBridge.plist preference file. * WebProcess/com.apple.WebProcess.sb.in: Modified Paths trunk/Source/WebKit/ChangeLog trunk/Source/WebKit/WebProcess/com.apple.WebProcess.sb.in Diff Modified: trunk/Source/WebKit/ChangeLog (231727 => 231728) --- trunk/Source/WebKit/ChangeLog 2018-05-11 23:03:36 UTC (rev 231727) +++ trunk/Source/WebKit/ChangeLog 2018-05-12 00:39:09 UTC (rev 231728) @@ -1,3 +1,15 @@ +2018-05-11 Brent Fulgham+ +Allow the WebContent process to read global ViewBridge preferences +https://bugs.webkit.org/show_bug.cgi?id=185569 + + +Reviewed by Eric Carlson. + +Allow reads of the global /Library/Preferences/com.apple.ViewBridge.plist preference file. + +* WebProcess/com.apple.WebProcess.sb.in: + 2018-05-11 Megan Gardner Cleanup canPerformActionForWebView in relation to the webSelectionAssistant being removed Modified: trunk/Source/WebKit/WebProcess/com.apple.WebProcess.sb.in (231727 => 231728) --- trunk/Source/WebKit/WebProcess/com.apple.WebProcess.sb.in 2018-05-11 23:03:36 UTC (rev 231727) +++ trunk/Source/WebKit/WebProcess/com.apple.WebProcess.sb.in 2018-05-12 00:39:09 UTC (rev 231728) @@ -485,6 +485,10 @@ "pbs" ;; Needed for NSAttributedString )) +; (Temporary) backward compatibility with non-CFPreferences readers. +(allow file-read* +(literal "/Library/Preferences/com.apple.ViewBridge.plist")) + ;; On-disk WebKit2 framework location, to account for debug installations outside of /System/Library/Frameworks, ;; and to allow issuing extensions. (allow-read-directory-and-issue-read-extensions (param "WEBKIT2_FRAMEWORK_DIR")) ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [231726] trunk/Source/WebKit
Title: [231726] trunk/Source/WebKit Revision 231726 Author megan_gard...@apple.com Date 2018-05-11 16:03:00 -0700 (Fri, 11 May 2018) Log Message Cleanup canPerformActionForWebView in relation to the webSelectionAssistant being removed https://bugs.webkit.org/show_bug.cgi?id=185536 Reviewed by Tim Horton. The _webSelectionAssistant is now always nil, therefor many of these checks are unnecessary. Remove the check for a webSelection and clean up the logic surrounding those checks. * UIProcess/ios/WKContentViewInteraction.mm: (-[WKContentView canPerformActionForWebView:withSender:]): Modified Paths trunk/Source/WebKit/ChangeLog trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm Diff Modified: trunk/Source/WebKit/ChangeLog (231725 => 231726) --- trunk/Source/WebKit/ChangeLog 2018-05-11 23:01:37 UTC (rev 231725) +++ trunk/Source/WebKit/ChangeLog 2018-05-11 23:03:00 UTC (rev 231726) @@ -1,3 +1,16 @@ +2018-05-11 Megan Gardner+ +Cleanup canPerformActionForWebView in relation to the webSelectionAssistant being removed +https://bugs.webkit.org/show_bug.cgi?id=185536 + +Reviewed by Tim Horton. + +The _webSelectionAssistant is now always nil, therefor many of these checks are unnecessary. +Remove the check for a webSelection and clean up the logic surrounding those checks. + +* UIProcess/ios/WKContentViewInteraction.mm: +(-[WKContentView canPerformActionForWebView:withSender:]): + 2018-05-11 Brady Eidson Followup to: Make sure history navigations reuse the existing process when necessary. Modified: trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm (231725 => 231726) --- trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm 2018-05-11 23:01:37 UTC (rev 231725) +++ trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm 2018-05-11 23:03:00 UTC (rev 231726) @@ -2209,8 +2209,6 @@ - (BOOL)canPerformActionForWebView:(SEL)action withSender:(id)sender { -BOOL hasWebSelection = _webSelectionAssistant && !CGRectIsEmpty(_webSelectionAssistant.get().selectionFrame); - if (action == @selector(_arrowKey:)) return [self isFirstResponder]; @@ -2235,11 +2233,11 @@ if (action == @selector(copy:)) { if (_page->editorState().isInPasswordField) return NO; -return hasWebSelection || _page->editorState().selectionIsRange; +return _page->editorState().selectionIsRange; } if (action == @selector(_define:)) { -if (_page->editorState().isInPasswordField || !(hasWebSelection || _page->editorState().selectionIsRange)) +if (_page->editorState().isInPasswordField || !_page->editorState().selectionIsRange) return NO; NSUInteger textLength = _page->editorState().postLayoutData().selectedTextLength; @@ -2266,11 +2264,11 @@ return NO; #endif -return hasWebSelection || _page->editorState().selectionIsRange; +return _page->editorState().selectionIsRange; } if (action == @selector(_share:)) { -if (_page->editorState().isInPasswordField || !(hasWebSelection || _page->editorState().selectionIsRange)) +if (_page->editorState().isInPasswordField || !_page->editorState().selectionIsRange) return NO; return _page->editorState().postLayoutData().selectedTextLength > 0; @@ -2277,7 +2275,7 @@ } if (action == @selector(_addShortcut:)) { -if (_page->editorState().isInPasswordField || !(hasWebSelection || _page->editorState().selectionIsRange)) +if (_page->editorState().isInPasswordField || !_page->editorState().selectionIsRange) return NO; NSString *selectedText = [self selectedText]; @@ -2311,19 +2309,9 @@ } if (action == @selector(selectAll:)) { -if (_page->editorState().selectionIsNone || ![self hasContent]) -return NO; -if (!_page->editorState().selectionIsRange) +if (!_page->editorState().selectionIsNone && !_page->editorState().selectionIsRange) return YES; -// Enable selectAll for non-editable text, where the user can't access -// this command via long-press to get a caret. -if (_page->editorState().isContentEditable) -return NO; -// Don't attempt selectAll with general web content. -if (hasWebSelection) -return NO; -// FIXME: Only enable if the selection doesn't already span the entire document. -return YES; +return NO; } if (action == @selector(replace:)) ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [231725] trunk/Source/WebCore
Title: [231725] trunk/Source/WebCore Revision 231725 Author dba...@webkit.org Date 2018-05-11 16:01:37 -0700 (Fri, 11 May 2018) Log Message [iOS] Text decoration of dragged content does not paint with opacity https://bugs.webkit.org/show_bug.cgi?id=185551 Reviewed by Wenson Hsieh. Respect alpha when painting the text decoration for dragged content. * rendering/InlineTextBox.cpp: (WebCore::InlineTextBox::MarkedTextStyle::areDecorationMarkedTextStylesEqual): Consider alpha when comparing decoration styles for equality so that we do not coalesce styles with differing alpha. (WebCore::InlineTextBox::paintMarkedTextDecoration): Respect alpha when painting dragged content. Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/rendering/InlineTextBox.cpp Diff Modified: trunk/Source/WebCore/ChangeLog (231724 => 231725) --- trunk/Source/WebCore/ChangeLog 2018-05-11 22:47:19 UTC (rev 231724) +++ trunk/Source/WebCore/ChangeLog 2018-05-11 23:01:37 UTC (rev 231725) @@ -1,3 +1,18 @@ +2018-05-11 Daniel Bates+ +[iOS] Text decoration of dragged content does not paint with opacity +https://bugs.webkit.org/show_bug.cgi?id=185551 + + +Reviewed by Wenson Hsieh. + +Respect alpha when painting the text decoration for dragged content. + +* rendering/InlineTextBox.cpp: +(WebCore::InlineTextBox::MarkedTextStyle::areDecorationMarkedTextStylesEqual): Consider alpha when +comparing decoration styles for equality so that we do not coalesce styles with differing alpha. +(WebCore::InlineTextBox::paintMarkedTextDecoration): Respect alpha when painting dragged content. + 2018-05-11 Nan Wang AX: In role=dialog elements with aria-modal=true VoiceOver iOS/macOS can't manually focus or read dialog paragraph description text inside the modal. Modified: trunk/Source/WebCore/rendering/InlineTextBox.cpp (231724 => 231725) --- trunk/Source/WebCore/rendering/InlineTextBox.cpp 2018-05-11 22:47:19 UTC (rev 231724) +++ trunk/Source/WebCore/rendering/InlineTextBox.cpp 2018-05-11 23:01:37 UTC (rev 231725) @@ -403,7 +403,7 @@ } static bool areDecorationMarkedTextStylesEqual(const MarkedTextStyle& a, const MarkedTextStyle& b) { -return a.textDecorationStyles == b.textDecorationStyles && a.textShadow == b.textShadow; +return a.textDecorationStyles == b.textDecorationStyles && a.textShadow == b.textShadow && a.alpha == b.alpha; } Color backgroundColor; @@ -1075,9 +1075,13 @@ { GraphicsContextStateSaver stateSaver { context, false }; -if (!clipOutRect.isEmpty()) { +bool isDraggedContent = markedText.type == MarkedText::DraggedContent; +if (isDraggedContent || !clipOutRect.isEmpty()) { stateSaver.save(); -context.clipOut(clipOutRect); +if (isDraggedContent) +context.setAlpha(markedText.style.alpha); +if (!clipOutRect.isEmpty()) +context.clipOut(clipOutRect); } decorationPainter.paintTextDecoration(textRun.subRun(startOffset, endOffset - startOffset), textOriginFromBoxRect(snappedSelectionRect), snappedSelectionRect.location()); } ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [231724] branches/safari-606.1.17-branch/Source/WebCore/PAL
Title: [231724] branches/safari-606.1.17-branch/Source/WebCore/PAL Revision 231724 Author jmarc...@apple.com Date 2018-05-11 15:47:19 -0700 (Fri, 11 May 2018) Log Message Cherry-pick r231721. rdar://problem/39806412 Add CF_NOESCAPE decorators for tvOS and watchOS https://bugs.webkit.org/show_bug.cgi?id=185560 Reviewed by Dan Bernstein. * pal/cf/CoreMediaSoftLink.h: git-svn-id: https://svn.webkit.org/repository/webkit/trunk@231721 268f45cc-cd09-0410-ab3c-d52691b4dbfc Modified Paths branches/safari-606.1.17-branch/Source/WebCore/PAL/ChangeLog branches/safari-606.1.17-branch/Source/WebCore/PAL/pal/cf/CoreMediaSoftLink.h Diff Modified: branches/safari-606.1.17-branch/Source/WebCore/PAL/ChangeLog (231723 => 231724) --- branches/safari-606.1.17-branch/Source/WebCore/PAL/ChangeLog 2018-05-11 22:30:45 UTC (rev 231723) +++ branches/safari-606.1.17-branch/Source/WebCore/PAL/ChangeLog 2018-05-11 22:47:19 UTC (rev 231724) @@ -1,3 +1,26 @@ +2018-05-11 Jason Marcell+ +Cherry-pick r231721. rdar://problem/39806412 + +Add CF_NOESCAPE decorators for tvOS and watchOS +https://bugs.webkit.org/show_bug.cgi?id=185560 + +Reviewed by Dan Bernstein. + +* pal/cf/CoreMediaSoftLink.h: + + +git-svn-id: https://svn.webkit.org/repository/webkit/trunk@231721 268f45cc-cd09-0410-ab3c-d52691b4dbfc + +2018-05-11 Jer Noble + +Add CF_NOESCAPE decorators for tvOS and watchOS +https://bugs.webkit.org/show_bug.cgi?id=185560 + +Reviewed by Dan Bernstein. + +* pal/cf/CoreMediaSoftLink.h: + 2018-05-08 Sihui Liu Adopt new async _savecookies SPI for keeping networking process active during flushing cookies Modified: branches/safari-606.1.17-branch/Source/WebCore/PAL/pal/cf/CoreMediaSoftLink.h (231723 => 231724) --- branches/safari-606.1.17-branch/Source/WebCore/PAL/pal/cf/CoreMediaSoftLink.h 2018-05-11 22:30:45 UTC (rev 231723) +++ branches/safari-606.1.17-branch/Source/WebCore/PAL/pal/cf/CoreMediaSoftLink.h 2018-05-11 22:47:19 UTC (rev 231724) @@ -37,7 +37,7 @@ #define SOFTLINK_AVKIT_FRAMEWORK() SOFT_LINK_FRAMEWORK_OPTIONAL(AVKit) #endif -#if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED <= 12) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED <= 101400) +#if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MAX_ALLOWED < 13) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED < 101500) || (PLATFORM(WATCHOS) && __WATCH_OS_VERSION_MAX_ALLOWED < 6) || (PLATFORM(TVOS) && __TV_OS_VERSION_MAX_ALLOWED < 13) #define CMSAMPLEBUFFERCALL_NOESCAPE #else #define CMSAMPLEBUFFERCALL_NOESCAPE CF_NOESCAPE ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [231723] trunk/Source/WebKit
Title: [231723] trunk/Source/WebKit Revision 231723 Author beid...@apple.com Date 2018-05-11 15:30:45 -0700 (Fri, 11 May 2018) Log Message Followup to: Make sure history navigations reuse the existing process when necessary. https://bugs.webkit.org/show_bug.cgi?id=185532 Reviewed by Andy Estes. * UIProcess/WebProcessPool.cpp: (WebKit::WebProcessPool::processForNavigationInternal): When re-using the same process, don't change the policy action. Modified Paths trunk/Source/WebKit/ChangeLog trunk/Source/WebKit/UIProcess/WebProcessPool.cpp Diff Modified: trunk/Source/WebKit/ChangeLog (231722 => 231723) --- trunk/Source/WebKit/ChangeLog 2018-05-11 22:19:03 UTC (rev 231722) +++ trunk/Source/WebKit/ChangeLog 2018-05-11 22:30:45 UTC (rev 231723) @@ -1,3 +1,14 @@ +2018-05-11 Brady Eidson+ +Followup to: Make sure history navigations reuse the existing process when necessary. +https://bugs.webkit.org/show_bug.cgi?id=185532 + +Reviewed by Andy Estes. + +* UIProcess/WebProcessPool.cpp: +(WebKit::WebProcessPool::processForNavigationInternal): When re-using the same process, + don't change the policy action. + 2018-05-11 Charles Vazac Runtime feature flag for Server-Timing Modified: trunk/Source/WebKit/UIProcess/WebProcessPool.cpp (231722 => 231723) --- trunk/Source/WebKit/UIProcess/WebProcessPool.cpp 2018-05-11 22:19:03 UTC (rev 231722) +++ trunk/Source/WebKit/UIProcess/WebProcessPool.cpp 2018-05-11 22:30:45 UTC (rev 231723) @@ -2112,10 +2112,8 @@ // If the target back/forward item and the current back/forward item originated // in the same WebProcess then we should reuse the current WebProcess. if (auto* currentItem = page.backForwardList().currentItem()) { -if (currentItem->itemID().processIdentifier == backForwardListItem->itemID().processIdentifier) { -action = "" +if (currentItem->itemID().processIdentifier == backForwardListItem->itemID().processIdentifier) return page.process(); -} } } ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [231722] trunk/Tools
Title: [231722] trunk/Tools Revision 231722 Author commit-qu...@webkit.org Date 2018-05-11 15:19:03 -0700 (Fri, 11 May 2018) Log Message Test262 Runner should search for the Debug JSC by default https://bugs.webkit.org/show_bug.cgi?id=185562 Patch by Leo Balteron 2018-05-11 Reviewed by Michael Saboff. The Test262 Runner is now searching for the Debug build of JSC by default, not the Release build. This fix allows a similar call from the previous runner, making it compatible with the current build bot configuration parameters. This patch also adds some minor improvements the verbose mode output. * Scripts/test262/Runner.pm: (processCLI): (main): (getBuildPath): (processResult): Modified Paths trunk/Tools/ChangeLog trunk/Tools/Scripts/test262/Runner.pm Diff Modified: trunk/Tools/ChangeLog (231721 => 231722) --- trunk/Tools/ChangeLog 2018-05-11 22:03:06 UTC (rev 231721) +++ trunk/Tools/ChangeLog 2018-05-11 22:19:03 UTC (rev 231722) @@ -1,3 +1,24 @@ +2018-05-11 Leo Balter + +Test262 Runner should search for the Debug JSC by default +https://bugs.webkit.org/show_bug.cgi?id=185562 + +Reviewed by Michael Saboff. + +The Test262 Runner is now searching for the Debug build of JSC by +default, not the Release build. + +This fix allows a similar call from the previous runner, making +it compatible with the current build bot configuration parameters. + +This patch also adds some minor improvements the verbose mode output. + +* Scripts/test262/Runner.pm: +(processCLI): +(main): +(getBuildPath): +(processResult): + 2018-05-11 Charles Vazac Runtime feature flag for Server-Timing Modified: trunk/Tools/Scripts/test262/Runner.pm (231721 => 231722) --- trunk/Tools/Scripts/test262/Runner.pm 2018-05-11 22:03:06 UTC (rev 231721) +++ trunk/Tools/Scripts/test262/Runner.pm 2018-05-11 22:19:03 UTC (rev 231722) @@ -107,7 +107,7 @@ sub processCLI { my $help = 0; -my $debug; +my $release; my $ignoreExpectations; my @features; my $stats; @@ -122,7 +122,7 @@ 'o|test-_only_=s@' => \@cliTestDirs, 'p|child-processes=i' => \$max_process, 'h|help' => \$help, -'d|debug' => \$debug, +'release' => \$release, 'v|verbose' => \$verbose, 'f|features=s@' => \@features, 'c|config=s' => \$configFile, @@ -177,7 +177,7 @@ $DYLD_FRAMEWORK_PATH = dirname($JSC); } } else { -$JSC = getBuildPath($debug); +$JSC = getBuildPath($release); } if ($latestImport) { @@ -278,7 +278,6 @@ } } - # If we are processing many files, fork process if (scalar @files > $max_process * 5) { @@ -457,7 +456,7 @@ } sub getBuildPath { -my $debug = shift; +my $release = shift; # Try to find JSC for user, if not supplied my $cmd = abs_path("$Bin/../webkit-build-directory"); @@ -465,16 +464,15 @@ die 'Error: cannot find webkit-build-directory, specify with JSC with --jsc .'; } -if ($debug) { +if ($release) { +$cmd .= ' --release'; +} else { $cmd .= ' --debug'; -} else { -$cmd .= ' --release'; } $cmd .= ' --executablePath'; my $jscDir = qx($cmd); chomp $jscDir; - my $jsc; $jsc = $jscDir . '/jsc'; @@ -653,17 +651,23 @@ # Print the failure if we haven't loaded an expectation file # or the failure is new. -my $printfailure = !$expect || $isnewfailure; +my $printFailure = !$expect || $isnewfailure; +my $newFail = ''; +$newFail = '! NEW ' if $isnewfailure; +my $failMsg = ''; +$failMsg = "FAIL $file ($scenario)\n" if ($printFailure or $verbose); + +my $suffixMsg = ''; + if ($verbose) { -print "! NEW FAIL $file ($scenario)\n$result"; -print "\nFeatures: " . join(', ', @{ $data->{features} }) if $data->{features}; -print "\n\n"; -} else { -print "! NEW " if $isnewfailure; -print "FAIL $file ($scenario)\n" if $printfailure; +my $featuresList = ''; +$featuresList = "\nFeatures: " . join(', ', @{ $data->{features} }) if $data->{features}; +$suffixMsg = "$result$featuresList\n\n"; } +print "$newFail$failMsg$suffixMsg"; + $resultdata{result} = 'FAIL'; $resultdata{error} = $currentfailure; } elsif ($scenario ne 'skip' && !$currentfailure) { @@ -891,9 +895,9 @@ Specify JSC location. If not provided, script will attempt to look up JSC. -=item B<--debug, -d> +=item B<--release> -Use debug build of JSC. Can only use if --jsc is not provided. Release build of JSC is used by default. +Use the Release build of JSC. Can only use if --jsc is not provided. The
[webkit-changes] [231721] trunk/Source/WebCore/PAL
Title: [231721] trunk/Source/WebCore/PAL Revision 231721 Author jer.no...@apple.com Date 2018-05-11 15:03:06 -0700 (Fri, 11 May 2018) Log Message Add CF_NOESCAPE decorators for tvOS and watchOS https://bugs.webkit.org/show_bug.cgi?id=185560 Reviewed by Dan Bernstein. * pal/cf/CoreMediaSoftLink.h: Modified Paths trunk/Source/WebCore/PAL/ChangeLog trunk/Source/WebCore/PAL/pal/cf/CoreMediaSoftLink.h Diff Modified: trunk/Source/WebCore/PAL/ChangeLog (231720 => 231721) --- trunk/Source/WebCore/PAL/ChangeLog 2018-05-11 21:58:19 UTC (rev 231720) +++ trunk/Source/WebCore/PAL/ChangeLog 2018-05-11 22:03:06 UTC (rev 231721) @@ -1,3 +1,12 @@ +2018-05-11 Jer Noble+ +Add CF_NOESCAPE decorators for tvOS and watchOS +https://bugs.webkit.org/show_bug.cgi?id=185560 + +Reviewed by Dan Bernstein. + +* pal/cf/CoreMediaSoftLink.h: + 2018-05-08 Sihui Liu Adopt new async _savecookies SPI for keeping networking process active during flushing cookies Modified: trunk/Source/WebCore/PAL/pal/cf/CoreMediaSoftLink.h (231720 => 231721) --- trunk/Source/WebCore/PAL/pal/cf/CoreMediaSoftLink.h 2018-05-11 21:58:19 UTC (rev 231720) +++ trunk/Source/WebCore/PAL/pal/cf/CoreMediaSoftLink.h 2018-05-11 22:03:06 UTC (rev 231721) @@ -37,7 +37,7 @@ #define SOFTLINK_AVKIT_FRAMEWORK() SOFT_LINK_FRAMEWORK_OPTIONAL(AVKit) #endif -#if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED <= 12) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED <= 101400) +#if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MAX_ALLOWED < 13) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED < 101500) || (PLATFORM(WATCHOS) && __WATCH_OS_VERSION_MAX_ALLOWED < 6) || (PLATFORM(TVOS) && __TV_OS_VERSION_MAX_ALLOWED < 13) #define CMSAMPLEBUFFERCALL_NOESCAPE #else #define CMSAMPLEBUFFERCALL_NOESCAPE CF_NOESCAPE ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [231720] trunk
Title: [231720] trunk Revision 231720 Author n_w...@apple.com Date 2018-05-11 14:58:19 -0700 (Fri, 11 May 2018) Log Message AX: In role=dialog elements with aria-modal=true VoiceOver iOS/macOS can't manually focus or read dialog paragraph description text inside the modal. https://bugs.webkit.org/show_bug.cgi?id=185219 Reviewed by Chris Fleizach. Source/WebCore: The text node descendants of a modal dialog are ignored. Fixed it by using AccessibilityObject's node() to determine if it's the descendant of the modal dialog node. Test: accessibility/aria-modal-text-descendants.html * accessibility/AccessibilityObject.cpp: (WebCore::AccessibilityObject::isModalDescendant const): LayoutTests: * accessibility/aria-modal-text-descendants-expected.txt: Added. * accessibility/aria-modal-text-descendants.html: Added. Modified Paths trunk/LayoutTests/ChangeLog trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/accessibility/AccessibilityObject.cpp Added Paths trunk/LayoutTests/accessibility/aria-modal-text-descendants-expected.txt trunk/LayoutTests/accessibility/aria-modal-text-descendants.html Diff Modified: trunk/LayoutTests/ChangeLog (231719 => 231720) --- trunk/LayoutTests/ChangeLog 2018-05-11 21:16:05 UTC (rev 231719) +++ trunk/LayoutTests/ChangeLog 2018-05-11 21:58:19 UTC (rev 231720) @@ -1,3 +1,14 @@ +2018-05-11 Nan Wang+ +AX: In role=dialog elements with aria-modal=true VoiceOver iOS/macOS can't manually focus or read dialog paragraph description text inside the modal. +https://bugs.webkit.org/show_bug.cgi?id=185219 + + +Reviewed by Chris Fleizach. + +* accessibility/aria-modal-text-descendants-expected.txt: Added. +* accessibility/aria-modal-text-descendants.html: Added. + 2018-05-11 Ryosuke Niwa Tapping after CSS-based table casues an infinite loop in wordRangeFromPosition Added: trunk/LayoutTests/accessibility/aria-modal-text-descendants-expected.txt (0 => 231720) --- trunk/LayoutTests/accessibility/aria-modal-text-descendants-expected.txt (rev 0) +++ trunk/LayoutTests/accessibility/aria-modal-text-descendants-expected.txt 2018-05-11 21:58:19 UTC (rev 231720) @@ -0,0 +1,17 @@ +This tests text descendants of modal dialog are accessible. + +On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". + + +PASS backgroundAccessible() is false +PASS text.isIgnored is false +PASS successfullyParsed is true + +TEST COMPLETE +Other page content with a dummy focusable element + +Display a dialog + +Just an example. + +text Added: trunk/LayoutTests/accessibility/aria-modal-text-descendants.html (0 => 231720) --- trunk/LayoutTests/accessibility/aria-modal-text-descendants.html (rev 0) +++ trunk/LayoutTests/accessibility/aria-modal-text-descendants.html 2018-05-11 21:58:19 UTC (rev 231720) @@ -0,0 +1,49 @@ + + + + + + + + + + ++ +++ + +Just an example.
+text
+