Changeset 153023 in webkit

Timestamp:

Jul 22, 2013, 6:47:40 PM (12 years ago)

Author:

Lucas Forschler

Message:

Merged r152787. <rdar://problem/14418799>

Location:

branches/safari-537-branch/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Resources/PlugInSandboxProfiles/com.apple.WebKit.plugin-common.sb (modified) (1 diff)
• Resources/PlugInSandboxProfiles/com.macromedia.Flash Player.plugin.sb (modified) (2 diffs)

branches/safari-537-branch/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-07-22  Lucas Forschler  <lforschler@apple.com>
+
+        Merge r152787
+
+    2013-07-17  Simon Cooper  <scooper@apple.com>
+
+            YouTube webcam capture (Flash Plug-in) in Safari can't see built-in camera
+            https://bugs.webkit.org/show_bug.cgi?id=118787
+            <rdar://problem/14418799>
+
+            Reviewed by Alexey Proskuryakov.
+
+            Add support for built-in cameras, including the original iSight.
+
+            * Resources/PlugInSandboxProfiles/com.apple.WebKit.plugin-common.sb:
+            * Resources/PlugInSandboxProfiles/com.macromedia.Flash Player.plugin.sb:
+
 2013-07-22  Lucas Forschler  <lforschler@apple.com>
 

branches/safari-537-branch/Source/WebKit2/Resources/PlugInSandboxProfiles/com.apple.WebKit.plugin-common.sb

@@ -291 +291 @@
     (allow appleevent-send (appleevent-destination "com.apple.imagecaptureextension2")))
 
+;; Camera
+(define (webkit-camera)
+    (allow mach-lookup (extension "com.apple.app-sandbox.mach"))
+    (allow mach-lookup
+        (global-name "com.apple.cmio.AppleCameraAssistant")
+        ;; Apple DAL assistants
+        (global-name "com.apple.cmio.VDCAssistant")
+        (global-name "com.apple.cmio.AVCAssistant")
+        (global-name "com.apple.cmio.IIDCVideoAssistant")
+        ;; QuickTimeIIDCDigitizer assistant
+        (global-name "com.apple.IIDCAssistant"))
+    (allow iokit-open
+        ;; QuickTimeUSBVDCDigitizer
+        (iokit-user-client-class "IOUSBDeviceUserClientV2")
+        (iokit-user-client-class "IOUSBInterfaceUserClientV2"))
+    (allow device-camera))
+
+;; Microphone
+(define (webkit-microphone)
+    (allow device-microphone))
+
 (allow ipc-posix-shm*
     (ipc-posix-name-regex #"^AudioIO")

branches/safari-537-branch/Source/WebKit2/Resources/PlugInSandboxProfiles/com.macromedia.Flash Player.plugin.sb

@@ +1 @@
+(webkit-powerbox)
+(webkit-printing)
+(webkit-camera)
+(webkit-microphone)
+
 (allow ipc-posix-sem
     (ipc-posix-name "MacromediaSemaphoreDig")
@@ -35 +40 @@
 (allow network-bind (local ip))
 
-(webkit-powerbox)
-(webkit-printing)