Title: [210702] branches/safari-603-branch/Tools
- Revision
- 210702
- Author
- matthew_han...@apple.com
- Date
- 2017-01-12 22:10:08 -0800 (Thu, 12 Jan 2017)
Log Message
Merge r210608. rdar://problem/15307582
Modified Paths
Diff
Modified: branches/safari-603-branch/Tools/ChangeLog (210701 => 210702)
--- branches/safari-603-branch/Tools/ChangeLog 2017-01-13 06:10:06 UTC (rev 210701)
+++ branches/safari-603-branch/Tools/ChangeLog 2017-01-13 06:10:08 UTC (rev 210702)
@@ -1,5 +1,16 @@
2017-01-12 Matthew Hanson <matthew_han...@apple.com>
+ Merge r210608. rdar://problem/15307582
+
+ 2017-01-11 Brent Fulgham <bfulg...@apple.com>
+
+ Unreviewed test fix after r210599.
+
+ * TestWebKitAPI/Tests/WebKit2/WKPageIsPlayingAudio.cpp:
+ (TestWebKitAPI::TEST): Remove debugging code that was causing a timeout.
+
+2017-01-12 Matthew Hanson <matthew_han...@apple.com>
+
Merge r210600. rdar://problem/15307582
2017-01-11 Brent Fulgham <bfulg...@apple.com>
Modified: branches/safari-603-branch/Tools/TestWebKitAPI/Tests/WebKit2/WKPageIsPlayingAudio.cpp (210701 => 210702)
--- branches/safari-603-branch/Tools/TestWebKitAPI/Tests/WebKit2/WKPageIsPlayingAudio.cpp 2017-01-13 06:10:06 UTC (rev 210701)
+++ branches/safari-603-branch/Tools/TestWebKitAPI/Tests/WebKit2/WKPageIsPlayingAudio.cpp 2017-01-13 06:10:08 UTC (rev 210702)
@@ -118,13 +118,6 @@
{
WKRetainPtr<WKContextRef> context = adoptWK(WKContextCreate());
- bool keepOnKeepingOn = true;
- size_t i = 0;
- while (keepOnKeepingOn) {
- ++i;
- sleep(1);
- }
-
WKRetainPtr<WKPageGroupRef> pageGroup(AdoptWK, WKPageGroupCreateWithIdentifier(Util::toWK("MSEIsPlayingAudioPageGroup").get()));
WKPreferencesRef preferences = WKPageGroupGetPreferences(pageGroup.get());
WKPreferencesSetMediaSourceEnabled(preferences, true);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
