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

Wed, 27 Jan 2016 17:34:48 -0800

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

Diff

Modified: branches/safari-601-branch/Source/_javascript_Core/ChangeLog (195713 => 195714)


--- branches/safari-601-branch/Source/_javascript_Core/ChangeLog	2016-01-28 01:34:00 UTC (rev 195713)
+++ branches/safari-601-branch/Source/_javascript_Core/ChangeLog	2016-01-28 01:34:05 UTC (rev 195714)
@@ -1,5 +1,19 @@
 2016-01-27  Matthew Hanson  <[email protected]>
 
+        Merge r194559. rdar://problem/24269083
+
+    2016-01-04  Tim Horton  <[email protected]>
+
+            Turn on gesture events when building for Yosemite
+            https://bugs.webkit.org/show_bug.cgi?id=152704
+            rdar://problem/24042472
+
+            Reviewed by Anders Carlsson.
+
+            * Configurations/FeatureDefines.xcconfig:
+
+2016-01-27  Matthew Hanson  <[email protected]>
+
         Merge r193782. rdar://problem/24358367
 
     2015-12-08  Filip Pizlo  <[email protected]>

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


--- branches/safari-601-branch/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig	2016-01-28 01:34:00 UTC (rev 195713)
+++ branches/safari-601-branch/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig	2016-01-28 01:34:05 UTC (rev 195714)
@@ -123,11 +123,8 @@
 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_$(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_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_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_IOS_TEXT_AUTOSIZING[sdk=iphone*] = ENABLE_IOS_TEXT_AUTOSIZING;

Modified: branches/safari-601-branch/Source/WTF/ChangeLog (195713 => 195714)


--- branches/safari-601-branch/Source/WTF/ChangeLog	2016-01-28 01:34:00 UTC (rev 195713)
+++ branches/safari-601-branch/Source/WTF/ChangeLog	2016-01-28 01:34:05 UTC (rev 195714)
@@ -1,3 +1,17 @@
+2016-01-27  Matthew Hanson  <[email protected]>
+
+        Merge r194559. rdar://problem/24269083
+
+    2016-01-04  Tim Horton  <[email protected]>
+
+            Turn on gesture events when building for Yosemite
+            https://bugs.webkit.org/show_bug.cgi?id=152704
+            rdar://problem/24042472
+
+            Reviewed by Anders Carlsson.
+
+            * wtf/FeatureDefines.h:
+
 2015-12-16  Babak Shafiei  <[email protected]>
 
         Merge r191299.

Modified: branches/safari-601-branch/Source/WTF/wtf/FeatureDefines.h (195713 => 195714)


--- branches/safari-601-branch/Source/WTF/wtf/FeatureDefines.h	2016-01-28 01:34:00 UTC (rev 195713)
+++ branches/safari-601-branch/Source/WTF/wtf/FeatureDefines.h	2016-01-28 01:34:05 UTC (rev 195714)
@@ -258,6 +258,10 @@
 #define ENABLE_PRIMARY_SNAPSHOTTED_PLUGIN_HEURISTIC 1
 #endif
 
+#if !defined(ENABLE_MAC_GESTURE_EVENTS) && USE(APPLE_INTERNAL_SDK)
+#define ENABLE_MAC_GESTURE_EVENTS 1
+#endif
+
 #endif /* PLATFORM(MAC) */
 
 /* --------- Apple Windows port --------- */

Modified: branches/safari-601-branch/Source/WebCore/ChangeLog (195713 => 195714)


--- branches/safari-601-branch/Source/WebCore/ChangeLog	2016-01-28 01:34:00 UTC (rev 195713)
+++ branches/safari-601-branch/Source/WebCore/ChangeLog	2016-01-28 01:34:05 UTC (rev 195714)
@@ -1,3 +1,17 @@
+2016-01-27  Matthew Hanson  <[email protected]>
+
+        Merge r194559. rdar://problem/24269083
+
+    2016-01-04  Tim Horton  <[email protected]>
+
+            Turn on gesture events when building for Yosemite
+            https://bugs.webkit.org/show_bug.cgi?id=152704
+            rdar://problem/24042472
+
+            Reviewed by Anders Carlsson.
+
+            * Configurations/FeatureDefines.xcconfig:
+
 2016-01-20  Babak Shafiei  <[email protected]>
 
         Merge r188377.

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


--- branches/safari-601-branch/Source/WebCore/Configurations/FeatureDefines.xcconfig	2016-01-28 01:34:00 UTC (rev 195713)
+++ branches/safari-601-branch/Source/WebCore/Configurations/FeatureDefines.xcconfig	2016-01-28 01:34:05 UTC (rev 195714)
@@ -123,11 +123,8 @@
 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_$(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_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_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_IOS_TEXT_AUTOSIZING[sdk=iphone*] = ENABLE_IOS_TEXT_AUTOSIZING;

Modified: branches/safari-601-branch/Source/WebKit/mac/ChangeLog (195713 => 195714)


--- branches/safari-601-branch/Source/WebKit/mac/ChangeLog	2016-01-28 01:34:00 UTC (rev 195713)
+++ branches/safari-601-branch/Source/WebKit/mac/ChangeLog	2016-01-28 01:34:05 UTC (rev 195714)
@@ -1,3 +1,17 @@
+2016-01-27  Matthew Hanson  <[email protected]>
+
+        Merge r194559. rdar://problem/24269083
+
+    2016-01-04  Tim Horton  <[email protected]>
+
+            Turn on gesture events when building for Yosemite
+            https://bugs.webkit.org/show_bug.cgi?id=152704
+            rdar://problem/24042472
+
+            Reviewed by Anders Carlsson.
+
+            * Configurations/FeatureDefines.xcconfig:
+
 2016-01-20  Matthew Hanson  <[email protected]>
 
         Roll out r189135 via r195066. rdar://problem/24154288

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


--- branches/safari-601-branch/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig	2016-01-28 01:34:00 UTC (rev 195713)
+++ branches/safari-601-branch/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig	2016-01-28 01:34:05 UTC (rev 195714)
@@ -123,11 +123,8 @@
 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_$(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_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_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_IOS_TEXT_AUTOSIZING[sdk=iphone*] = ENABLE_IOS_TEXT_AUTOSIZING;

Modified: branches/safari-601-branch/Source/WebKit2/ChangeLog (195713 => 195714)


--- branches/safari-601-branch/Source/WebKit2/ChangeLog	2016-01-28 01:34:00 UTC (rev 195713)
+++ branches/safari-601-branch/Source/WebKit2/ChangeLog	2016-01-28 01:34:05 UTC (rev 195714)
@@ -1,3 +1,17 @@
+2016-01-27  Matthew Hanson  <[email protected]>
+
+        Merge r194559. rdar://problem/24269083
+
+    2016-01-04  Tim Horton  <[email protected]>
+
+            Turn on gesture events when building for Yosemite
+            https://bugs.webkit.org/show_bug.cgi?id=152704
+            rdar://problem/24042472
+
+            Reviewed by Anders Carlsson.
+
+            * Configurations/FeatureDefines.xcconfig:
+
 2016-01-20  Matthew Hanson  <[email protected]>
 
         Roll out r189135 via r195066. rdar://problem/24154288

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


--- branches/safari-601-branch/Source/WebKit2/Configurations/FeatureDefines.xcconfig	2016-01-28 01:34:00 UTC (rev 195713)
+++ branches/safari-601-branch/Source/WebKit2/Configurations/FeatureDefines.xcconfig	2016-01-28 01:34:05 UTC (rev 195714)
@@ -123,11 +123,8 @@
 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_$(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_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_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_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