Diff
Modified: tags/Safari-601.1.22.1/Source/_javascript_Core/ChangeLog (181492 => 181493)
--- tags/Safari-601.1.22.1/Source/_javascript_Core/ChangeLog 2015-03-14 01:10:53 UTC (rev 181492)
+++ tags/Safari-601.1.22.1/Source/_javascript_Core/ChangeLog 2015-03-14 01:44:54 UTC (rev 181493)
@@ -1,3 +1,16 @@
+2015-03-13 Babak Shafiei <[email protected]>
+
+ Merge r181491.
+
+ 2015-03-13 Eric Carlson <[email protected]>
+
+ [Mac] Enable WIRELESS_PLAYBACK_TARGET
+ https://bugs.webkit.org/show_bug.cgi?id=142635
+
+ Reviewed by Darin Adler.
+
+ * Configurations/FeatureDefines.xcconfig:
+
2015-03-10 Darin Adler <[email protected]>
Some event handler fixes
Modified: tags/Safari-601.1.22.1/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig (181492 => 181493)
--- tags/Safari-601.1.22.1/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig 2015-03-14 01:10:53 UTC (rev 181492)
+++ tags/Safari-601.1.22.1/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig 2015-03-14 01:44:54 UTC (rev 181493)
@@ -103,6 +103,10 @@
ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS_macosx_101100 = ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS;
ENABLE_WIRELESS_PLAYBACK_TARGET[sdk=iphone*] = ENABLE_WIRELESS_PLAYBACK_TARGET;
+ENABLE_WIRELESS_PLAYBACK_TARGET[sdk=macosx*] = $(ENABLE_WIRELESS_PLAYBACK_TARGET_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR))
+ENABLE_WIRELESS_PLAYBACK_TARGET_macosx_1090 = ;
+ENABLE_WIRELESS_PLAYBACK_TARGET_macosx_101000 = ;
+ENABLE_WIRELESS_PLAYBACK_TARGET_macosx_101100 = ENABLE_WIRELESS_PLAYBACK_TARGET;
ENABLE_IOS_GESTURE_EVENTS[sdk=iphone*] = $(ENABLE_IOS_GESTURE_EVENTS_ios_WITH_INTERNAL_SDK_$(USE_INTERNAL_SDK));
ENABLE_IOS_GESTURE_EVENTS_ios_WITH_INTERNAL_SDK_YES = ENABLE_IOS_GESTURE_EVENTS;
Modified: tags/Safari-601.1.22.1/Source/WebCore/ChangeLog (181492 => 181493)
--- tags/Safari-601.1.22.1/Source/WebCore/ChangeLog 2015-03-14 01:10:53 UTC (rev 181492)
+++ tags/Safari-601.1.22.1/Source/WebCore/ChangeLog 2015-03-14 01:44:54 UTC (rev 181493)
@@ -1,3 +1,16 @@
+2015-03-13 Babak Shafiei <[email protected]>
+
+ Merge r181491.
+
+ 2015-03-13 Eric Carlson <[email protected]>
+
+ [Mac] Enable WIRELESS_PLAYBACK_TARGET
+ https://bugs.webkit.org/show_bug.cgi?id=142635
+
+ Reviewed by Darin Adler.
+
+ * Configurations/FeatureDefines.xcconfig:
+
2015-03-12 Babak Shafiei <[email protected]>
Merge r181442.
Modified: tags/Safari-601.1.22.1/Source/WebCore/Configurations/FeatureDefines.xcconfig (181492 => 181493)
--- tags/Safari-601.1.22.1/Source/WebCore/Configurations/FeatureDefines.xcconfig 2015-03-14 01:10:53 UTC (rev 181492)
+++ tags/Safari-601.1.22.1/Source/WebCore/Configurations/FeatureDefines.xcconfig 2015-03-14 01:44:54 UTC (rev 181493)
@@ -103,6 +103,10 @@
ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS_macosx_101100 = ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS;
ENABLE_WIRELESS_PLAYBACK_TARGET[sdk=iphone*] = ENABLE_WIRELESS_PLAYBACK_TARGET;
+ENABLE_WIRELESS_PLAYBACK_TARGET[sdk=macosx*] = $(ENABLE_WIRELESS_PLAYBACK_TARGET_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR))
+ENABLE_WIRELESS_PLAYBACK_TARGET_macosx_1090 = ;
+ENABLE_WIRELESS_PLAYBACK_TARGET_macosx_101000 = ;
+ENABLE_WIRELESS_PLAYBACK_TARGET_macosx_101100 = ENABLE_WIRELESS_PLAYBACK_TARGET;
ENABLE_IOS_GESTURE_EVENTS[sdk=iphone*] = $(ENABLE_IOS_GESTURE_EVENTS_ios_WITH_INTERNAL_SDK_$(USE_INTERNAL_SDK));
ENABLE_IOS_GESTURE_EVENTS_ios_WITH_INTERNAL_SDK_YES = ENABLE_IOS_GESTURE_EVENTS;
Modified: tags/Safari-601.1.22.1/Source/WebKit/mac/ChangeLog (181492 => 181493)
--- tags/Safari-601.1.22.1/Source/WebKit/mac/ChangeLog 2015-03-14 01:10:53 UTC (rev 181492)
+++ tags/Safari-601.1.22.1/Source/WebKit/mac/ChangeLog 2015-03-14 01:44:54 UTC (rev 181493)
@@ -1,3 +1,16 @@
+2015-03-13 Babak Shafiei <[email protected]>
+
+ Merge r181491.
+
+ 2015-03-13 Eric Carlson <[email protected]>
+
+ [Mac] Enable WIRELESS_PLAYBACK_TARGET
+ https://bugs.webkit.org/show_bug.cgi?id=142635
+
+ Reviewed by Darin Adler.
+
+ * Configurations/FeatureDefines.xcconfig:
+
2015-03-10 Timothy Horton <[email protected]>
Fix the build
Modified: tags/Safari-601.1.22.1/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig (181492 => 181493)
--- tags/Safari-601.1.22.1/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig 2015-03-14 01:10:53 UTC (rev 181492)
+++ tags/Safari-601.1.22.1/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig 2015-03-14 01:44:54 UTC (rev 181493)
@@ -103,6 +103,10 @@
ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS_macosx_101100 = ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS;
ENABLE_WIRELESS_PLAYBACK_TARGET[sdk=iphone*] = ENABLE_WIRELESS_PLAYBACK_TARGET;
+ENABLE_WIRELESS_PLAYBACK_TARGET[sdk=macosx*] = $(ENABLE_WIRELESS_PLAYBACK_TARGET_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR))
+ENABLE_WIRELESS_PLAYBACK_TARGET_macosx_1090 = ;
+ENABLE_WIRELESS_PLAYBACK_TARGET_macosx_101000 = ;
+ENABLE_WIRELESS_PLAYBACK_TARGET_macosx_101100 = ENABLE_WIRELESS_PLAYBACK_TARGET;
ENABLE_IOS_GESTURE_EVENTS[sdk=iphone*] = $(ENABLE_IOS_GESTURE_EVENTS_ios_WITH_INTERNAL_SDK_$(USE_INTERNAL_SDK));
ENABLE_IOS_GESTURE_EVENTS_ios_WITH_INTERNAL_SDK_YES = ENABLE_IOS_GESTURE_EVENTS;
Modified: tags/Safari-601.1.22.1/Source/WebKit2/ChangeLog (181492 => 181493)
--- tags/Safari-601.1.22.1/Source/WebKit2/ChangeLog 2015-03-14 01:10:53 UTC (rev 181492)
+++ tags/Safari-601.1.22.1/Source/WebKit2/ChangeLog 2015-03-14 01:44:54 UTC (rev 181493)
@@ -1,3 +1,16 @@
+2015-03-13 Babak Shafiei <[email protected]>
+
+ Merge r181491.
+
+ 2015-03-13 Eric Carlson <[email protected]>
+
+ [Mac] Enable WIRELESS_PLAYBACK_TARGET
+ https://bugs.webkit.org/show_bug.cgi?id=142635
+
+ Reviewed by Darin Adler.
+
+ * Configurations/FeatureDefines.xcconfig:
+
2015-03-12 Babak Shafiei <[email protected]>
Merge r181442.
Modified: tags/Safari-601.1.22.1/Source/WebKit2/Configurations/FeatureDefines.xcconfig (181492 => 181493)
--- tags/Safari-601.1.22.1/Source/WebKit2/Configurations/FeatureDefines.xcconfig 2015-03-14 01:10:53 UTC (rev 181492)
+++ tags/Safari-601.1.22.1/Source/WebKit2/Configurations/FeatureDefines.xcconfig 2015-03-14 01:44:54 UTC (rev 181493)
@@ -103,6 +103,10 @@
ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS_macosx_101100 = ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS;
ENABLE_WIRELESS_PLAYBACK_TARGET[sdk=iphone*] = ENABLE_WIRELESS_PLAYBACK_TARGET;
+ENABLE_WIRELESS_PLAYBACK_TARGET[sdk=macosx*] = $(ENABLE_WIRELESS_PLAYBACK_TARGET_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR))
+ENABLE_WIRELESS_PLAYBACK_TARGET_macosx_1090 = ;
+ENABLE_WIRELESS_PLAYBACK_TARGET_macosx_101000 = ;
+ENABLE_WIRELESS_PLAYBACK_TARGET_macosx_101100 = ENABLE_WIRELESS_PLAYBACK_TARGET;
ENABLE_IOS_GESTURE_EVENTS[sdk=iphone*] = $(ENABLE_IOS_GESTURE_EVENTS_ios_WITH_INTERNAL_SDK_$(USE_INTERNAL_SDK));
ENABLE_IOS_GESTURE_EVENTS_ios_WITH_INTERNAL_SDK_YES = ENABLE_IOS_GESTURE_EVENTS;