<!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>[186788] branches/safari-601.1-branch/Source</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/186788">186788</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2015-07-13 15:26:47 -0700 (Mon, 13 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/186777">r186777</a>. rdar://problem/21789252</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6011branchSourceJavaScriptCoreChangeLog">branches/safari-601.1-branch/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#branchessafari6011branchSourceJavaScriptCoreJavaScriptCorexcodeprojprojectpbxproj">branches/safari-601.1-branch/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#branchessafari6011branchSourceWebKit2ChangeLog">branches/safari-601.1-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari6011branchSourceWebKit2WebKit2xcodeprojprojectpbxproj">branches/safari-601.1-branch/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6011branchSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1-branch/Source/JavaScriptCore/ChangeLog (186787 => 186788)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1-branch/Source/JavaScriptCore/ChangeLog 2015-07-13 22:24:28 UTC (rev 186787)
+++ branches/safari-601.1-branch/Source/JavaScriptCore/ChangeLog 2015-07-13 22:26:47 UTC (rev 186788)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2015-07-13 Babak Shafiei <bshafiei@apple.com>
+
+ Merge r186777.
+
+ 2015-07-13 Anders Carlsson <andersca@apple.com>
+
+ Apps linked with a deployment target of iOS 7.x or earlier crash when using modern WebKit API
+ https://bugs.webkit.org/show_bug.cgi?id=146913
+ rdar://problem/21789252
+
+ Reviewed by Dan Bernstein.
+
+ Make a top-level symlink from /System/Library/PrivateFrameworks/JavaScriptCore.framework to
+ /System/Library/Frameworks/JavaScriptCore.framework.
+
+ * JavaScriptCore.xcodeproj/project.pbxproj:
+
</ins><span class="cx"> 2015-07-12 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r186702.
</span></span></pre></div>
<a id="branchessafari6011branchSourceJavaScriptCoreJavaScriptCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1-branch/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj (186787 => 186788)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1-branch/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj 2015-07-13 22:24:28 UTC (rev 186787)
+++ branches/safari-601.1-branch/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj 2015-07-13 22:26:47 UTC (rev 186788)
</span><span class="lines">@@ -6664,6 +6664,7 @@
</span><span class="cx"> 5D29D8BE0E9860B400C3D2D0 /* Check For Weak VTables and Externals */,
</span><span class="cx"> 3713F014142905240036387F /* Check For Inappropriate Objective-C Class Names */,
</span><span class="cx"> A55DEAA416703DF7003DB841 /* Check For Inappropriate Macros in External Headers */,
</span><ins>+ 1A02D9A81B34A882000D1522 /* Add Symlink in /System/Library/PrivateFrameworks */,
</ins><span class="cx"> );
</span><span class="cx"> buildRules = (
</span><span class="cx"> );
</span><span class="lines">@@ -6778,6 +6779,20 @@
</span><span class="cx"> shellPath = /bin/sh;
</span><span class="cx"> shellScript = "set -e\n\nif [[ $ENABLE_FTL_JIT != \"ENABLE_FTL_JIT\" ]]\nthen\n exit 0\nfi\n\nif [[ ${CONFIGURATION:=Debug} != \"Production\" ]]\nthen\n # Copy the llvmForJSC library into the framework.\n ditto \"${BUILT_PRODUCTS_DIR}/libllvmForJSC.dylib\" \"${BUILT_PRODUCTS_DIR}/${CONTENTS_FOLDER_PATH}/Libraries/libllvmForJSC.dylib\"\nfi\n\nif [[ $PLATFORM_NAME != \"macosx\" ]]\nthen\n exit 0\nfi\n\nif [ ! -e \"${BUILT_PRODUCTS_DIR}/${WRAPPER_NAME}/Libraries\" ]\nthen\n ln -fs \"Versions/Current/Libraries\" \"${BUILT_PRODUCTS_DIR}/${WRAPPER_NAME}/Libraries\"\nfi";
</span><span class="cx"> };
</span><ins>+ 1A02D9A81B34A882000D1522 /* Add Symlink in /System/Library/PrivateFrameworks */ = {
+ isa = PBXShellScriptBuildPhase;
+ buildActionMask = 8;
+ files = (
+ );
+ inputPaths = (
+ );
+ name = "Add Symlink in /System/Library/PrivateFrameworks";
+ outputPaths = (
+ );
+ runOnlyForDeploymentPostprocessing = 1;
+ shellPath = /bin/sh;
+ shellScript = "if [[ ${PLATFORM_NAME} != \"iphoneos\" ]]; then\n exit 0\nfi\n\nif [[ ! -d \"${INSTALL_ROOT}/${SYSTEM_LIBRARY_DIR}/PrivateFrameworks\" ]]; then\n mkdir -p \"${INSTALL_ROOT}/${SYSTEM_LIBRARY_DIR}/PrivateFrameworks\"\nfi\n\nln -s -h -f ../Frameworks/JavaScriptCore.framework \"${INSTALL_ROOT}/${SYSTEM_LIBRARY_DIR}/PrivateFrameworks/JavaScriptCore.framework\"";
+ };
</ins><span class="cx"> 3713F014142905240036387F /* Check For Inappropriate Objective-C Class Names */ = {
</span><span class="cx"> isa = PBXShellScriptBuildPhase;
</span><span class="cx"> buildActionMask = 2147483647;
</span></span></pre></div>
<a id="branchessafari6011branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1-branch/Source/WebKit2/ChangeLog (186787 => 186788)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1-branch/Source/WebKit2/ChangeLog 2015-07-13 22:24:28 UTC (rev 186787)
+++ branches/safari-601.1-branch/Source/WebKit2/ChangeLog 2015-07-13 22:26:47 UTC (rev 186788)
</span><span class="lines">@@ -1,5 +1,22 @@
</span><span class="cx"> 2015-07-13 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r186777.
+
+ 2015-07-13 Anders Carlsson <andersca@apple.com>
+
+ Apps linked with a deployment target of iOS 7.x or earlier crash when using modern WebKit API
+ https://bugs.webkit.org/show_bug.cgi?id=146913
+ rdar://problem/21789252
+
+ Reviewed by Dan Bernstein.
+
+ Make a top-level symlink from /System/Library/PrivateFrameworks/WebKit.framework to
+ /System/Library/Frameworks/WebKit.framework.
+
+ * WebKit2.xcodeproj/project.pbxproj:
+
+2015-07-13 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r186770.
</span><span class="cx">
</span><span class="cx"> 2015-07-13 Anders Carlsson <andersca@apple.com>
</span></span></pre></div>
<a id="branchessafari6011branchSourceWebKit2WebKit2xcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1-branch/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (186787 => 186788)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1-branch/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-07-13 22:24:28 UTC (rev 186787)
+++ branches/safari-601.1-branch/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-07-13 22:26:47 UTC (rev 186788)
</span><span class="lines">@@ -8544,6 +8544,7 @@
</span><span class="cx"> 5DF408C6131DD49700130071 /* Check For Framework Include Consistency */,
</span><span class="cx"> 5DF408D1131DDBEC00130071 /* Check For Inappropriate Files In Framework */,
</span><span class="cx"> A55DEAA61670402E003DB841 /* Check For Inappropriate Macros in External Headers */,
</span><ins>+ 1A2180161B5454620046AEC4 /* Add Symlink in /System/Library/PrivateFrameworks */,
</ins><span class="cx"> );
</span><span class="cx"> buildRules = (
</span><span class="cx"> );
</span><span class="lines">@@ -8937,6 +8938,20 @@
</span><span class="cx"> shellPath = /bin/sh;
</span><span class="cx"> shellScript = "if [ \"${ACTION}\" = \"build\" -o \"${ACTION}\" = \"install\" -o \"${ACTION}\" = \"installhdrs\" ]; then\n exec ${SRCROOT}/mac/postprocess-framework-headers.sh\nfi";
</span><span class="cx"> };
</span><ins>+ 1A2180161B5454620046AEC4 /* Add Symlink in /System/Library/PrivateFrameworks */ = {
+ isa = PBXShellScriptBuildPhase;
+ buildActionMask = 8;
+ files = (
+ );
+ inputPaths = (
+ );
+ name = "Add Symlink in /System/Library/PrivateFrameworks";
+ outputPaths = (
+ );
+ runOnlyForDeploymentPostprocessing = 1;
+ shellPath = /bin/sh;
+ shellScript = "if [[ ${PLATFORM_NAME} != \"iphoneos\" ]]; then\n exit 0;\nfi\n\nif [[ ! -d \"${INSTALL_ROOT}/${SYSTEM_LIBRARY_DIR}/PrivateFrameworks\" ]]; then\n mkdir -p \"${INSTALL_ROOT}/${SYSTEM_LIBRARY_DIR}/PrivateFrameworks\"\nfi\n\nln -s -h -f ../Frameworks/WebKit.framework \"${INSTALL_ROOT}/${SYSTEM_LIBRARY_DIR}/PrivateFrameworks/WebKit.framework\"";
+ };
</ins><span class="cx"> 1A6280C81919956B006AD9F9 /* Migrate WebKitLegacy Headers */ = {
</span><span class="cx"> isa = PBXShellScriptBuildPhase;
</span><span class="cx"> buildActionMask = 2147483647;
</span></span></pre>
</div>
</div>
</body>
</html>