Title: [203591] branches/safari-602-branch/Tools
- Revision
- 203591
- Author
- [email protected]
- Date
- 2016-07-22 02:38:51 -0700 (Fri, 22 Jul 2016)
Log Message
Merge r203540. rdar://problem/26964090
Modified Paths
Diff
Modified: branches/safari-602-branch/Tools/ChangeLog (203590 => 203591)
--- branches/safari-602-branch/Tools/ChangeLog 2016-07-22 09:38:47 UTC (rev 203590)
+++ branches/safari-602-branch/Tools/ChangeLog 2016-07-22 09:38:51 UTC (rev 203591)
@@ -1,5 +1,22 @@
2016-07-22 Babak Shafiei <[email protected]>
+ Merge r203540. rdar://problem/26964090
+
+ 2016-07-21 Myles C. Maxfield <[email protected]>
+
+ Follow-up patch to r203520
+ https://bugs.webkit.org/show_bug.cgi?id=159967
+ <rdar://problem/26964090>
+
+ Unreviewed.
+
+ * DumpRenderTree/mac/DumpRenderTree.mm:
+ (setDefaultsToConsistentValuesForTesting):
+ * WebKitTestRunner/TestController.cpp:
+ (WTR::TestController::resetPreferencesToConsistentValues):
+
+2016-07-22 Babak Shafiei <[email protected]>
+
Merge r203520. rdar://problem/26964090
2016-07-21 Myles C. Maxfield <[email protected]>
Modified: branches/safari-602-branch/Tools/DumpRenderTree/mac/DumpRenderTree.mm (203590 => 203591)
--- branches/safari-602-branch/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2016-07-22 09:38:47 UTC (rev 203590)
+++ branches/safari-602-branch/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2016-07-22 09:38:51 UTC (rev 203591)
@@ -1018,6 +1018,8 @@
WebKitFullScreenEnabledPreferenceKey: @YES,
WebKitAllowsInlineMediaPlaybackPreferenceKey: @YES,
WebKitInlineMediaPlaybackRequiresPlaysInlineAttributeKey: @NO,
+ WebKitAllowsInlineMediaPlaybackWithPlaysInlineAttributeKey: @NO,
+ WebKitAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttributeKey: @NO,
@"UseWebKitWebInspector": @YES,
#if !PLATFORM(IOS)
@"NSPreferredSpellServerLanguage": @"en_US",
Modified: branches/safari-602-branch/Tools/WebKitTestRunner/TestController.cpp (203590 => 203591)
--- branches/safari-602-branch/Tools/WebKitTestRunner/TestController.cpp 2016-07-22 09:38:47 UTC (rev 203590)
+++ branches/safari-602-branch/Tools/WebKitTestRunner/TestController.cpp 2016-07-22 09:38:51 UTC (rev 203591)
@@ -685,6 +685,8 @@
WKPreferencesSetMediaPlaybackAllowsInline(preferences, true);
WKPreferencesSetInlineMediaPlaybackRequiresPlaysInlineAttribute(preferences, false);
+ WKPreferencesSetAllowsInlineMediaPlaybackWithPlaysInlineAttribute(preferences, false);
+ WKPreferencesSetAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute(preferences, false);
WKCookieManagerDeleteAllCookies(WKContextGetCookieManager(m_context.get()));
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
