Attachment 341550 Details for Bug 186078 – Patch

[patch] Patch

bug-186078-20180529195655.patch (text/plain), 2.16 KB, created by Tim Horton on 2018-05-29 19:56:55 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Tim Horton

Created: 2018-05-29 19:56:55 PDT

Size: 2.16 KB

patch

obsolete

>Subversion Revision: 232276
>diff --git a/Source/WTF/ChangeLog b/Source/WTF/ChangeLog
>index 840b169b92fd3f8f91c281d21617b0724200117b..3457b133ea23a450c0e82d36af2c9bb035372fdd 100644
>--- a/Source/WTF/ChangeLog
>+++ b/Source/WTF/ChangeLog
>@@ -1,3 +1,12 @@
>+2018-05-29  Tim Horton  <timothy_horton@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  <sbarati@apple.com>
> 
>         JSC should put bmalloc's scavenger into mini mode
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 721f472207f7c367ab2428143d1f8ab9e6bd5e46..f440def7a1e7ac1c7e5d0c6368250102992ab8b4 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,13 @@
>+2018-05-29  Tim Horton  <timothy_horton@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-25  Jiewen Tan  <jiewen_tan@apple.com>
> 
>         Tighten sandbox profiles for Networking Processes to restrict accesses to macOS/iOS Keychains
>diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h
>index dc181431e94b350806b18860feb290cb7a3462b1..efb2eb77c84a18c6981008ceea8e8ecfb1834221 100644
>--- a/Source/WTF/wtf/Platform.h
>+++ b/Source/WTF/wtf/Platform.h
>@@ -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
> 
>diff --git a/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm b/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm
>index 9ef6f7d16ca4c4ff01dc4a3d6079c2f6a554c2a5..6719b0056a63c94d49a865c2bb162e66d02f9d7f 100644
>--- a/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm
>+++ b/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm
>@@ -6386,7 +6386,9 @@ - (void)_setDefersLoadingForTesting:(BOOL)defersLoading
> 
> - (void)_denyNextUserMediaRequest
> {
>+#if ENABLE(MEDIA_STREAM)
>     WebKit::UserMediaProcessManager::singleton().denyNextUserMediaRequest();
>+#endif
> }
> @end
>

Actions: View | Formatted Diff | Diff

Attachments on bug 186078: 341549 | 341550