Diff
Modified: trunk/LayoutTests/ChangeLog (159178 => 159179)
--- trunk/LayoutTests/ChangeLog 2013-11-13 06:52:14 UTC (rev 159178)
+++ trunk/LayoutTests/ChangeLog 2013-11-13 07:24:54 UTC (rev 159179)
@@ -1,3 +1,12 @@
+2013-11-12 Alexey Proskuryakov <[email protected]>
+
+ Disable WebCrypto on Mountain Lion
+ https://bugs.webkit.org/show_bug.cgi?id=124261
+
+ Rubber-stamped by Sam Weinig.
+
+ * platform/mac/TestExpectations:
+
2013-11-12 Tim Horton <[email protected]>
Revert r159140, as it is theoretically fixed by r159173.
Modified: trunk/LayoutTests/platform/mac/TestExpectations (159178 => 159179)
--- trunk/LayoutTests/platform/mac/TestExpectations 2013-11-13 06:52:14 UTC (rev 159178)
+++ trunk/LayoutTests/platform/mac/TestExpectations 2013-11-13 07:24:54 UTC (rev 159179)
@@ -1300,3 +1300,6 @@
# Audio and video tracks aren't supported on mac
media/track/audio
media/track/video
+
+# SubtleCrypto is disabled on Mountain Lion
+webkit.org/b/124261 [ MountainLion ] crypto/subtle [ Skip ]
Modified: trunk/Source/_javascript_Core/ChangeLog (159178 => 159179)
--- trunk/Source/_javascript_Core/ChangeLog 2013-11-13 06:52:14 UTC (rev 159178)
+++ trunk/Source/_javascript_Core/ChangeLog 2013-11-13 07:24:54 UTC (rev 159179)
@@ -1,3 +1,12 @@
+2013-11-12 Alexey Proskuryakov <[email protected]>
+
+ Disable WebCrypto on Mountain Lion
+ https://bugs.webkit.org/show_bug.cgi?id=124261
+
+ Rubber-stamped by Sam Weinig.
+
+ * Configurations/FeatureDefines.xcconfig:
+
2013-11-12 Julien Brianceau <[email protected]>
[sh4] Fix load32WithUnalignedHalfWords function in baseline JIT.
Modified: trunk/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig (159178 => 159179)
--- trunk/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig 2013-11-13 06:52:14 UTC (rev 159178)
+++ trunk/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig 2013-11-13 07:24:54 UTC (rev 159179)
@@ -158,7 +158,13 @@
ENABLE_SPEECH_SYNTHESIS_macosx = ENABLE_SPEECH_SYNTHESIS;
ENABLE_SQL_DATABASE = ENABLE_SQL_DATABASE;
ENABLE_SUBPIXEL_LAYOUT = ;
-ENABLE_SUBTLE_CRYPTO = ENABLE_SUBTLE_CRYPTO;
+ENABLE_SUBTLE_CRYPTO = $(ENABLE_SUBTLE_CRYPTO_$(PLATFORM_NAME));
+ENABLE_SUBTLE_CRYPTO_macosx = $(ENABLE_SUBTLE_CRYPTO_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
+ENABLE_SUBTLE_CRYPTO_macosx_1080 = ;
+ENABLE_SUBTLE_CRYPTO_macosx_1090 = ENABLE_SUBTLE_CRYPTO;
+ENABLE_SUBTLE_CRYPTO_macosx_101000 = ENABLE_SUBTLE_CRYPTO;
+ENABLE_SUBTLE_CRYPTO_iphoneos = ENABLE_SUBTLE_CRYPTO;
+ENABLE_SUBTLE_CRYPTO_iphonesimulator = $(ENABLE_SUBTLE_CRYPTO_iphoneos);
ENABLE_SVG = ENABLE_SVG;
ENABLE_SVG_FONTS = ENABLE_SVG_FONTS;
ENABLE_TEMPLATE_ELEMENT = ;
Modified: trunk/Source/WebCore/ChangeLog (159178 => 159179)
--- trunk/Source/WebCore/ChangeLog 2013-11-13 06:52:14 UTC (rev 159178)
+++ trunk/Source/WebCore/ChangeLog 2013-11-13 07:24:54 UTC (rev 159179)
@@ -1,3 +1,12 @@
+2013-11-12 Alexey Proskuryakov <[email protected]>
+
+ Disable WebCrypto on Mountain Lion
+ https://bugs.webkit.org/show_bug.cgi?id=124261
+
+ Rubber-stamped by Sam Weinig.
+
+ * Configurations/FeatureDefines.xcconfig:
+
2013-11-12 Zan Dobersek <[email protected]>
Manage XMLHttpRequestUpload, XSLImportRule, XMLErrors, XML pending callback classes through std::unique_ptr
Modified: trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig (159178 => 159179)
--- trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig 2013-11-13 06:52:14 UTC (rev 159178)
+++ trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig 2013-11-13 07:24:54 UTC (rev 159179)
@@ -158,7 +158,13 @@
ENABLE_SPEECH_SYNTHESIS_macosx = ENABLE_SPEECH_SYNTHESIS;
ENABLE_SQL_DATABASE = ENABLE_SQL_DATABASE;
ENABLE_SUBPIXEL_LAYOUT = ;
-ENABLE_SUBTLE_CRYPTO = ENABLE_SUBTLE_CRYPTO;
+ENABLE_SUBTLE_CRYPTO = $(ENABLE_SUBTLE_CRYPTO_$(PLATFORM_NAME));
+ENABLE_SUBTLE_CRYPTO_macosx = $(ENABLE_SUBTLE_CRYPTO_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
+ENABLE_SUBTLE_CRYPTO_macosx_1080 = ;
+ENABLE_SUBTLE_CRYPTO_macosx_1090 = ENABLE_SUBTLE_CRYPTO;
+ENABLE_SUBTLE_CRYPTO_macosx_101000 = ENABLE_SUBTLE_CRYPTO;
+ENABLE_SUBTLE_CRYPTO_iphoneos = ENABLE_SUBTLE_CRYPTO;
+ENABLE_SUBTLE_CRYPTO_iphonesimulator = $(ENABLE_SUBTLE_CRYPTO_iphoneos);
ENABLE_SVG = ENABLE_SVG;
ENABLE_SVG_FONTS = ENABLE_SVG_FONTS;
ENABLE_TEMPLATE_ELEMENT = ;
Modified: trunk/Source/WebKit/mac/ChangeLog (159178 => 159179)
--- trunk/Source/WebKit/mac/ChangeLog 2013-11-13 06:52:14 UTC (rev 159178)
+++ trunk/Source/WebKit/mac/ChangeLog 2013-11-13 07:24:54 UTC (rev 159179)
@@ -1,3 +1,12 @@
+2013-11-12 Alexey Proskuryakov <[email protected]>
+
+ Disable WebCrypto on Mountain Lion
+ https://bugs.webkit.org/show_bug.cgi?id=124261
+
+ Rubber-stamped by Sam Weinig.
+
+ * Configurations/FeatureDefines.xcconfig:
+
2013-11-12 Andy Estes <[email protected]>
[Mac] Fix some deprecation warnings
Modified: trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig (159178 => 159179)
--- trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig 2013-11-13 06:52:14 UTC (rev 159178)
+++ trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig 2013-11-13 07:24:54 UTC (rev 159179)
@@ -158,7 +158,13 @@
ENABLE_SPEECH_SYNTHESIS_macosx = ENABLE_SPEECH_SYNTHESIS;
ENABLE_SQL_DATABASE = ENABLE_SQL_DATABASE;
ENABLE_SUBPIXEL_LAYOUT = ;
-ENABLE_SUBTLE_CRYPTO = ENABLE_SUBTLE_CRYPTO;
+ENABLE_SUBTLE_CRYPTO = $(ENABLE_SUBTLE_CRYPTO_$(PLATFORM_NAME));
+ENABLE_SUBTLE_CRYPTO_macosx = $(ENABLE_SUBTLE_CRYPTO_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
+ENABLE_SUBTLE_CRYPTO_macosx_1080 = ;
+ENABLE_SUBTLE_CRYPTO_macosx_1090 = ENABLE_SUBTLE_CRYPTO;
+ENABLE_SUBTLE_CRYPTO_macosx_101000 = ENABLE_SUBTLE_CRYPTO;
+ENABLE_SUBTLE_CRYPTO_iphoneos = ENABLE_SUBTLE_CRYPTO;
+ENABLE_SUBTLE_CRYPTO_iphonesimulator = $(ENABLE_SUBTLE_CRYPTO_iphoneos);
ENABLE_SVG = ENABLE_SVG;
ENABLE_SVG_FONTS = ENABLE_SVG_FONTS;
ENABLE_TEMPLATE_ELEMENT = ;
Modified: trunk/Source/WebKit2/ChangeLog (159178 => 159179)
--- trunk/Source/WebKit2/ChangeLog 2013-11-13 06:52:14 UTC (rev 159178)
+++ trunk/Source/WebKit2/ChangeLog 2013-11-13 07:24:54 UTC (rev 159179)
@@ -1,3 +1,12 @@
+2013-11-12 Alexey Proskuryakov <[email protected]>
+
+ Disable WebCrypto on Mountain Lion
+ https://bugs.webkit.org/show_bug.cgi?id=124261
+
+ Rubber-stamped by Sam Weinig.
+
+ * Configurations/FeatureDefines.xcconfig:
+
2013-11-12 Nick Diego Yamane <[email protected]>
[GTK][EFL] More on renaming WebKit::APIObject to API::Object
Modified: trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig (159178 => 159179)
--- trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig 2013-11-13 06:52:14 UTC (rev 159178)
+++ trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig 2013-11-13 07:24:54 UTC (rev 159179)
@@ -158,7 +158,13 @@
ENABLE_SPEECH_SYNTHESIS_macosx = ENABLE_SPEECH_SYNTHESIS;
ENABLE_SQL_DATABASE = ENABLE_SQL_DATABASE;
ENABLE_SUBPIXEL_LAYOUT = ;
-ENABLE_SUBTLE_CRYPTO = ENABLE_SUBTLE_CRYPTO;
+ENABLE_SUBTLE_CRYPTO = $(ENABLE_SUBTLE_CRYPTO_$(PLATFORM_NAME));
+ENABLE_SUBTLE_CRYPTO_macosx = $(ENABLE_SUBTLE_CRYPTO_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
+ENABLE_SUBTLE_CRYPTO_macosx_1080 = ;
+ENABLE_SUBTLE_CRYPTO_macosx_1090 = ENABLE_SUBTLE_CRYPTO;
+ENABLE_SUBTLE_CRYPTO_macosx_101000 = ENABLE_SUBTLE_CRYPTO;
+ENABLE_SUBTLE_CRYPTO_iphoneos = ENABLE_SUBTLE_CRYPTO;
+ENABLE_SUBTLE_CRYPTO_iphonesimulator = $(ENABLE_SUBTLE_CRYPTO_iphoneos);
ENABLE_SVG = ENABLE_SVG;
ENABLE_SVG_FONTS = ENABLE_SVG_FONTS;
ENABLE_TEMPLATE_ELEMENT = ;
