Title: [232284] trunk/Source
- Revision
- 232284
- Author
- timothy_hor...@apple.com
- Date
- 2018-05-29 20:36:34 -0700 (Tue, 29 May 2018)
Log Message
Fix the build
https://bugs.webkit.org/show_bug.cgi?id=186078
Unreviewed build fix.
Source/WebKit:
* UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView _denyNextUserMediaRequest]):
Source/WTF:
* wtf/Platform.h:
Modified Paths
Diff
Modified: trunk/Source/WTF/ChangeLog (232283 => 232284)
--- trunk/Source/WTF/ChangeLog 2018-05-30 00:47:00 UTC (rev 232283)
+++ trunk/Source/WTF/ChangeLog 2018-05-30 03:36:34 UTC (rev 232284)
@@ -1,3 +1,12 @@
+2018-05-29 Tim Horton <timothy_hor...@apple.com>
+
+ Fix the build
+ https://bugs.webkit.org/show_bug.cgi?id=186078
+
+ Unreviewed build fix.
+
+ * wtf/Platform.h:
+
2018-05-29 Saam Barati <sbar...@apple.com>
JSC should put bmalloc's scavenger into mini mode
Modified: trunk/Source/WTF/wtf/Platform.h (232283 => 232284)
--- trunk/Source/WTF/wtf/Platform.h 2018-05-30 00:47:00 UTC (rev 232283)
+++ trunk/Source/WTF/wtf/Platform.h 2018-05-30 03:36:34 UTC (rev 232284)
@@ -1033,7 +1033,7 @@
#define HAVE_PARENTAL_CONTROLS 1
#endif
-#if !PLATFORM(APPLETV)
+#if !PLATFORM(APPLETV) && (!ENABLE(MINIMAL_SIMULATOR) || __IPHONE_OS_VERSION_MIN_REQUIRED < 130000)
#define HAVE_AVKIT 1
#endif
Modified: trunk/Source/WebKit/ChangeLog (232283 => 232284)
--- trunk/Source/WebKit/ChangeLog 2018-05-30 00:47:00 UTC (rev 232283)
+++ trunk/Source/WebKit/ChangeLog 2018-05-30 03:36:34 UTC (rev 232284)
@@ -1,3 +1,13 @@
+2018-05-29 Tim Horton <timothy_hor...@apple.com>
+
+ Fix the build
+ https://bugs.webkit.org/show_bug.cgi?id=186078
+
+ Unreviewed build fix.
+
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView _denyNextUserMediaRequest]):
+
2018-05-29 Andy Estes <aes...@apple.com>
[Wi-Fi Assertions] Track whether WiFiAssertionHolder should actually hold a Wi-Fi assertion
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm (232283 => 232284)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm 2018-05-30 00:47:00 UTC (rev 232283)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm 2018-05-30 03:36:34 UTC (rev 232284)
@@ -6386,7 +6386,9 @@
- (void)_denyNextUserMediaRequest
{
+#if ENABLE(MEDIA_STREAM)
WebKit::UserMediaProcessManager::singleton().denyNextUserMediaRequest();
+#endif
}
@end
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
