Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (172481 => 172482)
--- trunk/Source/_javascript_Core/ChangeLog 2014-08-12 18:52:16 UTC (rev 172481)
+++ trunk/Source/_javascript_Core/ChangeLog 2014-08-12 19:12:05 UTC (rev 172482)
@@ -1,3 +1,16 @@
+2014-08-11 Andy Estes <[email protected]>
+
+ [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.
+ * _javascript_Core.xcodeproj/project.pbxproj:
+
2014-08-11 Michael Saboff <[email protected]>
Eliminate {push,pop}CalleeSaves in favor of individual pushes & pops
Modified: trunk/Source/_javascript_Core/Configurations/Base.xcconfig (172481 => 172482)
--- trunk/Source/_javascript_Core/Configurations/Base.xcconfig 2014-08-12 18:52:16 UTC (rev 172481)
+++ trunk/Source/_javascript_Core/Configurations/Base.xcconfig 2014-08-12 19:12:05 UTC (rev 172482)
@@ -21,7 +21,7 @@
// (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 "iOS.xcconfig"
+#include "<DEVELOPER_DIR>/AppleInternal/XcodeConfig/AspenFamily.xcconfig"
#include "../../../../Internal/Configurations/UseInternalSDK.xcconfig"
CLANG_CXX_LANGUAGE_STANDARD = gnu++0x;
Deleted: trunk/Source/_javascript_Core/Configurations/iOS.xcconfig (172481 => 172482)
--- trunk/Source/_javascript_Core/Configurations/iOS.xcconfig 2014-08-12 18:52:16 UTC (rev 172481)
+++ trunk/Source/_javascript_Core/Configurations/iOS.xcconfig 2014-08-12 19:12:05 UTC (rev 172482)
@@ -1 +0,0 @@
-#include "<DEVELOPER_DIR>/AppleInternal/XcodeConfig/AspenFamily.xcconfig"
Modified: trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj (172481 => 172482)
--- trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj 2014-08-12 18:52:16 UTC (rev 172481)
+++ trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj 2014-08-12 19:12:05 UTC (rev 172482)
@@ -3786,7 +3786,6 @@
FED94F2B171E3E2300BE77A4 /* Watchdog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Watchdog.cpp; sourceTree = "<group>"; };
FED94F2C171E3E2300BE77A4 /* Watchdog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Watchdog.h; sourceTree = "<group>"; };
FED94F2D171E3E2300BE77A4 /* WatchdogMac.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WatchdogMac.cpp; sourceTree = "<group>"; };
- FEE7D5A00D99AC04005351F6 /* iOS.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = iOS.xcconfig; sourceTree = "<group>"; };
FEF6835A174343CC00A32E25 /* JITStubsARM.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JITStubsARM.h; sourceTree = "<group>"; };
FEF6835B174343CC00A32E25 /* JITStubsARMv7.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JITStubsARMv7.h; sourceTree = "<group>"; };
FEF6835C174343CC00A32E25 /* JITStubsX86_64.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JITStubsX86_64.h; sourceTree = "<group>"; };
@@ -4489,7 +4488,6 @@
1C9051450BA9E8A70081E9D0 /* Base.xcconfig */,
1C9051440BA9E8A70081E9D0 /* DebugRelease.xcconfig */,
449097EE0F8F81B50076A327 /* FeatureDefines.xcconfig */,
- FEE7D5A00D99AC04005351F6 /* iOS.xcconfig */,
1C9051430BA9E8A70081E9D0 /* _javascript_Core.xcconfig */,
5DAFD6CB146B686300FBEFB4 /* JSC.xcconfig */,
0FCEFABE1805D86900472CE4 /* LLVMForJSC.xcconfig */,
Modified: trunk/Source/ThirdParty/ANGLE/ANGLE.xcodeproj/project.pbxproj (172481 => 172482)
--- 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)
@@ -321,7 +321,6 @@
31012E8218B97C860039062F /* compilerdebug.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = compilerdebug.h; sourceTree = "<group>"; };
312BDB0915FEC91E0097EBC7 /* ANGLE.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = ANGLE.plist; sourceTree = "<group>"; };
312BDB0A15FECA3A0097EBC7 /* ANGLE.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ANGLE.txt; sourceTree = "<group>"; };
- 443A3E1512ECF6CC0004F9D7 /* iOS.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = iOS.xcconfig; sourceTree = "<group>"; };
5C9FFF4C19102A000025B8FA /* FlagStd140Structs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FlagStd140Structs.cpp; sourceTree = "<group>"; };
5C9FFF4D19102A000025B8FA /* FlagStd140Structs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FlagStd140Structs.h; sourceTree = "<group>"; };
5CC7D44B191024E3000B8C1F /* LoopInfo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LoopInfo.cpp; sourceTree = "<group>"; };
@@ -563,7 +562,6 @@
5D7C59C51208C68B001C873E /* ANGLE.xcconfig */,
5D7C59C61208C68B001C873E /* Base.xcconfig */,
5D7C59C71208C68B001C873E /* DebugRelease.xcconfig */,
- 443A3E1512ECF6CC0004F9D7 /* iOS.xcconfig */,
);
path = Configurations;
sourceTree = "<group>";
Modified: trunk/Source/ThirdParty/ANGLE/ChangeLog (172481 => 172482)
--- 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)
@@ -1,3 +1,16 @@
+2014-08-11 Andy Estes <[email protected]>
+
+ [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.
+
2014-08-07 Brent Fulgham <[email protected]>
[Win] Unreviewed gardening.
Modified: trunk/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig (172481 => 172482)
--- 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)
@@ -1,4 +1,4 @@
-#include "iOS.xcconfig"
+#include "<DEVELOPER_DIR>/AppleInternal/XcodeConfig/AspenFamily.xcconfig"
#include "../../../../../Internal/Configurations/UseInternalSDK.xcconfig"
CLANG_CXX_LANGUAGE_STANDARD = gnu++0x;
Deleted: trunk/Source/ThirdParty/ANGLE/Configurations/iOS.xcconfig (172481 => 172482)
--- 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)
@@ -1 +0,0 @@
-#include "<DEVELOPER_DIR>/AppleInternal/XcodeConfig/AspenFamily.xcconfig"
Modified: trunk/Source/ThirdParty/ChangeLog (172481 => 172482)
--- 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)
@@ -1,3 +1,16 @@
+2014-08-11 Andy Estes <[email protected]>
+
+ [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:
+
2014-03-25 Martin Robinson <[email protected]>
[GTK] Remove the autotools build
Modified: trunk/Source/ThirdParty/gtest/xcode/Config/General.xcconfig (172481 => 172482)
--- 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)
@@ -7,7 +7,7 @@
// http://code.google.com/p/google-toolbox-for-mac/
//
-#include "iOS.xcconfig"
+#include "<DEVELOPER_DIR>/AppleInternal/XcodeConfig/AspenFamily.xcconfig"
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
Deleted: trunk/Source/ThirdParty/gtest/xcode/Config/iOS.xcconfig (172481 => 172482)
--- 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)
@@ -1 +0,0 @@
-#include "<DEVELOPER_DIR>/AppleInternal/XcodeConfig/AspenFamily.xcconfig"
Modified: trunk/Source/ThirdParty/gtest/xcode/gtest.xcodeproj/project.pbxproj (172481 => 172482)
--- 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)
@@ -202,7 +202,6 @@
1A0A4C4414B7A3B500895135 /* _javascript_Core.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = _javascript_Core.framework; sourceTree = BUILT_PRODUCTS_DIR; };
224A12A10E9EADA700BD17FD /* gtest-all.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = "gtest-all.cc"; sourceTree = "<group>"; };
224A12A20E9EADCC00BD17FD /* gtest-test-part.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = "gtest-test-part.h"; sourceTree = "<group>"; };
- 299E51021790C981006F6AFE /* iOS.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = iOS.xcconfig; sourceTree = "<group>"; };
3B238C120E7FE13C00846E11 /* gtest_unittest.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = gtest_unittest.cc; sourceTree = "<group>"; };
3B87D2100E96B92E000D1852 /* runtests.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = runtests.sh; sourceTree = "<group>"; };
3BF6F29F0E79B5AD000F2EEE /* gtest-type-util.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "gtest-type-util.h"; sourceTree = "<group>"; };
@@ -434,7 +433,6 @@
40D4CDF10E30E07400294801 /* DebugProject.xcconfig */,
40D4CDF20E30E07400294801 /* FrameworkTarget.xcconfig */,
40D4CDF30E30E07400294801 /* General.xcconfig */,
- 299E51021790C981006F6AFE /* iOS.xcconfig */,
44C48DFF14A4098F00A2D9C7 /* ProductionProject.xcconfig */,
40D4CDF40E30E07400294801 /* ReleaseProject.xcconfig */,
40899FB30FFA7567000B29AE /* StaticLibraryTarget.xcconfig */,
Modified: trunk/Source/WTF/ChangeLog (172481 => 172482)
--- 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)
@@ -1,3 +1,16 @@
+2014-08-11 Andy Estes <[email protected]>
+
+ [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:
+
2014-08-12 Zan Dobersek <[email protected]>
Clean up GMutexLocker
Modified: trunk/Source/WTF/Configurations/Base.xcconfig (172481 => 172482)
--- 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)
@@ -21,7 +21,7 @@
// (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 "iOS.xcconfig"
+#include "<DEVELOPER_DIR>/AppleInternal/XcodeConfig/AspenFamily.xcconfig"
#include "../../../../Internal/Configurations/UseInternalSDK.xcconfig"
CLANG_CXX_LANGUAGE_STANDARD = gnu++0x;
Deleted: trunk/Source/WTF/Configurations/iOS.xcconfig (172481 => 172482)
--- 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)
@@ -1 +0,0 @@
-#include "<DEVELOPER_DIR>/AppleInternal/XcodeConfig/AspenFamily.xcconfig"
Modified: trunk/Source/WTF/WTF.xcodeproj/project.pbxproj (172481 => 172482)
--- 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)
@@ -354,7 +354,6 @@
2CDED0EE18115C38004DBA70 /* RunLoopCF.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RunLoopCF.cpp; sourceTree = "<group>"; };
2CDED0F118115C85004DBA70 /* RunLoop.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RunLoop.cpp; sourceTree = "<group>"; };
2CDED0F218115C85004DBA70 /* RunLoop.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RunLoop.h; sourceTree = "<group>"; };
- 44DEE74A152274BB00C6EC37 /* iOS.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = iOS.xcconfig; sourceTree = "<group>"; };
5D247B6214689B8600E78B76 /* libWTF.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libWTF.a; sourceTree = BUILT_PRODUCTS_DIR; };
5D247B6E14689C4700E78B76 /* Base.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Base.xcconfig; sourceTree = "<group>"; };
5D247B7014689C4700E78B76 /* DebugRelease.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = DebugRelease.xcconfig; sourceTree = "<group>"; };
@@ -645,7 +644,6 @@
5D247B6E14689C4700E78B76 /* Base.xcconfig */,
6541CAF41630DB26006D0DEC /* CopyWTFHeaders.xcconfig */,
5D247B7014689C4700E78B76 /* DebugRelease.xcconfig */,
- 44DEE74A152274BB00C6EC37 /* iOS.xcconfig */,
14C8279718FDD73400E1800C /* mbmalloc.xcconfig */,
5D247B7314689C4700E78B76 /* WTF.xcconfig */,
);
Modified: trunk/Source/WebCore/ChangeLog (172481 => 172482)
--- 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)
@@ -1,3 +1,16 @@
+2014-08-11 Andy Estes <[email protected]>
+
+ [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:
+
2014-08-11 Roger Fong <[email protected]>
Adjust max-width of cues based on text alignment when cue size is expanded.
Modified: trunk/Source/WebCore/Configurations/Base.xcconfig (172481 => 172482)
--- 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)
@@ -21,7 +21,7 @@
// (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 "iOS.xcconfig"
+#include "<DEVELOPER_DIR>/AppleInternal/XcodeConfig/AspenFamily.xcconfig"
#include "../../../../Internal/Configurations/UseInternalSDK.xcconfig"
CLANG_CXX_LANGUAGE_STANDARD = gnu++0x;
Deleted: trunk/Source/WebCore/Configurations/iOS.xcconfig (172481 => 172482)
--- 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)
@@ -1 +0,0 @@
-#include "<DEVELOPER_DIR>/AppleInternal/XcodeConfig/AspenFamily.xcconfig"
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (172481 => 172482)
--- 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)
@@ -14226,7 +14226,6 @@
FEDEF84016797108000E444A /* DatabaseStrategy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DatabaseStrategy.h; sourceTree = "<group>"; };
FEE1811116C319E800084849 /* SQLTransactionBackend.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SQLTransactionBackend.cpp; sourceTree = "<group>"; };
FEE1811216C319E800084849 /* SQLTransactionBackend.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SQLTransactionBackend.h; sourceTree = "<group>"; };
- FEE7D6610D99AD16005351F6 /* iOS.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = iOS.xcconfig; sourceTree = "<group>"; };
FF945EC9161F7F3600971BC8 /* PseudoElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PseudoElement.cpp; sourceTree = "<group>"; };
FF945ECA161F7F3600971BC8 /* PseudoElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PseudoElement.h; sourceTree = "<group>"; };
FFAC30FC184FB145008C4F1E /* TrailingObjects.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TrailingObjects.h; sourceTree = "<group>"; };
@@ -15308,7 +15307,6 @@
1CDD45E60BA9C84600F90147 /* Base.xcconfig */,
1CDD45E40BA9C84600F90147 /* DebugRelease.xcconfig */,
449098B10F8F82520076A327 /* FeatureDefines.xcconfig */,
- FEE7D6610D99AD16005351F6 /* iOS.xcconfig */,
1C904DF90BA9D2C80081E9D0 /* Version.xcconfig */,
1CDD45E50BA9C84600F90147 /* WebCore.xcconfig */,
E1BA66F21742BDCC00C20251 /* WebCoreTestShim.xcconfig */,
Modified: trunk/Source/WebCore/loader/ResourceLoader.cpp (172481 => 172482)
--- 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)
@@ -146,7 +146,7 @@
return false;
#endif
- if (clientRequest.isNull()) {
+ if (clientRequest.isNull() || !clientRequest.url().isValid()) {
cancel();
return false;
}
Modified: trunk/Source/WebKit/ChangeLog (172481 => 172482)
--- 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)
@@ -1,3 +1,14 @@
+2014-08-11 Andy Estes <[email protected]>
+
+ [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:
+
2014-08-07 Brent Fulgham <[email protected]>
[Win] Unreviewed gardening.
Modified: trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj (172481 => 172482)
--- 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)
@@ -902,7 +902,6 @@
F834AAD60E64B1C700E2737C /* WebTextIterator.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebTextIterator.mm; sourceTree = "<group>"; };
F8CA15B5029A39D901000122 /* WebAuthenticationPanel.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebAuthenticationPanel.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
F8CA15B6029A39D901000122 /* WebAuthenticationPanel.m */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.objc; path = WebAuthenticationPanel.m; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
- FEE7D6910D99B06A005351F6 /* iOS.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = iOS.xcconfig; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@@ -1056,7 +1055,6 @@
1C904FD50BA9DD0F0081E9D0 /* Base.xcconfig */,
1C904FD40BA9DD0F0081E9D0 /* DebugRelease.xcconfig */,
449098B90F8F82DF0076A327 /* FeatureDefines.xcconfig */,
- FEE7D6910D99B06A005351F6 /* iOS.xcconfig */,
1C904FD30BA9DD0F0081E9D0 /* Version.xcconfig */,
1C904FD20BA9DD0F0081E9D0 /* WebKitLegacy.xcconfig */,
);
Modified: trunk/Source/WebKit/mac/ChangeLog (172481 => 172482)
--- 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)
@@ -1,3 +1,15 @@
+2014-08-11 Andy Estes <[email protected]>
+
+ [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.
+
2014-08-10 Timothy Hatcher <[email protected]>
Web Inspector: new glyphs are visible on OS X 10.9 builds
Modified: trunk/Source/WebKit/mac/Configurations/Base.xcconfig (172481 => 172482)
--- 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)
@@ -21,7 +21,7 @@
// (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 "iOS.xcconfig"
+#include "<DEVELOPER_DIR>/AppleInternal/XcodeConfig/AspenFamily.xcconfig"
#include "../../../../../Internal/Configurations/UseInternalSDK.xcconfig"
CLANG_CXX_LANGUAGE_STANDARD = gnu++0x;
Deleted: trunk/Source/WebKit/mac/Configurations/iOS.xcconfig (172481 => 172482)
--- 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)
@@ -1 +0,0 @@
-#include "<DEVELOPER_DIR>/AppleInternal/XcodeConfig/AspenFamily.xcconfig"
Modified: trunk/Source/WebKit2/ChangeLog (172481 => 172482)
--- 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)
@@ -1,3 +1,16 @@
+2014-08-11 Andy Estes <[email protected]>
+
+ [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:
+
2014-08-12 Grzegorz Czajkowski <[email protected]>
[EFL] Rename ewk_private.h to EwkDebug.h
Modified: trunk/Source/WebKit2/Configurations/Base.xcconfig (172481 => 172482)
--- 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)
@@ -21,7 +21,7 @@
// (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 "iOS.xcconfig"
+#include "<DEVELOPER_DIR>/AppleInternal/XcodeConfig/AspenFamily.xcconfig"
#include "../../../../Internal/Configurations/UseInternalSDK.xcconfig"
CLANG_CXX_LANGUAGE_STANDARD = gnu++0x;
Deleted: trunk/Source/WebKit2/Configurations/iOS.xcconfig (172481 => 172482)
--- 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)
@@ -1,24 +0,0 @@
-// 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"
Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (172481 => 172482)
--- 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)
@@ -3085,7 +3085,6 @@
762B7484120BBA2D00819339 /* WKPreferencesRefPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKPreferencesRefPrivate.h; sourceTree = "<group>"; };
7801C095142290C400FAF9AF /* WebHitTestResult.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebHitTestResult.cpp; sourceTree = "<group>"; };
7801C096142290C400FAF9AF /* WebHitTestResult.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebHitTestResult.h; sourceTree = "<group>"; };
- 7C0BB9A718DCDE890006C086 /* iOS.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = iOS.xcconfig; sourceTree = "<group>"; };
7C0BB9A818DCDE890006C086 /* WebContent-iOS.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "WebContent-iOS.entitlements"; sourceTree = "<group>"; };
7C0BB9A918DCDF5A0006C086 /* Network-iOS.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "Network-iOS.entitlements"; sourceTree = "<group>"; };
7C135AA6173B0BCA00586AE2 /* WKPluginInformation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKPluginInformation.cpp; sourceTree = "<group>"; };
@@ -4195,7 +4194,6 @@
A7BD9863194653D400D35698 /* Databases-iOS.entitlements */,
1A4F976B100E7B6600637A18 /* DebugRelease.xcconfig */,
1A4F976C100E7B6600637A18 /* FeatureDefines.xcconfig */,
- 7C0BB9A718DCDE890006C086 /* iOS.xcconfig */,
7C0BB9A918DCDF5A0006C086 /* Network-iOS.entitlements */,
510CC8461613C7C600D03ED3 /* NetworkProcess.xcconfig */,
BC8283AA16B4BEAD00A278FE /* NetworkService.Development.xcconfig */,
Modified: trunk/Source/bmalloc/ChangeLog (172481 => 172482)
--- 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)
@@ -1,3 +1,16 @@
+2014-08-11 Andy Estes <[email protected]>
+
+ [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:
+
2014-05-01 Dan Bernstein <[email protected]>
Fixed production builds for the iOS Simulator.
Modified: trunk/Source/bmalloc/Configurations/Base.xcconfig (172481 => 172482)
--- 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)
@@ -21,7 +21,7 @@
// (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 "iOS.xcconfig"
+#include "<DEVELOPER_DIR>/AppleInternal/XcodeConfig/AspenFamily.xcconfig"
#include "../../../../Internal/Configurations/UseInternalSDK.xcconfig"
CLANG_CXX_LANGUAGE_STANDARD = gnu++0x;
Deleted: trunk/Source/bmalloc/Configurations/iOS.xcconfig (172481 => 172482)
--- 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)
@@ -1 +0,0 @@
-#include "<DEVELOPER_DIR>/AppleInternal/XcodeConfig/AspenFamily.xcconfig"
Modified: trunk/Source/bmalloc/bmalloc.xcodeproj/project.pbxproj (172481 => 172482)
--- 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)
@@ -121,7 +121,6 @@
14B650C518F39F4800751968 /* Base.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Base.xcconfig; sourceTree = "<group>"; };
14B650C618F39F4800751968 /* bmalloc.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = bmalloc.xcconfig; sourceTree = "<group>"; };
14B650C718F39F4800751968 /* DebugRelease.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = DebugRelease.xcconfig; sourceTree = "<group>"; };
- 14B650C818F39F4800751968 /* iOS.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = iOS.xcconfig; sourceTree = "<group>"; };
14B650C918F3A04200751968 /* mbmalloc.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = mbmalloc.xcconfig; sourceTree = "<group>"; };
14C919C818FCC59F0028DB43 /* BPlatform.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BPlatform.h; path = bmalloc/BPlatform.h; sourceTree = "<group>"; };
14CC394418EA8743004AFE34 /* libmbmalloc.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = libmbmalloc.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -222,7 +221,6 @@
14B650C518F39F4800751968 /* Base.xcconfig */,
14B650C618F39F4800751968 /* bmalloc.xcconfig */,
14B650C718F39F4800751968 /* DebugRelease.xcconfig */,
- 14B650C818F39F4800751968 /* iOS.xcconfig */,
14B650C918F3A04200751968 /* mbmalloc.xcconfig */,
);
path = Configurations;
