<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[171273] branches/safari-537.78-branch/Source/WebKit2</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/171273">171273</a></dd>
<dt>Author</dt> <dd>lforschler@apple.com</dd>
<dt>Date</dt> <dd>2014-07-19 16:31:14 -0700 (Sat, 19 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/169448">r169448</a>. <rdar://problem/17684663></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari53778branchSourceWebKit2ChangeLog">branches/safari-537.78-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari53778branchSourceWebKit2ResourcesPlugInSandboxProfilescomappleWebKitplugincommonsb">branches/safari-537.78-branch/Source/WebKit2/Resources/PlugInSandboxProfiles/com.apple.WebKit.plugin-common.sb</a></li>
<li><a href="#branchessafari53778branchSourceWebKit2WebKit2xcodeprojprojectpbxproj">branches/safari-537.78-branch/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari53778branchSourceWebKit2ResourcesPlugInSandboxProfilescomappleappstoreCodeRedeemerNetscapePluginsb">branches/safari-537.78-branch/Source/WebKit2/Resources/PlugInSandboxProfiles/com.apple.appstore.CodeRedeemerNetscapePlugin.sb</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari53778branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-537.78-branch/Source/WebKit2/ChangeLog (171272 => 171273)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.78-branch/Source/WebKit2/ChangeLog 2014-07-19 23:19:28 UTC (rev 171272)
+++ branches/safari-537.78-branch/Source/WebKit2/ChangeLog 2014-07-19 23:31:14 UTC (rev 171273)
</span><span class="lines">@@ -1,5 +1,23 @@
</span><span class="cx"> 2014-07-19 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><ins>+ Merge r169448
+
+ 2014-05-29 Alexey Proskuryakov <ap@apple.com>
+
+ Add a sandbox profile for com.apple.appstore.CodeRedeemerNetscapePlugin
+ https://bugs.webkit.org/show_bug.cgi?id=133360
+
+ Reviewed by Sam Weinig.
+
+ * Resources/PlugInSandboxProfiles/com.apple.WebKit.plugin-common.sb: Looks like
+ anyone using camera would need access to CoreMedia preferences.
+
+ * Resources/PlugInSandboxProfiles/com.apple.appstore.CodeRedeemerNetscapePlugin.sb: Added.
+
+ * WebKit2.xcodeproj/project.pbxproj: Added the profile.
+
+2014-07-19 Lucas Forschler <lforschler@apple.com>
+
</ins><span class="cx"> Merge r169757
</span><span class="cx">
</span><span class="cx"> 2014-06-10 Alexey Proskuryakov <ap@apple.com>
</span></span></pre></div>
<a id="branchessafari53778branchSourceWebKit2ResourcesPlugInSandboxProfilescomappleWebKitplugincommonsb"></a>
<div class="modfile"><h4>Modified: branches/safari-537.78-branch/Source/WebKit2/Resources/PlugInSandboxProfiles/com.apple.WebKit.plugin-common.sb (171272 => 171273)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.78-branch/Source/WebKit2/Resources/PlugInSandboxProfiles/com.apple.WebKit.plugin-common.sb 2014-07-19 23:19:28 UTC (rev 171272)
+++ branches/safari-537.78-branch/Source/WebKit2/Resources/PlugInSandboxProfiles/com.apple.WebKit.plugin-common.sb 2014-07-19 23:31:14 UTC (rev 171273)
</span><span class="lines">@@ -323,6 +323,7 @@
</span><span class="cx">
</span><span class="cx"> ;; Camera
</span><span class="cx"> (define (webkit-camera)
</span><ins>+ (shared-preferences-read "com.apple.coremedia")
</ins><span class="cx"> (allow mach-lookup (extension "com.apple.app-sandbox.mach"))
</span><span class="cx"> (allow mach-lookup
</span><span class="cx"> (global-name "com.apple.cmio.AppleCameraAssistant")
</span></span></pre></div>
<a id="branchessafari53778branchSourceWebKit2ResourcesPlugInSandboxProfilescomappleappstoreCodeRedeemerNetscapePluginsbfromrev169448trunkSourceWebKit2ResourcesPlugInSandboxProfilescomappleappstoreCodeRedeemerNetscapePluginsb"></a>
<div class="copfile"><h4>Copied: branches/safari-537.78-branch/Source/WebKit2/Resources/PlugInSandboxProfiles/com.apple.appstore.CodeRedeemerNetscapePlugin.sb (from rev 169448, trunk/Source/WebKit2/Resources/PlugInSandboxProfiles/com.apple.appstore.CodeRedeemerNetscapePlugin.sb) (0 => 171273)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.78-branch/Source/WebKit2/Resources/PlugInSandboxProfiles/com.apple.appstore.CodeRedeemerNetscapePlugin.sb (rev 0)
+++ branches/safari-537.78-branch/Source/WebKit2/Resources/PlugInSandboxProfiles/com.apple.appstore.CodeRedeemerNetscapePlugin.sb 2014-07-19 23:31:14 UTC (rev 171273)
</span><span class="lines">@@ -0,0 +1,24 @@
</span><ins>+; Copyright (C) 2014 Apple Inc. All rights reserved.
+;
+; Redistribution and use in source and binary forms, with or without
+; modification, are permitted provided that the following conditions
+; are met:
+; 1. Redistributions of source code must retain the above copyright
+; notice, this list of conditions and the following disclaimer.
+; 2. Redistributions in binary form must reproduce the above copyright
+; notice, this list of conditions and the following disclaimer in the
+; documentation and/or other materials provided with the distribution.
+;
+; THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+; AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+; THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+; PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+; BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+; CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+; SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+; INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+; CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+; ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+; THE POSSIBILITY OF SUCH DAMAGE.
+
+(webkit-camera)
</ins></span></pre></div>
<a id="branchessafari53778branchSourceWebKit2WebKit2xcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: branches/safari-537.78-branch/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (171272 => 171273)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.78-branch/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2014-07-19 23:19:28 UTC (rev 171272)
+++ branches/safari-537.78-branch/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2014-07-19 23:31:14 UTC (rev 171273)
</span><span class="lines">@@ -1166,6 +1166,7 @@
</span><span class="cx"> E18E6918169B667B009B6670 /* SecItemShimProxyMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = E18E6914169B667B009B6670 /* SecItemShimProxyMessages.h */; };
</span><span class="cx"> E19582D3153CBFD700B60875 /* PDFKitImports.h in Headers */ = {isa = PBXBuildFile; fileRef = E19582D2153CBFD700B60875 /* PDFKitImports.h */; };
</span><span class="cx"> E19582D6153CC05400B60875 /* PDFKitImports.mm in Sources */ = {isa = PBXBuildFile; fileRef = E19582D4153CC05300B60875 /* PDFKitImports.mm */; };
</span><ins>+ E19BDA86193665E300B97F57 /* com.apple.appstore.CodeRedeemerNetscapePlugin.sb in Copy Plug-in Sandbox Profiles */ = {isa = PBXBuildFile; fileRef = E19BDA8419365F4B00B97F57 /* com.apple.appstore.CodeRedeemerNetscapePlugin.sb */; };
</ins><span class="cx"> E199875E142C045400BB2DE7 /* SimplePDFPlugin.mm in Sources */ = {isa = PBXBuildFile; fileRef = E199875C142BFC9700BB2DE7 /* SimplePDFPlugin.mm */; };
</span><span class="cx"> E1A31732134CEA6C007C9A4F /* AttributedString.h in Headers */ = {isa = PBXBuildFile; fileRef = E1A31731134CEA6C007C9A4F /* AttributedString.h */; };
</span><span class="cx"> E1A31735134CEA80007C9A4F /* AttributedString.mm in Sources */ = {isa = PBXBuildFile; fileRef = E1A31734134CEA80007C9A4F /* AttributedString.mm */; };
</span><span class="lines">@@ -1435,6 +1436,7 @@
</span><span class="cx"> 7CB16FF31724BA2F007A0A95 /* com.microsoft.SilverlightPlugin.sb in Copy Plug-in Sandbox Profiles */,
</span><span class="cx"> 7CB16FF41724BA30007A0A95 /* com.oracle.java.JavaAppletPlugin.sb in Copy Plug-in Sandbox Profiles */,
</span><span class="cx"> 7CB16FF11724BA26007A0A95 /* com.apple.WebKit.plugin-common.sb in Copy Plug-in Sandbox Profiles */,
</span><ins>+ E19BDA86193665E300B97F57 /* com.apple.appstore.CodeRedeemerNetscapePlugin.sb in Copy Plug-in Sandbox Profiles */,
</ins><span class="cx"> );
</span><span class="cx"> name = "Copy Plug-in Sandbox Profiles";
</span><span class="cx"> runOnlyForDeploymentPostprocessing = 0;
</span><span class="lines">@@ -2697,6 +2699,7 @@
</span><span class="cx"> E19582D2153CBFD700B60875 /* PDFKitImports.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PDFKitImports.h; sourceTree = "<group>"; };
</span><span class="cx"> E19582D4153CC05300B60875 /* PDFKitImports.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PDFKitImports.mm; sourceTree = "<group>"; };
</span><span class="cx"> E1967E37150AB5E200C73169 /* com.apple.WebProcess.sb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = com.apple.WebProcess.sb; sourceTree = "<group>"; };
</span><ins>+ E19BDA8419365F4B00B97F57 /* com.apple.appstore.CodeRedeemerNetscapePlugin.sb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = com.apple.appstore.CodeRedeemerNetscapePlugin.sb; sourceTree = "<group>"; };
</ins><span class="cx"> E199875A142BF9B800BB2DE7 /* SimplePDFPlugin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SimplePDFPlugin.h; path = PDF/SimplePDFPlugin.h; sourceTree = "<group>"; };
</span><span class="cx"> E199875C142BFC9700BB2DE7 /* SimplePDFPlugin.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = SimplePDFPlugin.mm; path = PDF/SimplePDFPlugin.mm; sourceTree = "<group>"; };
</span><span class="cx"> E1A31731134CEA6C007C9A4F /* AttributedString.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AttributedString.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -3840,6 +3843,7 @@
</span><span class="cx"> 7CB16FE21724B9B5007A0A95 /* com.apple.ist.ds.appleconnect.webplugin.sb */,
</span><span class="cx"> 7CB16FE31724B9B5007A0A95 /* com.apple.QuickTime Plugin.plugin.sb */,
</span><span class="cx"> 7CB16FE41724B9B5007A0A95 /* com.apple.WebKit.plugin-common.sb */,
</span><ins>+ E19BDA8419365F4B00B97F57 /* com.apple.appstore.CodeRedeemerNetscapePlugin.sb */,
</ins><span class="cx"> 7CB16FE51724B9B5007A0A95 /* com.macromedia.Flash Player.plugin.sb */,
</span><span class="cx"> 7CB16FE61724B9B5007A0A95 /* com.microsoft.SilverlightPlugin.sb */,
</span><span class="cx"> 7CB16FE71724B9B5007A0A95 /* com.oracle.java.JavaAppletPlugin.sb */,
</span></span></pre>
</div>
</div>
</body>
</html>