Title: [288826] trunk/Source/WebKit
Revision
288826
Author
[email protected]
Date
2022-01-31 11:51:51 -0800 (Mon, 31 Jan 2022)

Log Message

[iOS][WP] Restrict image decoders
https://bugs.webkit.org/show_bug.cgi?id=234175
<rdar://problem/86650455>

Unreviewed, addressing additional review comments.


* Shared/WebProcessCreationParameters.cpp:
(WebKit::WebProcessCreationParameters::encode const):
(WebKit::WebProcessCreationParameters::decode):
* Shared/WebProcessCreationParameters.h:

Modified Paths

Diff

Modified: trunk/Source/WebKit/ChangeLog (288825 => 288826)


--- trunk/Source/WebKit/ChangeLog	2022-01-31 19:36:30 UTC (rev 288825)
+++ trunk/Source/WebKit/ChangeLog	2022-01-31 19:51:51 UTC (rev 288826)
@@ -1,5 +1,18 @@
 2022-01-31  Per Arne Vollan  <[email protected]>
 
+        [iOS][WP] Restrict image decoders
+        https://bugs.webkit.org/show_bug.cgi?id=234175
+        <rdar://problem/86650455>
+
+        Unreviewed, addressing additional review comments.
+
+        * Shared/WebProcessCreationParameters.cpp:
+        (WebKit::WebProcessCreationParameters::encode const):
+        (WebKit::WebProcessCreationParameters::decode):
+        * Shared/WebProcessCreationParameters.h:
+
+2022-01-31  Per Arne Vollan  <[email protected]>
+
         [WP] Remove PostScript conversion code
         https://bugs.webkit.org/show_bug.cgi?id=235892
         <rdar://88172449>

Modified: trunk/Source/WebKit/Shared/WebProcessCreationParameters.cpp (288825 => 288826)


--- trunk/Source/WebKit/Shared/WebProcessCreationParameters.cpp	2022-01-31 19:36:30 UTC (rev 288825)
+++ trunk/Source/WebKit/Shared/WebProcessCreationParameters.cpp	2022-01-31 19:51:51 UTC (rev 288826)
@@ -166,7 +166,9 @@
     encoder << launchServicesExtensionHandle;
 
 #if HAVE(VIDEO_RESTRICTED_DECODING)
+#if PLATFORM(MAC)
     encoder << videoDecoderExtensionHandles;
+#endif
     encoder << restrictImageAndVideoDecoders;
 #endif
 
@@ -471,17 +473,18 @@
     parameters.launchServicesExtensionHandle = WTFMove(*launchServicesExtensionHandle);
 
 #if HAVE(VIDEO_RESTRICTED_DECODING)
+#if PLATFORM(MAC)
     std::optional<Vector<SandboxExtension::Handle>> videoDecoderExtensionHandles;
     decoder >> videoDecoderExtensionHandles;
     if (!videoDecoderExtensionHandles)
         return false;
     parameters.videoDecoderExtensionHandles = WTFMove(*videoDecoderExtensionHandles);
-
+#endif
     std::optional<bool> restrictImageAndVideoDecoders;
     decoder >> restrictImageAndVideoDecoders;
     if (!restrictImageAndVideoDecoders)
         return false;
-    parameters.restrictImageAndVideoDecoders = WTFMove(*restrictImageAndVideoDecoders);
+    parameters.restrictImageAndVideoDecoders = *restrictImageAndVideoDecoders;
 #endif
 
 #if PLATFORM(IOS_FAMILY)

Modified: trunk/Source/WebKit/Shared/WebProcessCreationParameters.h (288825 => 288826)


--- trunk/Source/WebKit/Shared/WebProcessCreationParameters.h	2022-01-31 19:36:30 UTC (rev 288825)
+++ trunk/Source/WebKit/Shared/WebProcessCreationParameters.h	2022-01-31 19:51:51 UTC (rev 288826)
@@ -204,7 +204,9 @@
     std::optional<SandboxExtension::Handle> mobileGestaltExtensionHandle;
     std::optional<SandboxExtension::Handle> launchServicesExtensionHandle;
 #if HAVE(VIDEO_RESTRICTED_DECODING)
+#if PLATFORM(MAC)
     Vector<SandboxExtension::Handle> videoDecoderExtensionHandles;
+#endif
     bool restrictImageAndVideoDecoders { false };
 #endif
 
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to