[webkit-changes] [197189] branches/safari-601-branch/Source

Fri, 26 Feb 2016 11:47:48 -0800

Title: [197189] branches/safari-601-branch/Source

Diff

Modified: branches/safari-601-branch/Source/_javascript_Core/ChangeLog (197188 => 197189)


--- branches/safari-601-branch/Source/_javascript_Core/ChangeLog	2016-02-26 19:45:11 UTC (rev 197188)
+++ branches/safari-601-branch/Source/_javascript_Core/ChangeLog	2016-02-26 19:47:33 UTC (rev 197189)
@@ -1,3 +1,7 @@
+2016-02-26  Babak Shafiei  <[email protected]>
+
+        Merge patch for rdar://problem/24826901.
+
 2016-02-12  Babak Shafiei  <[email protected]>
 
         Merge patch for rdar://problem/24626412.

Modified: branches/safari-601-branch/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig (197188 => 197189)


--- branches/safari-601-branch/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig	2016-02-26 19:45:11 UTC (rev 197188)
+++ branches/safari-601-branch/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig	2016-02-26 19:47:33 UTC (rev 197189)
@@ -123,8 +123,11 @@
 ENABLE_IOS_GESTURE_EVENTS_ios_WITH_INTERNAL_SDK_YES = ENABLE_IOS_GESTURE_EVENTS;
 
 ENABLE_MAC_GESTURE_EVENTS = ;
-ENABLE_MAC_GESTURE_EVENTS[sdk=macosx*] = $(ENABLE_MAC_GESTURE_EVENTS_macosx_WITH_INTERNAL_SDK_$(USE_INTERNAL_SDK));
-ENABLE_MAC_GESTURE_EVENTS_macosx_WITH_INTERNAL_SDK_YES = ENABLE_MAC_GESTURE_EVENTS;
+ENABLE_MAC_GESTURE_EVENTS[sdk=macosx*] = $(ENABLE_MAC_GESTURE_EVENTS_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR)_WITH_INTERNAL_SDK_$(USE_INTERNAL_SDK));
+ENABLE_MAC_GESTURE_EVENTS_macosx_1090_WITH_INTERNAL_SDK_YES = ;
+ENABLE_MAC_GESTURE_EVENTS_macosx_101000_WITH_INTERNAL_SDK_YES = ENABLE_MAC_GESTURE_EVENTS;
+ENABLE_MAC_GESTURE_EVENTS_macosx_101100_WITH_INTERNAL_SDK_YES = ENABLE_MAC_GESTURE_EVENTS;
+ENABLE_MAC_GESTURE_EVENTS_macosx_101200_WITH_INTERNAL_SDK_YES = ENABLE_MAC_GESTURE_EVENTS;
 
 ENABLE_IOS_TEXT_AUTOSIZING[sdk=iphone*] = ENABLE_IOS_TEXT_AUTOSIZING;

Modified: branches/safari-601-branch/Source/WebCore/ChangeLog (197188 => 197189)


--- branches/safari-601-branch/Source/WebCore/ChangeLog	2016-02-26 19:45:11 UTC (rev 197188)
+++ branches/safari-601-branch/Source/WebCore/ChangeLog	2016-02-26 19:47:33 UTC (rev 197189)
@@ -1,3 +1,7 @@
+2016-02-26  Babak Shafiei  <[email protected]>
+
+        Merge patch for rdar://problem/24826901.
+
 2016-02-19  Matthew Hanson  <[email protected]>
 
         Merge r196703. rdar://problem/24623986

Modified: branches/safari-601-branch/Source/WebCore/Configurations/FeatureDefines.xcconfig (197188 => 197189)


--- branches/safari-601-branch/Source/WebCore/Configurations/FeatureDefines.xcconfig	2016-02-26 19:45:11 UTC (rev 197188)
+++ branches/safari-601-branch/Source/WebCore/Configurations/FeatureDefines.xcconfig	2016-02-26 19:47:33 UTC (rev 197189)
@@ -123,8 +123,11 @@
 ENABLE_IOS_GESTURE_EVENTS_ios_WITH_INTERNAL_SDK_YES = ENABLE_IOS_GESTURE_EVENTS;
 
 ENABLE_MAC_GESTURE_EVENTS = ;
-ENABLE_MAC_GESTURE_EVENTS[sdk=macosx*] = $(ENABLE_MAC_GESTURE_EVENTS_macosx_WITH_INTERNAL_SDK_$(USE_INTERNAL_SDK));
-ENABLE_MAC_GESTURE_EVENTS_macosx_WITH_INTERNAL_SDK_YES = ENABLE_MAC_GESTURE_EVENTS;
+ENABLE_MAC_GESTURE_EVENTS[sdk=macosx*] = $(ENABLE_MAC_GESTURE_EVENTS_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR)_WITH_INTERNAL_SDK_$(USE_INTERNAL_SDK));
+ENABLE_MAC_GESTURE_EVENTS_macosx_1090_WITH_INTERNAL_SDK_YES = ;
+ENABLE_MAC_GESTURE_EVENTS_macosx_101000_WITH_INTERNAL_SDK_YES = ENABLE_MAC_GESTURE_EVENTS;
+ENABLE_MAC_GESTURE_EVENTS_macosx_101100_WITH_INTERNAL_SDK_YES = ENABLE_MAC_GESTURE_EVENTS;
+ENABLE_MAC_GESTURE_EVENTS_macosx_101200_WITH_INTERNAL_SDK_YES = ENABLE_MAC_GESTURE_EVENTS;
 
 ENABLE_IOS_TEXT_AUTOSIZING[sdk=iphone*] = ENABLE_IOS_TEXT_AUTOSIZING;

