<!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>[172482] trunk/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/172482">172482</a></dd>
<dt>Author</dt> <dd>aestes@apple.com</dd>
<dt>Date</dt> <dd>2014-08-12 12:12:05 -0700 (Tue, 12 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS] Get rid of iOS.xcconfig
https://bugs.webkit.org/show_bug.cgi?id=135809
Reviewed by Joseph Pecoraro.
All iOS.xcconfig did was include AspenFamily.xcconfig, so there's no need for the indirection.
Source/bmalloc:
* Configurations/Base.xcconfig:
* Configurations/iOS.xcconfig: Removed.
* bmalloc.xcodeproj/project.pbxproj:
Source/JavaScriptCore:
* Configurations/Base.xcconfig:
* Configurations/iOS.xcconfig: Removed.
* JavaScriptCore.xcodeproj/project.pbxproj:
Source/ThirdParty:
* gtest/xcode/Config/General.xcconfig:
* gtest/xcode/Config/iOS.xcconfig: Removed.
* gtest/xcode/gtest.xcodeproj/project.pbxproj:
Source/ThirdParty/ANGLE:
* ANGLE.xcodeproj/project.pbxproj:
* Configurations/Base.xcconfig:
* Configurations/iOS.xcconfig: Removed.
Source/WebCore:
* Configurations/Base.xcconfig:
* Configurations/iOS.xcconfig: Removed.
* WebCore.xcodeproj/project.pbxproj:
Source/WebKit:
* WebKit.xcodeproj/project.pbxproj:
Source/WebKit/mac:
* Configurations/Base.xcconfig:
* Configurations/iOS.xcconfig: Removed.
Source/WebKit2:
* Configurations/Base.xcconfig:
* Configurations/iOS.xcconfig: Removed.
* WebKit2.xcodeproj/project.pbxproj:
Source/WTF:
* Configurations/Base.xcconfig:
* Configurations/iOS.xcconfig: Removed.
* WTF.xcodeproj/project.pbxproj:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreConfigurationsBasexcconfig">trunk/Source/JavaScriptCore/Configurations/Base.xcconfig</a></li>
<li><a href="#trunkSourceJavaScriptCoreJavaScriptCorexcodeprojprojectpbxproj">trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceThirdPartyANGLEANGLExcodeprojprojectpbxproj">trunk/Source/ThirdParty/ANGLE/ANGLE.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceThirdPartyANGLEChangeLog">trunk/Source/ThirdParty/ANGLE/ChangeLog</a></li>
<li><a href="#trunkSourceThirdPartyANGLEConfigurationsBasexcconfig">trunk/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig</a></li>
<li><a href="#trunkSourceThirdPartyChangeLog">trunk/Source/ThirdParty/ChangeLog</a></li>
<li><a href="#trunkSourceThirdPartygtestxcodeConfigGeneralxcconfig">trunk/Source/ThirdParty/gtest/xcode/Config/General.xcconfig</a></li>
<li><a href="#trunkSourceThirdPartygtestxcodegtestxcodeprojprojectpbxproj">trunk/Source/ThirdParty/gtest/xcode/gtest.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFConfigurationsBasexcconfig">trunk/Source/WTF/Configurations/Base.xcconfig</a></li>
<li><a href="#trunkSourceWTFWTFxcodeprojprojectpbxproj">trunk/Source/WTF/WTF.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreConfigurationsBasexcconfig">trunk/Source/WebCore/Configurations/Base.xcconfig</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebCoreloaderResourceLoadercpp">trunk/Source/WebCore/loader/ResourceLoader.cpp</a></li>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitWebKitxcodeprojprojectpbxproj">trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacConfigurationsBasexcconfig">trunk/Source/WebKit/mac/Configurations/Base.xcconfig</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2ConfigurationsBasexcconfig">trunk/Source/WebKit2/Configurations/Base.xcconfig</a></li>
<li><a href="#trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj">trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourcebmallocChangeLog">trunk/Source/bmalloc/ChangeLog</a></li>
<li><a href="#trunkSourcebmallocConfigurationsBasexcconfig">trunk/Source/bmalloc/Configurations/Base.xcconfig</a></li>
<li><a href="#trunkSourcebmallocbmallocxcodeprojprojectpbxproj">trunk/Source/bmalloc/bmalloc.xcodeproj/project.pbxproj</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreConfigurationsiOSxcconfig">trunk/Source/JavaScriptCore/Configurations/iOS.xcconfig</a></li>
<li><a href="#trunkSourceThirdPartyANGLEConfigurationsiOSxcconfig">trunk/Source/ThirdParty/ANGLE/Configurations/iOS.xcconfig</a></li>
<li><a href="#trunkSourceThirdPartygtestxcodeConfigiOSxcconfig">trunk/Source/ThirdParty/gtest/xcode/Config/iOS.xcconfig</a></li>
<li><a href="#trunkSourceWTFConfigurationsiOSxcconfig">trunk/Source/WTF/Configurations/iOS.xcconfig</a></li>
<li><a href="#trunkSourceWebCoreConfigurationsiOSxcconfig">trunk/Source/WebCore/Configurations/iOS.xcconfig</a></li>
<li><a href="#trunkSourceWebKitmacConfigurationsiOSxcconfig">trunk/Source/WebKit/mac/Configurations/iOS.xcconfig</a></li>
<li><a href="#trunkSourceWebKit2ConfigurationsiOSxcconfig">trunk/Source/WebKit2/Configurations/iOS.xcconfig</a></li>
<li><a href="#trunkSourcebmallocConfigurationsiOSxcconfig">trunk/Source/bmalloc/Configurations/iOS.xcconfig</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (172481 => 172482)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-08-12 18:52:16 UTC (rev 172481)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-08-12 19:12:05 UTC (rev 172482)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-08-11 Andy Estes <aestes@apple.com>
+
+ [iOS] Get rid of iOS.xcconfig
+ https://bugs.webkit.org/show_bug.cgi?id=135809
+
+ Reviewed by Joseph Pecoraro.
+
+ All iOS.xcconfig did was include AspenFamily.xcconfig, so there's no need for the indirection.
+
+ * Configurations/Base.xcconfig:
+ * Configurations/iOS.xcconfig: Removed.
+ * JavaScriptCore.xcodeproj/project.pbxproj:
+
</ins><span class="cx"> 2014-08-11 Michael Saboff <msaboff@apple.com>
</span><span class="cx">
</span><span class="cx"> Eliminate {push,pop}CalleeSaves in favor of individual pushes & pops
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreConfigurationsBasexcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/Configurations/Base.xcconfig (172481 => 172482)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/Configurations/Base.xcconfig 2014-08-12 18:52:16 UTC (rev 172481)
+++ trunk/Source/JavaScriptCore/Configurations/Base.xcconfig 2014-08-12 19:12:05 UTC (rev 172482)
</span><span class="lines">@@ -21,7 +21,7 @@
</span><span class="cx"> // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
</span><span class="cx"> // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx">
</span><del>-#include "iOS.xcconfig"
</del><ins>+#include "<DEVELOPER_DIR>/AppleInternal/XcodeConfig/AspenFamily.xcconfig"
</ins><span class="cx"> #include "../../../../Internal/Configurations/UseInternalSDK.xcconfig"
</span><span class="cx">
</span><span class="cx"> CLANG_CXX_LANGUAGE_STANDARD = gnu++0x;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreConfigurationsiOSxcconfig"></a>
<div class="delfile"><h4>Deleted: trunk/Source/JavaScriptCore/Configurations/iOS.xcconfig (172481 => 172482)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/Configurations/iOS.xcconfig 2014-08-12 18:52:16 UTC (rev 172481)
+++ trunk/Source/JavaScriptCore/Configurations/iOS.xcconfig 2014-08-12 19:12:05 UTC (rev 172482)
</span><span class="lines">@@ -1 +0,0 @@
</span><del>-#include "<DEVELOPER_DIR>/AppleInternal/XcodeConfig/AspenFamily.xcconfig"
</del></span></pre></div>
<a id="trunkSourceJavaScriptCoreJavaScriptCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj (172481 => 172482)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj 2014-08-12 18:52:16 UTC (rev 172481)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj 2014-08-12 19:12:05 UTC (rev 172482)
</span><span class="lines">@@ -3786,7 +3786,6 @@
</span><span class="cx"> FED94F2B171E3E2300BE77A4 /* Watchdog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Watchdog.cpp; sourceTree = "<group>"; };
</span><span class="cx"> FED94F2C171E3E2300BE77A4 /* Watchdog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Watchdog.h; sourceTree = "<group>"; };
</span><span class="cx"> FED94F2D171E3E2300BE77A4 /* WatchdogMac.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WatchdogMac.cpp; sourceTree = "<group>"; };
</span><del>- FEE7D5A00D99AC04005351F6 /* iOS.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = iOS.xcconfig; sourceTree = "<group>"; };
</del><span class="cx"> FEF6835A174343CC00A32E25 /* JITStubsARM.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JITStubsARM.h; sourceTree = "<group>"; };
</span><span class="cx"> FEF6835B174343CC00A32E25 /* JITStubsARMv7.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JITStubsARMv7.h; sourceTree = "<group>"; };
</span><span class="cx"> FEF6835C174343CC00A32E25 /* JITStubsX86_64.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JITStubsX86_64.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -4489,7 +4488,6 @@
</span><span class="cx"> 1C9051450BA9E8A70081E9D0 /* Base.xcconfig */,
</span><span class="cx"> 1C9051440BA9E8A70081E9D0 /* DebugRelease.xcconfig */,
</span><span class="cx"> 449097EE0F8F81B50076A327 /* FeatureDefines.xcconfig */,
</span><del>- FEE7D5A00D99AC04005351F6 /* iOS.xcconfig */,
</del><span class="cx"> 1C9051430BA9E8A70081E9D0 /* JavaScriptCore.xcconfig */,
</span><span class="cx"> 5DAFD6CB146B686300FBEFB4 /* JSC.xcconfig */,
</span><span class="cx"> 0FCEFABE1805D86900472CE4 /* LLVMForJSC.xcconfig */,
</span></span></pre></div>
<a id="trunkSourceThirdPartyANGLEANGLExcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/ANGLE/ANGLE.xcodeproj/project.pbxproj (172481 => 172482)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/ANGLE/ANGLE.xcodeproj/project.pbxproj 2014-08-12 18:52:16 UTC (rev 172481)
+++ trunk/Source/ThirdParty/ANGLE/ANGLE.xcodeproj/project.pbxproj 2014-08-12 19:12:05 UTC (rev 172482)
</span><span class="lines">@@ -321,7 +321,6 @@
</span><span class="cx"> 31012E8218B97C860039062F /* compilerdebug.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = compilerdebug.h; sourceTree = "<group>"; };
</span><span class="cx"> 312BDB0915FEC91E0097EBC7 /* ANGLE.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = ANGLE.plist; sourceTree = "<group>"; };
</span><span class="cx"> 312BDB0A15FECA3A0097EBC7 /* ANGLE.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ANGLE.txt; sourceTree = "<group>"; };
</span><del>- 443A3E1512ECF6CC0004F9D7 /* iOS.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = iOS.xcconfig; sourceTree = "<group>"; };
</del><span class="cx"> 5C9FFF4C19102A000025B8FA /* FlagStd140Structs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FlagStd140Structs.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 5C9FFF4D19102A000025B8FA /* FlagStd140Structs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FlagStd140Structs.h; sourceTree = "<group>"; };
</span><span class="cx"> 5CC7D44B191024E3000B8C1F /* LoopInfo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LoopInfo.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -563,7 +562,6 @@
</span><span class="cx"> 5D7C59C51208C68B001C873E /* ANGLE.xcconfig */,
</span><span class="cx"> 5D7C59C61208C68B001C873E /* Base.xcconfig */,
</span><span class="cx"> 5D7C59C71208C68B001C873E /* DebugRelease.xcconfig */,
</span><del>- 443A3E1512ECF6CC0004F9D7 /* iOS.xcconfig */,
</del><span class="cx"> );
</span><span class="cx"> path = Configurations;
</span><span class="cx"> sourceTree = "<group>";
</span></span></pre></div>
<a id="trunkSourceThirdPartyANGLEChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/ANGLE/ChangeLog (172481 => 172482)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/ANGLE/ChangeLog 2014-08-12 18:52:16 UTC (rev 172481)
+++ trunk/Source/ThirdParty/ANGLE/ChangeLog 2014-08-12 19:12:05 UTC (rev 172482)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-08-11 Andy Estes <aestes@apple.com>
+
+ [iOS] Get rid of iOS.xcconfig
+ https://bugs.webkit.org/show_bug.cgi?id=135809
+
+ Reviewed by Joseph Pecoraro.
+
+ All iOS.xcconfig did was include AspenFamily.xcconfig, so there's no need for the indirection.
+
+ * ANGLE.xcodeproj/project.pbxproj:
+ * Configurations/Base.xcconfig:
+ * Configurations/iOS.xcconfig: Removed.
+
</ins><span class="cx"> 2014-08-07 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> [Win] Unreviewed gardening.
</span></span></pre></div>
<a id="trunkSourceThirdPartyANGLEConfigurationsBasexcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig (172481 => 172482)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig 2014-08-12 18:52:16 UTC (rev 172481)
+++ trunk/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig 2014-08-12 19:12:05 UTC (rev 172482)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-#include "iOS.xcconfig"
</del><ins>+#include "<DEVELOPER_DIR>/AppleInternal/XcodeConfig/AspenFamily.xcconfig"
</ins><span class="cx"> #include "../../../../../Internal/Configurations/UseInternalSDK.xcconfig"
</span><span class="cx">
</span><span class="cx"> CLANG_CXX_LANGUAGE_STANDARD = gnu++0x;
</span></span></pre></div>
<a id="trunkSourceThirdPartyANGLEConfigurationsiOSxcconfig"></a>
<div class="delfile"><h4>Deleted: trunk/Source/ThirdParty/ANGLE/Configurations/iOS.xcconfig (172481 => 172482)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/ANGLE/Configurations/iOS.xcconfig 2014-08-12 18:52:16 UTC (rev 172481)
+++ trunk/Source/ThirdParty/ANGLE/Configurations/iOS.xcconfig 2014-08-12 19:12:05 UTC (rev 172482)
</span><span class="lines">@@ -1 +0,0 @@
</span><del>-#include "<DEVELOPER_DIR>/AppleInternal/XcodeConfig/AspenFamily.xcconfig"
</del></span></pre></div>
<a id="trunkSourceThirdPartyChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/ChangeLog (172481 => 172482)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/ChangeLog 2014-08-12 18:52:16 UTC (rev 172481)
+++ trunk/Source/ThirdParty/ChangeLog 2014-08-12 19:12:05 UTC (rev 172482)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-08-11 Andy Estes <aestes@apple.com>
+
+ [iOS] Get rid of iOS.xcconfig
+ https://bugs.webkit.org/show_bug.cgi?id=135809
+
+ Reviewed by Joseph Pecoraro.
+
+ All iOS.xcconfig did was include AspenFamily.xcconfig, so there's no need for the indirection.
+
+ * gtest/xcode/Config/General.xcconfig:
+ * gtest/xcode/Config/iOS.xcconfig: Removed.
+ * gtest/xcode/gtest.xcodeproj/project.pbxproj:
+
</ins><span class="cx"> 2014-03-25 Martin Robinson <mrobinson@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Remove the autotools build
</span></span></pre></div>
<a id="trunkSourceThirdPartygtestxcodeConfigGeneralxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/gtest/xcode/Config/General.xcconfig (172481 => 172482)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/gtest/xcode/Config/General.xcconfig 2014-08-12 18:52:16 UTC (rev 172481)
+++ trunk/Source/ThirdParty/gtest/xcode/Config/General.xcconfig 2014-08-12 19:12:05 UTC (rev 172482)
</span><span class="lines">@@ -7,7 +7,7 @@
</span><span class="cx"> // http://code.google.com/p/google-toolbox-for-mac/
</span><span class="cx"> //
</span><span class="cx">
</span><del>-#include "iOS.xcconfig"
</del><ins>+#include "<DEVELOPER_DIR>/AppleInternal/XcodeConfig/AspenFamily.xcconfig"
</ins><span class="cx">
</span><span class="cx"> GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceThirdPartygtestxcodeConfigiOSxcconfig"></a>
<div class="delfile"><h4>Deleted: trunk/Source/ThirdParty/gtest/xcode/Config/iOS.xcconfig (172481 => 172482)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/gtest/xcode/Config/iOS.xcconfig 2014-08-12 18:52:16 UTC (rev 172481)
+++ trunk/Source/ThirdParty/gtest/xcode/Config/iOS.xcconfig 2014-08-12 19:12:05 UTC (rev 172482)
</span><span class="lines">@@ -1 +0,0 @@
</span><del>-#include "<DEVELOPER_DIR>/AppleInternal/XcodeConfig/AspenFamily.xcconfig"
</del></span></pre></div>
<a id="trunkSourceThirdPartygtestxcodegtestxcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/gtest/xcode/gtest.xcodeproj/project.pbxproj (172481 => 172482)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/gtest/xcode/gtest.xcodeproj/project.pbxproj 2014-08-12 18:52:16 UTC (rev 172481)
+++ trunk/Source/ThirdParty/gtest/xcode/gtest.xcodeproj/project.pbxproj 2014-08-12 19:12:05 UTC (rev 172482)
</span><span class="lines">@@ -202,7 +202,6 @@
</span><span class="cx"> 1A0A4C4414B7A3B500895135 /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = JavaScriptCore.framework; sourceTree = BUILT_PRODUCTS_DIR; };
</span><span class="cx"> 224A12A10E9EADA700BD17FD /* gtest-all.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = "gtest-all.cc"; sourceTree = "<group>"; };
</span><span class="cx"> 224A12A20E9EADCC00BD17FD /* gtest-test-part.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = "gtest-test-part.h"; sourceTree = "<group>"; };
</span><del>- 299E51021790C981006F6AFE /* iOS.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = iOS.xcconfig; sourceTree = "<group>"; };
</del><span class="cx"> 3B238C120E7FE13C00846E11 /* gtest_unittest.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = gtest_unittest.cc; sourceTree = "<group>"; };
</span><span class="cx"> 3B87D2100E96B92E000D1852 /* runtests.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = runtests.sh; sourceTree = "<group>"; };
</span><span class="cx"> 3BF6F29F0E79B5AD000F2EEE /* gtest-type-util.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "gtest-type-util.h"; sourceTree = "<group>"; };
</span><span class="lines">@@ -434,7 +433,6 @@
</span><span class="cx"> 40D4CDF10E30E07400294801 /* DebugProject.xcconfig */,
</span><span class="cx"> 40D4CDF20E30E07400294801 /* FrameworkTarget.xcconfig */,
</span><span class="cx"> 40D4CDF30E30E07400294801 /* General.xcconfig */,
</span><del>- 299E51021790C981006F6AFE /* iOS.xcconfig */,
</del><span class="cx"> 44C48DFF14A4098F00A2D9C7 /* ProductionProject.xcconfig */,
</span><span class="cx"> 40D4CDF40E30E07400294801 /* ReleaseProject.xcconfig */,
</span><span class="cx"> 40899FB30FFA7567000B29AE /* StaticLibraryTarget.xcconfig */,
</span></span></pre></div>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (172481 => 172482)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2014-08-12 18:52:16 UTC (rev 172481)
+++ trunk/Source/WTF/ChangeLog 2014-08-12 19:12:05 UTC (rev 172482)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-08-11 Andy Estes <aestes@apple.com>
+
+ [iOS] Get rid of iOS.xcconfig
+ https://bugs.webkit.org/show_bug.cgi?id=135809
+
+ Reviewed by Joseph Pecoraro.
+
+ All iOS.xcconfig did was include AspenFamily.xcconfig, so there's no need for the indirection.
+
+ * Configurations/Base.xcconfig:
+ * Configurations/iOS.xcconfig: Removed.
+ * WTF.xcodeproj/project.pbxproj:
+
</ins><span class="cx"> 2014-08-12 Zan Dobersek <zdobersek@igalia.com>
</span><span class="cx">
</span><span class="cx"> Clean up GMutexLocker
</span></span></pre></div>
<a id="trunkSourceWTFConfigurationsBasexcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/Configurations/Base.xcconfig (172481 => 172482)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/Configurations/Base.xcconfig 2014-08-12 18:52:16 UTC (rev 172481)
+++ trunk/Source/WTF/Configurations/Base.xcconfig 2014-08-12 19:12:05 UTC (rev 172482)
</span><span class="lines">@@ -21,7 +21,7 @@
</span><span class="cx"> // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
</span><span class="cx"> // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx">
</span><del>-#include "iOS.xcconfig"
</del><ins>+#include "<DEVELOPER_DIR>/AppleInternal/XcodeConfig/AspenFamily.xcconfig"
</ins><span class="cx"> #include "../../../../Internal/Configurations/UseInternalSDK.xcconfig"
</span><span class="cx">
</span><span class="cx"> CLANG_CXX_LANGUAGE_STANDARD = gnu++0x;
</span></span></pre></div>
<a id="trunkSourceWTFConfigurationsiOSxcconfig"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WTF/Configurations/iOS.xcconfig (172481 => 172482)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/Configurations/iOS.xcconfig 2014-08-12 18:52:16 UTC (rev 172481)
+++ trunk/Source/WTF/Configurations/iOS.xcconfig 2014-08-12 19:12:05 UTC (rev 172482)
</span><span class="lines">@@ -1 +0,0 @@
</span><del>-#include "<DEVELOPER_DIR>/AppleInternal/XcodeConfig/AspenFamily.xcconfig"
</del></span></pre></div>
<a id="trunkSourceWTFWTFxcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/WTF.xcodeproj/project.pbxproj (172481 => 172482)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/WTF.xcodeproj/project.pbxproj 2014-08-12 18:52:16 UTC (rev 172481)
+++ trunk/Source/WTF/WTF.xcodeproj/project.pbxproj 2014-08-12 19:12:05 UTC (rev 172482)
</span><span class="lines">@@ -354,7 +354,6 @@
</span><span class="cx"> 2CDED0EE18115C38004DBA70 /* RunLoopCF.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RunLoopCF.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 2CDED0F118115C85004DBA70 /* RunLoop.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RunLoop.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 2CDED0F218115C85004DBA70 /* RunLoop.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RunLoop.h; sourceTree = "<group>"; };
</span><del>- 44DEE74A152274BB00C6EC37 /* iOS.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = iOS.xcconfig; sourceTree = "<group>"; };
</del><span class="cx"> 5D247B6214689B8600E78B76 /* libWTF.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libWTF.a; sourceTree = BUILT_PRODUCTS_DIR; };
</span><span class="cx"> 5D247B6E14689C4700E78B76 /* Base.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Base.xcconfig; sourceTree = "<group>"; };
</span><span class="cx"> 5D247B7014689C4700E78B76 /* DebugRelease.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = DebugRelease.xcconfig; sourceTree = "<group>"; };
</span><span class="lines">@@ -645,7 +644,6 @@
</span><span class="cx"> 5D247B6E14689C4700E78B76 /* Base.xcconfig */,
</span><span class="cx"> 6541CAF41630DB26006D0DEC /* CopyWTFHeaders.xcconfig */,
</span><span class="cx"> 5D247B7014689C4700E78B76 /* DebugRelease.xcconfig */,
</span><del>- 44DEE74A152274BB00C6EC37 /* iOS.xcconfig */,
</del><span class="cx"> 14C8279718FDD73400E1800C /* mbmalloc.xcconfig */,
</span><span class="cx"> 5D247B7314689C4700E78B76 /* WTF.xcconfig */,
</span><span class="cx"> );
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (172481 => 172482)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-08-12 18:52:16 UTC (rev 172481)
+++ trunk/Source/WebCore/ChangeLog 2014-08-12 19:12:05 UTC (rev 172482)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-08-11 Andy Estes <aestes@apple.com>
+
+ [iOS] Get rid of iOS.xcconfig
+ https://bugs.webkit.org/show_bug.cgi?id=135809
+
+ Reviewed by Joseph Pecoraro.
+
+ All iOS.xcconfig did was include AspenFamily.xcconfig, so there's no need for the indirection.
+
+ * Configurations/Base.xcconfig:
+ * Configurations/iOS.xcconfig: Removed.
+ * WebCore.xcodeproj/project.pbxproj:
+
</ins><span class="cx"> 2014-08-11 Roger Fong <roger_fong@apple.com>
</span><span class="cx">
</span><span class="cx"> Adjust max-width of cues based on text alignment when cue size is expanded.
</span></span></pre></div>
<a id="trunkSourceWebCoreConfigurationsBasexcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Configurations/Base.xcconfig (172481 => 172482)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Configurations/Base.xcconfig 2014-08-12 18:52:16 UTC (rev 172481)
+++ trunk/Source/WebCore/Configurations/Base.xcconfig 2014-08-12 19:12:05 UTC (rev 172482)
</span><span class="lines">@@ -21,7 +21,7 @@
</span><span class="cx"> // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
</span><span class="cx"> // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx">
</span><del>-#include "iOS.xcconfig"
</del><ins>+#include "<DEVELOPER_DIR>/AppleInternal/XcodeConfig/AspenFamily.xcconfig"
</ins><span class="cx"> #include "../../../../Internal/Configurations/UseInternalSDK.xcconfig"
</span><span class="cx">
</span><span class="cx"> CLANG_CXX_LANGUAGE_STANDARD = gnu++0x;
</span></span></pre></div>
<a id="trunkSourceWebCoreConfigurationsiOSxcconfig"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/Configurations/iOS.xcconfig (172481 => 172482)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Configurations/iOS.xcconfig 2014-08-12 18:52:16 UTC (rev 172481)
+++ trunk/Source/WebCore/Configurations/iOS.xcconfig 2014-08-12 19:12:05 UTC (rev 172482)
</span><span class="lines">@@ -1 +0,0 @@
</span><del>-#include "<DEVELOPER_DIR>/AppleInternal/XcodeConfig/AspenFamily.xcconfig"
</del></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (172481 => 172482)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-08-12 18:52:16 UTC (rev 172481)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-08-12 19:12:05 UTC (rev 172482)
</span><span class="lines">@@ -14226,7 +14226,6 @@
</span><span class="cx"> FEDEF84016797108000E444A /* DatabaseStrategy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DatabaseStrategy.h; sourceTree = "<group>"; };
</span><span class="cx"> FEE1811116C319E800084849 /* SQLTransactionBackend.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SQLTransactionBackend.cpp; sourceTree = "<group>"; };
</span><span class="cx"> FEE1811216C319E800084849 /* SQLTransactionBackend.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SQLTransactionBackend.h; sourceTree = "<group>"; };
</span><del>- FEE7D6610D99AD16005351F6 /* iOS.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = iOS.xcconfig; sourceTree = "<group>"; };
</del><span class="cx"> FF945EC9161F7F3600971BC8 /* PseudoElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PseudoElement.cpp; sourceTree = "<group>"; };
</span><span class="cx"> FF945ECA161F7F3600971BC8 /* PseudoElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PseudoElement.h; sourceTree = "<group>"; };
</span><span class="cx"> FFAC30FC184FB145008C4F1E /* TrailingObjects.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TrailingObjects.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -15308,7 +15307,6 @@
</span><span class="cx"> 1CDD45E60BA9C84600F90147 /* Base.xcconfig */,
</span><span class="cx"> 1CDD45E40BA9C84600F90147 /* DebugRelease.xcconfig */,
</span><span class="cx"> 449098B10F8F82520076A327 /* FeatureDefines.xcconfig */,
</span><del>- FEE7D6610D99AD16005351F6 /* iOS.xcconfig */,
</del><span class="cx"> 1C904DF90BA9D2C80081E9D0 /* Version.xcconfig */,
</span><span class="cx"> 1CDD45E50BA9C84600F90147 /* WebCore.xcconfig */,
</span><span class="cx"> E1BA66F21742BDCC00C20251 /* WebCoreTestShim.xcconfig */,
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderResourceLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/ResourceLoader.cpp (172481 => 172482)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/ResourceLoader.cpp 2014-08-12 18:52:16 UTC (rev 172481)
+++ trunk/Source/WebCore/loader/ResourceLoader.cpp 2014-08-12 19:12:05 UTC (rev 172482)
</span><span class="lines">@@ -146,7 +146,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- if (clientRequest.isNull()) {
</del><ins>+ if (clientRequest.isNull() || !clientRequest.url().isValid()) {
</ins><span class="cx"> cancel();
</span><span class="cx"> return false;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (172481 => 172482)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog 2014-08-12 18:52:16 UTC (rev 172481)
+++ trunk/Source/WebKit/ChangeLog 2014-08-12 19:12:05 UTC (rev 172482)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2014-08-11 Andy Estes <aestes@apple.com>
+
+ [iOS] Get rid of iOS.xcconfig
+ https://bugs.webkit.org/show_bug.cgi?id=135809
+
+ Reviewed by Joseph Pecoraro.
+
+ All iOS.xcconfig did was include AspenFamily.xcconfig, so there's no need for the indirection.
+
+ * WebKit.xcodeproj/project.pbxproj:
+
</ins><span class="cx"> 2014-08-07 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> [Win] Unreviewed gardening.
</span></span></pre></div>
<a id="trunkSourceWebKitWebKitxcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj (172481 => 172482)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2014-08-12 18:52:16 UTC (rev 172481)
+++ trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2014-08-12 19:12:05 UTC (rev 172482)
</span><span class="lines">@@ -902,7 +902,6 @@
</span><span class="cx"> F834AAD60E64B1C700E2737C /* WebTextIterator.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebTextIterator.mm; sourceTree = "<group>"; };
</span><span class="cx"> F8CA15B5029A39D901000122 /* WebAuthenticationPanel.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebAuthenticationPanel.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
</span><span class="cx"> F8CA15B6029A39D901000122 /* WebAuthenticationPanel.m */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.objc; path = WebAuthenticationPanel.m; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
</span><del>- FEE7D6910D99B06A005351F6 /* iOS.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = iOS.xcconfig; sourceTree = "<group>"; };
</del><span class="cx"> /* End PBXFileReference section */
</span><span class="cx">
</span><span class="cx"> /* Begin PBXFrameworksBuildPhase section */
</span><span class="lines">@@ -1056,7 +1055,6 @@
</span><span class="cx"> 1C904FD50BA9DD0F0081E9D0 /* Base.xcconfig */,
</span><span class="cx"> 1C904FD40BA9DD0F0081E9D0 /* DebugRelease.xcconfig */,
</span><span class="cx"> 449098B90F8F82DF0076A327 /* FeatureDefines.xcconfig */,
</span><del>- FEE7D6910D99B06A005351F6 /* iOS.xcconfig */,
</del><span class="cx"> 1C904FD30BA9DD0F0081E9D0 /* Version.xcconfig */,
</span><span class="cx"> 1C904FD20BA9DD0F0081E9D0 /* WebKitLegacy.xcconfig */,
</span><span class="cx"> );
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (172481 => 172482)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2014-08-12 18:52:16 UTC (rev 172481)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-08-12 19:12:05 UTC (rev 172482)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-08-11 Andy Estes <aestes@apple.com>
+
+ [iOS] Get rid of iOS.xcconfig
+ https://bugs.webkit.org/show_bug.cgi?id=135809
+
+ Reviewed by Joseph Pecoraro.
+
+ All iOS.xcconfig did was include AspenFamily.xcconfig, so there's no need for the indirection.
+
+ * Configurations/Base.xcconfig:
+ * Configurations/iOS.xcconfig: Removed.
+
</ins><span class="cx"> 2014-08-10 Timothy Hatcher <timothy@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: new glyphs are visible on OS X 10.9 builds
</span></span></pre></div>
<a id="trunkSourceWebKitmacConfigurationsBasexcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Configurations/Base.xcconfig (172481 => 172482)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Configurations/Base.xcconfig 2014-08-12 18:52:16 UTC (rev 172481)
+++ trunk/Source/WebKit/mac/Configurations/Base.xcconfig 2014-08-12 19:12:05 UTC (rev 172482)
</span><span class="lines">@@ -21,7 +21,7 @@
</span><span class="cx"> // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
</span><span class="cx"> // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx">
</span><del>-#include "iOS.xcconfig"
</del><ins>+#include "<DEVELOPER_DIR>/AppleInternal/XcodeConfig/AspenFamily.xcconfig"
</ins><span class="cx"> #include "../../../../../Internal/Configurations/UseInternalSDK.xcconfig"
</span><span class="cx">
</span><span class="cx"> CLANG_CXX_LANGUAGE_STANDARD = gnu++0x;
</span></span></pre></div>
<a id="trunkSourceWebKitmacConfigurationsiOSxcconfig"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit/mac/Configurations/iOS.xcconfig (172481 => 172482)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Configurations/iOS.xcconfig 2014-08-12 18:52:16 UTC (rev 172481)
+++ trunk/Source/WebKit/mac/Configurations/iOS.xcconfig 2014-08-12 19:12:05 UTC (rev 172482)
</span><span class="lines">@@ -1 +0,0 @@
</span><del>-#include "<DEVELOPER_DIR>/AppleInternal/XcodeConfig/AspenFamily.xcconfig"
</del></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (172481 => 172482)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-08-12 18:52:16 UTC (rev 172481)
+++ trunk/Source/WebKit2/ChangeLog 2014-08-12 19:12:05 UTC (rev 172482)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-08-11 Andy Estes <aestes@apple.com>
+
+ [iOS] Get rid of iOS.xcconfig
+ https://bugs.webkit.org/show_bug.cgi?id=135809
+
+ Reviewed by Joseph Pecoraro.
+
+ All iOS.xcconfig did was include AspenFamily.xcconfig, so there's no need for the indirection.
+
+ * Configurations/Base.xcconfig:
+ * Configurations/iOS.xcconfig: Removed.
+ * WebKit2.xcodeproj/project.pbxproj:
+
</ins><span class="cx"> 2014-08-12 Grzegorz Czajkowski <g.czajkowski@samsung.com>
</span><span class="cx">
</span><span class="cx"> [EFL] Rename ewk_private.h to EwkDebug.h
</span></span></pre></div>
<a id="trunkSourceWebKit2ConfigurationsBasexcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Configurations/Base.xcconfig (172481 => 172482)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Configurations/Base.xcconfig 2014-08-12 18:52:16 UTC (rev 172481)
+++ trunk/Source/WebKit2/Configurations/Base.xcconfig 2014-08-12 19:12:05 UTC (rev 172482)
</span><span class="lines">@@ -21,7 +21,7 @@
</span><span class="cx"> // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
</span><span class="cx"> // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx">
</span><del>-#include "iOS.xcconfig"
</del><ins>+#include "<DEVELOPER_DIR>/AppleInternal/XcodeConfig/AspenFamily.xcconfig"
</ins><span class="cx"> #include "../../../../Internal/Configurations/UseInternalSDK.xcconfig"
</span><span class="cx">
</span><span class="cx"> CLANG_CXX_LANGUAGE_STANDARD = gnu++0x;
</span></span></pre></div>
<a id="trunkSourceWebKit2ConfigurationsiOSxcconfig"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/Configurations/iOS.xcconfig (172481 => 172482)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Configurations/iOS.xcconfig 2014-08-12 18:52:16 UTC (rev 172481)
+++ trunk/Source/WebKit2/Configurations/iOS.xcconfig 2014-08-12 19:12:05 UTC (rev 172482)
</span><span class="lines">@@ -1,24 +0,0 @@
</span><del>-// Copyright (C) 2012 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. ``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
-// 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.
-
-#include "<DEVELOPER_DIR>/AppleInternal/XcodeConfig/AspenFamily.xcconfig"
</del></span></pre></div>
<a id="trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (172481 => 172482)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2014-08-12 18:52:16 UTC (rev 172481)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2014-08-12 19:12:05 UTC (rev 172482)
</span><span class="lines">@@ -3085,7 +3085,6 @@
</span><span class="cx"> 762B7484120BBA2D00819339 /* WKPreferencesRefPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKPreferencesRefPrivate.h; sourceTree = "<group>"; };
</span><span class="cx"> 7801C095142290C400FAF9AF /* WebHitTestResult.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebHitTestResult.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 7801C096142290C400FAF9AF /* WebHitTestResult.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebHitTestResult.h; sourceTree = "<group>"; };
</span><del>- 7C0BB9A718DCDE890006C086 /* iOS.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = iOS.xcconfig; sourceTree = "<group>"; };
</del><span class="cx"> 7C0BB9A818DCDE890006C086 /* WebContent-iOS.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "WebContent-iOS.entitlements"; sourceTree = "<group>"; };
</span><span class="cx"> 7C0BB9A918DCDF5A0006C086 /* Network-iOS.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "Network-iOS.entitlements"; sourceTree = "<group>"; };
</span><span class="cx"> 7C135AA6173B0BCA00586AE2 /* WKPluginInformation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKPluginInformation.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -4195,7 +4194,6 @@
</span><span class="cx"> A7BD9863194653D400D35698 /* Databases-iOS.entitlements */,
</span><span class="cx"> 1A4F976B100E7B6600637A18 /* DebugRelease.xcconfig */,
</span><span class="cx"> 1A4F976C100E7B6600637A18 /* FeatureDefines.xcconfig */,
</span><del>- 7C0BB9A718DCDE890006C086 /* iOS.xcconfig */,
</del><span class="cx"> 7C0BB9A918DCDF5A0006C086 /* Network-iOS.entitlements */,
</span><span class="cx"> 510CC8461613C7C600D03ED3 /* NetworkProcess.xcconfig */,
</span><span class="cx"> BC8283AA16B4BEAD00A278FE /* NetworkService.Development.xcconfig */,
</span></span></pre></div>
<a id="trunkSourcebmallocChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/ChangeLog (172481 => 172482)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/ChangeLog 2014-08-12 18:52:16 UTC (rev 172481)
+++ trunk/Source/bmalloc/ChangeLog 2014-08-12 19:12:05 UTC (rev 172482)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-08-11 Andy Estes <aestes@apple.com>
+
+ [iOS] Get rid of iOS.xcconfig
+ https://bugs.webkit.org/show_bug.cgi?id=135809
+
+ Reviewed by Joseph Pecoraro.
+
+ All iOS.xcconfig did was include AspenFamily.xcconfig, so there's no need for the indirection.
+
+ * Configurations/Base.xcconfig:
+ * Configurations/iOS.xcconfig: Removed.
+ * bmalloc.xcodeproj/project.pbxproj:
+
</ins><span class="cx"> 2014-05-01 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><span class="cx"> Fixed production builds for the iOS Simulator.
</span></span></pre></div>
<a id="trunkSourcebmallocConfigurationsBasexcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/Configurations/Base.xcconfig (172481 => 172482)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/Configurations/Base.xcconfig 2014-08-12 18:52:16 UTC (rev 172481)
+++ trunk/Source/bmalloc/Configurations/Base.xcconfig 2014-08-12 19:12:05 UTC (rev 172482)
</span><span class="lines">@@ -21,7 +21,7 @@
</span><span class="cx"> // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
</span><span class="cx"> // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx">
</span><del>-#include "iOS.xcconfig"
</del><ins>+#include "<DEVELOPER_DIR>/AppleInternal/XcodeConfig/AspenFamily.xcconfig"
</ins><span class="cx"> #include "../../../../Internal/Configurations/UseInternalSDK.xcconfig"
</span><span class="cx">
</span><span class="cx"> CLANG_CXX_LANGUAGE_STANDARD = gnu++0x;
</span></span></pre></div>
<a id="trunkSourcebmallocConfigurationsiOSxcconfig"></a>
<div class="delfile"><h4>Deleted: trunk/Source/bmalloc/Configurations/iOS.xcconfig (172481 => 172482)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/Configurations/iOS.xcconfig 2014-08-12 18:52:16 UTC (rev 172481)
+++ trunk/Source/bmalloc/Configurations/iOS.xcconfig 2014-08-12 19:12:05 UTC (rev 172482)
</span><span class="lines">@@ -1 +0,0 @@
</span><del>-#include "<DEVELOPER_DIR>/AppleInternal/XcodeConfig/AspenFamily.xcconfig"
</del></span></pre></div>
<a id="trunkSourcebmallocbmallocxcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/bmalloc.xcodeproj/project.pbxproj (172481 => 172482)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/bmalloc.xcodeproj/project.pbxproj 2014-08-12 18:52:16 UTC (rev 172481)
+++ trunk/Source/bmalloc/bmalloc.xcodeproj/project.pbxproj 2014-08-12 19:12:05 UTC (rev 172482)
</span><span class="lines">@@ -121,7 +121,6 @@
</span><span class="cx"> 14B650C518F39F4800751968 /* Base.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Base.xcconfig; sourceTree = "<group>"; };
</span><span class="cx"> 14B650C618F39F4800751968 /* bmalloc.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = bmalloc.xcconfig; sourceTree = "<group>"; };
</span><span class="cx"> 14B650C718F39F4800751968 /* DebugRelease.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = DebugRelease.xcconfig; sourceTree = "<group>"; };
</span><del>- 14B650C818F39F4800751968 /* iOS.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = iOS.xcconfig; sourceTree = "<group>"; };
</del><span class="cx"> 14B650C918F3A04200751968 /* mbmalloc.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = mbmalloc.xcconfig; sourceTree = "<group>"; };
</span><span class="cx"> 14C919C818FCC59F0028DB43 /* BPlatform.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BPlatform.h; path = bmalloc/BPlatform.h; sourceTree = "<group>"; };
</span><span class="cx"> 14CC394418EA8743004AFE34 /* libmbmalloc.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = libmbmalloc.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
</span><span class="lines">@@ -222,7 +221,6 @@
</span><span class="cx"> 14B650C518F39F4800751968 /* Base.xcconfig */,
</span><span class="cx"> 14B650C618F39F4800751968 /* bmalloc.xcconfig */,
</span><span class="cx"> 14B650C718F39F4800751968 /* DebugRelease.xcconfig */,
</span><del>- 14B650C818F39F4800751968 /* iOS.xcconfig */,
</del><span class="cx"> 14B650C918F3A04200751968 /* mbmalloc.xcconfig */,
</span><span class="cx"> );
</span><span class="cx"> path = Configurations;
</span></span></pre>
</div>
</div>
</body>
</html>