Diff
Modified: branches/safari-600.1.4.11-branch/Source/_javascript_Core/ChangeLog (173623 => 173624)
--- branches/safari-600.1.4.11-branch/Source/_javascript_Core/ChangeLog 2014-09-15 17:10:23 UTC (rev 173623)
+++ branches/safari-600.1.4.11-branch/Source/_javascript_Core/ChangeLog 2014-09-15 18:40:21 UTC (rev 173624)
@@ -1,3 +1,14 @@
+2014-09-15 Babak Shafiei <[email protected]>
+
+ <rdar://problem/18327341> Disable Web Timing on this branch.
+
+ Reviewed originally by Sam Weinig.
+
+ Disable:
+ - WEB_TIMING
+
+ * Configurations/FeatureDefines.xcconfig:
+
2014-08-03 Babak Shafiei <[email protected]>
Merge patch for <rdar://problem/17887398>.
Modified: branches/safari-600.1.4.11-branch/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig (173623 => 173624)
--- branches/safari-600.1.4.11-branch/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig 2014-09-15 17:10:23 UTC (rev 173623)
+++ branches/safari-600.1.4.11-branch/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig 2014-09-15 18:40:21 UTC (rev 173624)
@@ -235,8 +235,8 @@
ENABLE_WEB_TIMING_macosx_1080 = ;
ENABLE_WEB_TIMING_macosx_1090 = ;
ENABLE_WEB_TIMING_macosx_101000 = ENABLE_WEB_TIMING;
-ENABLE_WEB_TIMING_iphoneos = ENABLE_WEB_TIMING;
-ENABLE_WEB_TIMING_iphonesimulator = $(ENABLE_WEB_TIMING_iphoneos);
+ENABLE_WEB_TIMING_iphoneos = ;
+ENABLE_WEB_TIMING_iphonesimulator = ;
ENABLE_WEBVTT_REGIONS = ENABLE_WEBVTT_REGIONS;
ENABLE_XHR_TIMEOUT = ENABLE_XHR_TIMEOUT;
Modified: branches/safari-600.1.4.11-branch/Source/WebCore/ChangeLog (173623 => 173624)
--- branches/safari-600.1.4.11-branch/Source/WebCore/ChangeLog 2014-09-15 17:10:23 UTC (rev 173623)
+++ branches/safari-600.1.4.11-branch/Source/WebCore/ChangeLog 2014-09-15 18:40:21 UTC (rev 173624)
@@ -1,3 +1,14 @@
+2014-09-15 Babak Shafiei <[email protected]>
+
+ <rdar://problem/18327341> Disable Web Timing on this branch.
+
+ Reviewed originally by Sam Weinig.
+
+ Disable:
+ - WEB_TIMING
+
+ * Configurations/FeatureDefines.xcconfig:
+
2014-09-11 Babak Shafiei <[email protected]>
Merge r173016.
Modified: branches/safari-600.1.4.11-branch/Source/WebCore/Configurations/FeatureDefines.xcconfig (173623 => 173624)
--- branches/safari-600.1.4.11-branch/Source/WebCore/Configurations/FeatureDefines.xcconfig 2014-09-15 17:10:23 UTC (rev 173623)
+++ branches/safari-600.1.4.11-branch/Source/WebCore/Configurations/FeatureDefines.xcconfig 2014-09-15 18:40:21 UTC (rev 173624)
@@ -235,8 +235,8 @@
ENABLE_WEB_TIMING_macosx_1080 = ;
ENABLE_WEB_TIMING_macosx_1090 = ;
ENABLE_WEB_TIMING_macosx_101000 = ENABLE_WEB_TIMING;
-ENABLE_WEB_TIMING_iphoneos = ENABLE_WEB_TIMING;
-ENABLE_WEB_TIMING_iphonesimulator = $(ENABLE_WEB_TIMING_iphoneos);
+ENABLE_WEB_TIMING_iphoneos = ;
+ENABLE_WEB_TIMING_iphonesimulator = ;
ENABLE_WEBVTT_REGIONS = ENABLE_WEBVTT_REGIONS;
ENABLE_XHR_TIMEOUT = ENABLE_XHR_TIMEOUT;
Modified: branches/safari-600.1.4.11-branch/Source/WebKit/ChangeLog (173623 => 173624)
--- branches/safari-600.1.4.11-branch/Source/WebKit/ChangeLog 2014-09-15 17:10:23 UTC (rev 173623)
+++ branches/safari-600.1.4.11-branch/Source/WebKit/ChangeLog 2014-09-15 18:40:21 UTC (rev 173624)
@@ -1,3 +1,14 @@
+2014-09-15 Babak Shafiei <[email protected]>
+
+ <rdar://problem/18327341> Disable Web Timing on this branch.
+
+ Reviewed originally by Sam Weinig.
+
+ Disable:
+ - WEB_TIMING
+
+ * mac/Configurations/FeatureDefines.xcconfig:
+
2014-07-09 Brent Fulgham <[email protected]>
[Win] Remove uses of 'bash' in build system
Modified: branches/safari-600.1.4.11-branch/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig (173623 => 173624)
--- branches/safari-600.1.4.11-branch/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig 2014-09-15 17:10:23 UTC (rev 173623)
+++ branches/safari-600.1.4.11-branch/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig 2014-09-15 18:40:21 UTC (rev 173624)
@@ -235,8 +235,8 @@
ENABLE_WEB_TIMING_macosx_1080 = ;
ENABLE_WEB_TIMING_macosx_1090 = ;
ENABLE_WEB_TIMING_macosx_101000 = ENABLE_WEB_TIMING;
-ENABLE_WEB_TIMING_iphoneos = ENABLE_WEB_TIMING;
-ENABLE_WEB_TIMING_iphonesimulator = $(ENABLE_WEB_TIMING_iphoneos);
+ENABLE_WEB_TIMING_iphoneos = ;
+ENABLE_WEB_TIMING_iphonesimulator = ;
ENABLE_WEBVTT_REGIONS = ENABLE_WEBVTT_REGIONS;
ENABLE_XHR_TIMEOUT = ENABLE_XHR_TIMEOUT;
Modified: branches/safari-600.1.4.11-branch/Source/WebKit2/ChangeLog (173623 => 173624)
--- branches/safari-600.1.4.11-branch/Source/WebKit2/ChangeLog 2014-09-15 17:10:23 UTC (rev 173623)
+++ branches/safari-600.1.4.11-branch/Source/WebKit2/ChangeLog 2014-09-15 18:40:21 UTC (rev 173624)
@@ -1,3 +1,14 @@
+2014-09-15 Babak Shafiei <[email protected]>
+
+ <rdar://problem/18327341> Disable Web Timing on this branch.
+
+ Reviewed originally by Sam Weinig.
+
+ Disable:
+ - WEB_TIMING
+
+ * Configurations/FeatureDefines.xcconfig:
+
2014-09-11 Babak Shafiei <[email protected]>
Roll out r173450.
Modified: branches/safari-600.1.4.11-branch/Source/WebKit2/Configurations/FeatureDefines.xcconfig (173623 => 173624)
--- branches/safari-600.1.4.11-branch/Source/WebKit2/Configurations/FeatureDefines.xcconfig 2014-09-15 17:10:23 UTC (rev 173623)
+++ branches/safari-600.1.4.11-branch/Source/WebKit2/Configurations/FeatureDefines.xcconfig 2014-09-15 18:40:21 UTC (rev 173624)
@@ -235,8 +235,8 @@
ENABLE_WEB_TIMING_macosx_1080 = ;
ENABLE_WEB_TIMING_macosx_1090 = ;
ENABLE_WEB_TIMING_macosx_101000 = ENABLE_WEB_TIMING;
-ENABLE_WEB_TIMING_iphoneos = ENABLE_WEB_TIMING;
-ENABLE_WEB_TIMING_iphonesimulator = $(ENABLE_WEB_TIMING_iphoneos);
+ENABLE_WEB_TIMING_iphoneos = ;
+ENABLE_WEB_TIMING_iphonesimulator = ;
ENABLE_WEBVTT_REGIONS = ENABLE_WEBVTT_REGIONS;
ENABLE_XHR_TIMEOUT = ENABLE_XHR_TIMEOUT;