Modified: branches/safari-601-branch/Source/WebKit/ChangeLog (197188 => 197189)


--- branches/safari-601-branch/Source/WebKit/ChangeLog	2016-02-26 19:45:11 UTC (rev 197188)
+++ branches/safari-601-branch/Source/WebKit/ChangeLog	2016-02-26 19:47:33 UTC (rev 197189)
@@ -1,3 +1,7 @@
+2016-02-26  Babak Shafiei  <[email protected]>
+
+        Merge patch for rdar://problem/24826901.
+
 2016-01-20  Matthew Hanson  <[email protected]>
 
         Rollout r192200 via r195067. rdar://problem/24154288

Modified: branches/safari-601-branch/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig (197188 => 197189)


--- branches/safari-601-branch/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig	2016-02-26 19:45:11 UTC (rev 197188)
+++ branches/safari-601-branch/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig	2016-02-26 19:47:33 UTC (rev 197189)
@@ -123,8 +123,11 @@
 ENABLE_IOS_GESTURE_EVENTS_ios_WITH_INTERNAL_SDK_YES = ENABLE_IOS_GESTURE_EVENTS;
 
 ENABLE_MAC_GESTURE_EVENTS = ;
-ENABLE_MAC_GESTURE_EVENTS[sdk=macosx*] = $(ENABLE_MAC_GESTURE_EVENTS_macosx_WITH_INTERNAL_SDK_$(USE_INTERNAL_SDK));
-ENABLE_MAC_GESTURE_EVENTS_macosx_WITH_INTERNAL_SDK_YES = ENABLE_MAC_GESTURE_EVENTS;
+ENABLE_MAC_GESTURE_EVENTS[sdk=macosx*] = $(ENABLE_MAC_GESTURE_EVENTS_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR)_WITH_INTERNAL_SDK_$(USE_INTERNAL_SDK));
+ENABLE_MAC_GESTURE_EVENTS_macosx_1090_WITH_INTERNAL_SDK_YES = ;
+ENABLE_MAC_GESTURE_EVENTS_macosx_101000_WITH_INTERNAL_SDK_YES = ENABLE_MAC_GESTURE_EVENTS;
+ENABLE_MAC_GESTURE_EVENTS_macosx_101100_WITH_INTERNAL_SDK_YES = ENABLE_MAC_GESTURE_EVENTS;
+ENABLE_MAC_GESTURE_EVENTS_macosx_101200_WITH_INTERNAL_SDK_YES = ENABLE_MAC_GESTURE_EVENTS;
 
 ENABLE_IOS_TEXT_AUTOSIZING[sdk=iphone*] = ENABLE_IOS_TEXT_AUTOSIZING;

Modified: branches/safari-601-branch/Source/WebKit2/ChangeLog (197188 => 197189)


--- branches/safari-601-branch/Source/WebKit2/ChangeLog	2016-02-26 19:45:11 UTC (rev 197188)
+++ branches/safari-601-branch/Source/WebKit2/ChangeLog	2016-02-26 19:47:33 UTC (rev 197189)
@@ -1,3 +1,7 @@
+2016-02-26  Babak Shafiei  <[email protected]>
+
+        Merge patch for rdar://problem/24826901.
+
 2016-02-03  Jeff Miller  <[email protected]>
 
         Update WebKit2.framework copyright string to include 2016.

Modified: branches/safari-601-branch/Source/WebKit2/Configurations/FeatureDefines.xcconfig (197188 => 197189)


--- branches/safari-601-branch/Source/WebKit2/Configurations/FeatureDefines.xcconfig	2016-02-26 19:45:11 UTC (rev 197188)
+++ branches/safari-601-branch/Source/WebKit2/Configurations/FeatureDefines.xcconfig	2016-02-26 19:47:33 UTC (rev 197189)
@@ -123,8 +123,11 @@
 ENABLE_IOS_GESTURE_EVENTS_ios_WITH_INTERNAL_SDK_YES = ENABLE_IOS_GESTURE_EVENTS;
 
 ENABLE_MAC_GESTURE_EVENTS = ;
-ENABLE_MAC_GESTURE_EVENTS[sdk=macosx*] = $(ENABLE_MAC_GESTURE_EVENTS_macosx_WITH_INTERNAL_SDK_$(USE_INTERNAL_SDK));
-ENABLE_MAC_GESTURE_EVENTS_macosx_WITH_INTERNAL_SDK_YES = ENABLE_MAC_GESTURE_EVENTS;
+ENABLE_MAC_GESTURE_EVENTS[sdk=macosx*] = $(ENABLE_MAC_GESTURE_EVENTS_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR)_WITH_INTERNAL_SDK_$(USE_INTERNAL_SDK));
+ENABLE_MAC_GESTURE_EVENTS_macosx_1090_WITH_INTERNAL_SDK_YES = ;
+ENABLE_MAC_GESTURE_EVENTS_macosx_101000_WITH_INTERNAL_SDK_YES = ENABLE_MAC_GESTURE_EVENTS;
+ENABLE_MAC_GESTURE_EVENTS_macosx_101100_WITH_INTERNAL_SDK_YES = ENABLE_MAC_GESTURE_EVENTS;
+ENABLE_MAC_GESTURE_EVENTS_macosx_101200_WITH_INTERNAL_SDK_YES = ENABLE_MAC_GESTURE_EVENTS;
 
 ENABLE_IOS_TEXT_AUTOSIZING[sdk=iphone*] = ENABLE_IOS_TEXT_AUTOSIZING;
 

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to