Title: [206287] branches/safari-602-branch/Tools
- Revision
- 206287
- Author
- bshaf...@apple.com
- Date
- 2016-09-22 19:10:53 -0700 (Thu, 22 Sep 2016)
Log Message
Merge r206038. rdar://problem/28086237
Modified Paths
Diff
Modified: branches/safari-602-branch/Tools/ChangeLog (206286 => 206287)
--- branches/safari-602-branch/Tools/ChangeLog 2016-09-23 02:10:48 UTC (rev 206286)
+++ branches/safari-602-branch/Tools/ChangeLog 2016-09-23 02:10:53 UTC (rev 206287)
@@ -1,5 +1,22 @@
2016-09-22 Babak Shafiei <bshaf...@apple.com>
+ Merge r206038. rdar://problem/28086237
+
+ 2016-09-16 Wenson Hsieh <wenson_hs...@apple.com>
+
+ RequiresUserActionForPlayback TestWebKitAPI tests are broken after r206033.
+ https://bugs.webkit.org/show_bug.cgi?id=162080
+
+ Reviewed by Jer Noble.
+
+ I renamed "playingHandler" to the more generalized "testHandler", but did not realize that the
+ RequiresUserActionForPlayback tests also used "playingHandler". Renames the handler to account for this change.
+
+ * TestWebKitAPI/Tests/WebKit2Cocoa/RequiresUserActionForPlayback.mm:
+ (RequiresUserActionForPlaybackTest::SetUp):
+
+2016-09-22 Babak Shafiei <bshaf...@apple.com>
+
Merge r206033. rdar://problem/28086237
2016-09-16 Wenson Hsieh <wenson_hs...@apple.com>
Modified: branches/safari-602-branch/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/RequiresUserActionForPlayback.mm (206286 => 206287)
--- branches/safari-602-branch/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/RequiresUserActionForPlayback.mm 2016-09-23 02:10:48 UTC (rev 206286)
+++ branches/safari-602-branch/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/RequiresUserActionForPlayback.mm 2016-09-23 02:10:53 UTC (rev 206287)
@@ -72,7 +72,7 @@
{
handler = adoptNS([[RequiresUserActionForPlaybackMessageHandler alloc] init]);
configuration = adoptNS([[WKWebViewConfiguration alloc] init]);
- [[configuration userContentController] addScriptMessageHandler:handler.get() name:@"playingHandler"];
+ [[configuration userContentController] addScriptMessageHandler:handler.get() name:@"testHandler"];
configuration.get()._mediaDataLoadsAutomatically = YES;
#if TARGET_OS_IPHONE
configuration.get().allowsInlineMediaPlayback = YES;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
