Title: [191318] trunk/Source
- Revision
- 191318
- Author
- bda...@apple.com
- Date
- 2015-10-19 14:39:31 -0700 (Mon, 19 Oct 2015)
Log Message
Build fix.
Source/WebCore:
* dom/EventNames.in:
* dom/make_event_factory.pl:
(generateImplementation):
Source/WTF:
* wtf/FeatureDefines.h:
Modified Paths
Diff
Modified: trunk/Source/WTF/ChangeLog (191317 => 191318)
--- trunk/Source/WTF/ChangeLog 2015-10-19 21:25:51 UTC (rev 191317)
+++ trunk/Source/WTF/ChangeLog 2015-10-19 21:39:31 UTC (rev 191318)
@@ -1,3 +1,9 @@
+2015-10-19 Beth Dakin <bda...@apple.com>
+
+ Build fix.
+
+ * wtf/FeatureDefines.h:
+
2015-10-19 Tim Horton <timothy_hor...@apple.com>
Add magnify and rotate gesture event support for Mac
Modified: trunk/Source/WTF/wtf/FeatureDefines.h (191317 => 191318)
--- trunk/Source/WTF/wtf/FeatureDefines.h 2015-10-19 21:25:51 UTC (rev 191317)
+++ trunk/Source/WTF/wtf/FeatureDefines.h 2015-10-19 21:39:31 UTC (rev 191318)
@@ -110,10 +110,6 @@
#define ENABLE_IOS_TOUCH_EVENTS 1
#endif
-#if !defined(ENABLE_MAC_GESTURE_EVENTS) && USE(APPLE_INTERNAL_SDK)
-#define ENABLE_MAC_GESTURE_EVENTS 1
-#endif
-
#if !defined(ENABLE_METER_ELEMENT)
#define ENABLE_METER_ELEMENT 0
#endif
@@ -264,6 +260,10 @@
#define ENABLE_SHADOW_DOM 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: trunk/Source/WebCore/ChangeLog (191317 => 191318)
--- trunk/Source/WebCore/ChangeLog 2015-10-19 21:25:51 UTC (rev 191317)
+++ trunk/Source/WebCore/ChangeLog 2015-10-19 21:39:31 UTC (rev 191318)
@@ -1,3 +1,11 @@
+2015-10-19 Beth Dakin <bda...@apple.com>
+
+ Build fix.
+
+ * dom/EventNames.in:
+ * dom/make_event_factory.pl:
+ (generateImplementation):
+
2015-10-19 Csaba Osztrogonác <o...@webkit.org>
Fix the binding generator after r191176
Modified: trunk/Source/WebCore/dom/EventNames.in (191317 => 191318)
--- trunk/Source/WebCore/dom/EventNames.in 2015-10-19 21:25:51 UTC (rev 191317)
+++ trunk/Source/WebCore/dom/EventNames.in 2015-10-19 21:39:31 UTC (rev 191318)
@@ -58,8 +58,7 @@
CSSFontFaceLoadEvent conditional=FONT_LOAD_EVENTS
SecurityPolicyViolationEvent conditional=CSP_NEXT
UIRequestEvent conditional=INDIE_UI
-GestureEvent conditional=IOS_GESTURE_EVENTS
-GestureEvent conditional=MAC_GESTURE_EVENTS
+GestureEvent conditional=IOS_GESTURE_EVENTS|MAC_GESTURE_EVENTS
WebKitPlaybackTargetAvailabilityEvent conditional=WIRELESS_PLAYBACK_TARGET
GamepadEvent conditional=GAMEPAD
Modified: trunk/Source/WebCore/dom/make_event_factory.pl (191317 => 191318)
--- trunk/Source/WebCore/dom/make_event_factory.pl 2015-10-19 21:25:51 UTC (rev 191317)
+++ trunk/Source/WebCore/dom/make_event_factory.pl 2015-10-19 21:39:31 UTC (rev 191318)
@@ -98,7 +98,10 @@
my $runtimeConditional = $parsedEvents{$eventName}{"runtimeConditional"};
my $interfaceName = $InCompiler->interfaceForItem($eventName);
- print F "#if ENABLE($conditional)\n" if $conditional;
+ if ($conditional) {
+ my $conditionals = "#if ENABLE(" . join(") || ENABLE(", split("\\|", $conditional)) . ")";
+ print F "$conditionals\n";
+ }
# FIXEME JSC should support RuntimeEnabledFeatures
print F " if (equalIgnoringASCIICase(type, \"$eventName\"))\n";
print F " return ${interfaceName}::create();\n";
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
