Diff
Modified: trunk/Source/WebCore/CMakeLists.txt (109067 => 109068)
--- trunk/Source/WebCore/CMakeLists.txt 2012-02-28 04:17:32 UTC (rev 109067)
+++ trunk/Source/WebCore/CMakeLists.txt 2012-02-28 04:41:18 UTC (rev 109068)
@@ -2448,7 +2448,7 @@
LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/HTMLNames.cpp ${DERIVED_SOURCES_WEBCORE_DIR}/HTMLElementFactory.cpp ${DERIVED_SOURCES_WEBCORE_DIR}/JSHTMLElementWrapperFactory.cpp)
-GENERATE_EVENT_FACTORY(${WEBCORE_DIR}/dom/EventFactory.in EventFactory.cpp)
+GENERATE_EVENT_FACTORY(${WEBCORE_DIR}/dom/EventNames.in EventFactory.cpp)
LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/EventFactory.cpp)
Modified: trunk/Source/WebCore/ChangeLog (109067 => 109068)
--- trunk/Source/WebCore/ChangeLog 2012-02-28 04:17:32 UTC (rev 109067)
+++ trunk/Source/WebCore/ChangeLog 2012-02-28 04:41:18 UTC (rev 109068)
@@ -1,3 +1,31 @@
+2012-02-27 Adam Barth <aba...@webkit.org>
+
+ EventFactory.in should be named EventNames.in
+ https://bugs.webkit.org/show_bug.cgi?id=79727
+
+ Reviewed by Kentaro Hara.
+
+ Originally EventFactory.in was just used to generate EventFactory.cpp,
+ but now we're able to generate a bunch of other Event-related code from
+ this "in" file.
+
+ In writing some documentation about how to use these mechanisms, the
+ name EventFactory.in didn't seem like the right name. This patch
+ renames EventFactory.in to EventNames.in, which more accurately
+ describes the role of this file (and matches the naming convention of
+ HTMLTagNames.in).
+
+ * CMakeLists.txt:
+ * DerivedSources.make:
+ * DerivedSources.pri:
+ * GNUmakefile.am:
+ * WebCore.gyp/WebCore.gyp:
+ * WebCore.gyp/scripts/action_makenames.py:
+ (main):
+ * WebCore.xcodeproj/project.pbxproj:
+ * dom/EventNames.in: Copied from Source/WebCore/dom/EventFactory.in.
+ * dom/EventFactory.in: Removed.
+
2012-02-27 Yoshifumi Inoue <yo...@chromium.org>
[Forms] Make order of attribute/method in HTMLInputElement.idl as same as specification
Modified: trunk/Source/WebCore/DerivedSources.make (109067 => 109068)
--- trunk/Source/WebCore/DerivedSources.make 2012-02-28 04:17:32 UTC (rev 109067)
+++ trunk/Source/WebCore/DerivedSources.make 2012-02-28 04:41:18 UTC (rev 109068)
@@ -866,8 +866,8 @@
# Register event constructors and targets
-EventFactory.cpp EventHeaders.h EventInterfaces.h : dom/make_event_factory.pl dom/EventFactory.in
- perl -I $(WebCore)/bindings/scripts $< --input $(WebCore)/dom/EventFactory.in
+EventFactory.cpp EventHeaders.h EventInterfaces.h : dom/make_event_factory.pl dom/EventNames.in
+ perl -I $(WebCore)/bindings/scripts $< --input $(WebCore)/dom/EventNames.in
EventTargetHeaders.h EventTargetInterfaces.h : dom/make_event_factory.pl dom/EventTargetFactory.in
perl -I $(WebCore)/bindings/scripts $< --input $(WebCore)/dom/EventTargetFactory.in
Modified: trunk/Source/WebCore/DerivedSources.pri (109067 => 109068)
--- trunk/Source/WebCore/DerivedSources.pri 2012-02-28 04:17:32 UTC (rev 109067)
+++ trunk/Source/WebCore/DerivedSources.pri 2012-02-28 04:41:18 UTC (rev 109068)
@@ -43,7 +43,7 @@
HTML_ENTITIES = $$PWD/html/parser/HTMLEntityNames.in
-EVENT_FACTORY = $$PWD/dom/EventFactory.in
+EVENTS_NAMES = $$PWD/dom/EventNames.in
EVENT_TARGET_FACTORY = $$PWD/dom/EventTargetFactory.in
@@ -815,10 +815,10 @@
# GENERATOR 5-E:
eventfactory.output = EventFactory.cpp
-eventfactory.input = EVENT_FACTORY
+eventfactory.input = EVENTS_NAMES
eventfactory.script = $$PWD/dom/make_event_factory.pl
-eventfactory.commands = perl -I$$PWD/bindings/scripts $$eventfactory.script --input $$EVENT_FACTORY --outputDir ${QMAKE_FUNC_FILE_OUT_PATH}
-eventfactory.depends = $$PWD/dom/make_event_factory.pl $$EVENT_FACTORY
+eventfactory.commands = perl -I$$PWD/bindings/scripts $$eventfactory.script --input $$EVENTS_NAMES --outputDir ${QMAKE_FUNC_FILE_OUT_PATH}
+eventfactory.depends = $$PWD/dom/make_event_factory.pl $$EVENTS_NAMES
GENERATORS += eventfactory
# GENERATOR 5-F:
Modified: trunk/Source/WebCore/GNUmakefile.am (109067 => 109068)
--- trunk/Source/WebCore/GNUmakefile.am 2012-02-28 04:17:32 UTC (rev 109067)
+++ trunk/Source/WebCore/GNUmakefile.am 2012-02-28 04:41:18 UTC (rev 109068)
@@ -720,8 +720,8 @@
DerivedSources/WebCore/XMLNames.cpp DerivedSources/WebCore/XMLNames.h: $(WebCore)/dom/make_names.pl $(WebCore)/xml/xmlattrs.in
$(AM_V_GEN)$(PERL) -I$(WebCore)/bindings/scripts $< --attrs $(WebCore)/xml/xmlattrs.in --outputDir "$(GENSOURCES_WEBCORE)"
-DerivedSources/WebCore/EventFactory.cpp DerivedSources/WebCore/EventHeaders.h DerivedSources/WebCore/EventInterfaces.h: $(WebCore)/dom/make_event_factory.pl $(WebCore)/dom/EventFactory.in
- $(AM_V_GEN)$(PERL) -I$(WebCore)/bindings/scripts $< --input $(WebCore)/dom/EventFactory.in --outputDir "$(GENSOURCES_WEBCORE)"
+DerivedSources/WebCore/EventFactory.cpp DerivedSources/WebCore/EventHeaders.h DerivedSources/WebCore/EventInterfaces.h: $(WebCore)/dom/make_event_factory.pl $(WebCore)/dom/EventNames.in
+ $(AM_V_GEN)$(PERL) -I$(WebCore)/bindings/scripts $< --input $(WebCore)/dom/EventNames.in --outputDir "$(GENSOURCES_WEBCORE)"
DerivedSources/WebCore/EventTargetHeaders.h DerivedSources/WebCore/EventTargetInterfaces.h: $(WebCore)/dom/make_event_factory.pl $(WebCore)/dom/EventTargetFactory.in
$(AM_V_GEN)$(PERL) -I$(WebCore)/bindings/scripts $< --input $(WebCore)/dom/EventTargetFactory.in --outputDir "$(GENSOURCES_WEBCORE)"
@@ -958,7 +958,7 @@
Source/WebCore/css/SVGCSSValueKeywords.in \
Source/WebCore/css/view-source.css \
Source/WebCore/css/WebKitFontFamilyNames.in \
- Source/WebCore/dom/EventFactory.in \
+ Source/WebCore/dom/EventNames.in \
Source/WebCore/dom/EventTargetFactory.in \
Source/WebCore/dom/make_dom_exceptions.pl \
Source/WebCore/dom/make_event_factory.pl \
Modified: trunk/Source/WebCore/WebCore.gyp/WebCore.gyp (109067 => 109068)
--- trunk/Source/WebCore/WebCore.gyp/WebCore.gyp 2012-02-28 04:17:32 UTC (rev 109067)
+++ trunk/Source/WebCore/WebCore.gyp/WebCore.gyp 2012-02-28 04:41:18 UTC (rev 109068)
@@ -728,7 +728,7 @@
'action_name': 'EventFactory',
'inputs': [
'../dom/make_event_factory.pl',
- '../dom/EventFactory.in',
+ '../dom/EventNames.in',
],
'outputs': [
'<(SHARED_INTERMEDIATE_DIR)/webkit/EventFactory.cpp',
Modified: trunk/Source/WebCore/WebCore.gyp/scripts/action_makenames.py (109067 => 109068)
--- trunk/Source/WebCore/WebCore.gyp/scripts/action_makenames.py 2012-02-28 04:17:32 UTC (rev 109067)
+++ trunk/Source/WebCore/WebCore.gyp/scripts/action_makenames.py 2012-02-28 04:41:18 UTC (rev 109068)
@@ -130,8 +130,8 @@
or inputBasename.endswith('attrs.in'):
assert attrInput == None
attrInput = inputAbsPosix
- elif inputBasename.endswith('EventFactory.in') \
- or inputBasename.endswith('EventTargetFactory.in') \
+ elif inputBasename.endswith('EventTargetFactory.in') \
+ or inputBasename.endswith('EventNames.in') \
or inputBasename.endswith('DOMExceptions.in'):
eventsInput = inputAbsPosix
elif inputBasename.endswith('Names.in'):
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (109067 => 109068)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2012-02-28 04:17:32 UTC (rev 109067)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2012-02-28 04:41:18 UTC (rev 109068)
@@ -12287,7 +12287,7 @@
BC98A27C0C0C9950004BEBF7 /* JSStyleSheetCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSStyleSheetCustom.cpp; sourceTree = "<group>"; };
BC99812D0DBE807A008CE9EF /* DOMAbstractViewFrame.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMAbstractViewFrame.h; sourceTree = "<group>"; };
BC9A6141146859D9006057FD /* DOMExceptions.in */ = {isa = PBXFileReference; lastKnownFileType = text; path = DOMExceptions.in; sourceTree = "<group>"; };
- BC9A6142146859D9006057FD /* EventFactory.in */ = {isa = PBXFileReference; lastKnownFileType = text; path = EventFactory.in; sourceTree = "<group>"; };
+ BC9A6142146859D9006057FD /* EventNames.in */ = {isa = PBXFileReference; lastKnownFileType = text; path = EventNames.in; sourceTree = "<group>"; };
BC9A6144146859D9006057FD /* make_dom_exceptions.pl */ = {isa = PBXFileReference; lastKnownFileType = text.script.perl; path = make_dom_exceptions.pl; sourceTree = "<group>"; };
BC9A6145146859D9006057FD /* make_event_factory.pl */ = {isa = PBXFileReference; lastKnownFileType = text.script.perl; path = make_event_factory.pl; sourceTree = "<group>"; };
BC9A6146146859D9006057FD /* make_names.pl */ = {isa = PBXFileReference; lastKnownFileType = text.script.perl; path = make_names.pl; sourceTree = "<group>"; };
@@ -19250,7 +19250,6 @@
BC1A3790097C6F970019F3D8 /* bindings */ = {
isa = PBXGroup;
children = (
- A83B538014FBB2EC00720D9D /* preprocess-idls.pl */,
B5D31DF711CF60E5009F22B4 /* generic */,
BC1A3793097C6FB10019F3D8 /* js */,
BC1A3794097C6FC40019F3D8 /* objc */,
@@ -19259,6 +19258,7 @@
A83B533814F399BB00720D9D /* IDLAttributes.txt */,
14813BF309EDF88E00F757E1 /* IDLParser.pm */,
93F8B3080A300FEA00F61AB8 /* IDLStructure.pm */,
+ A83B538014FBB2EC00720D9D /* preprocess-idls.pl */,
C0F2A43F13869A280066C534 /* preprocessor.pm */,
8C6EA61711EF7E0400FD8EE3 /* RuntimeEnabledFeatures.cpp */,
8C6EA61811EF7E0400FD8EE3 /* RuntimeEnabledFeatures.h */,
@@ -20683,6 +20683,7 @@
978D07BD145A0F6C0096908D /* DOMCoreException.cpp */,
BC60D6E80D28D83400B9918F /* DOMCoreException.h */,
BC60D6EB0D28D99900B9918F /* DOMCoreException.idl */,
+ BC9A6142146859D9006057FD /* EventNames.in */,
BC9A6141146859D9006057FD /* DOMExceptions.in */,
A8185F3609765765005826D9 /* DOMImplementation.cpp */,
A8185F3309765765005826D9 /* DOMImplementation.h */,
@@ -20725,7 +20726,6 @@
BC60D9090D2A17CE00B9918F /* EventException.h */,
BC60D90A0D2A17CE00B9918F /* EventException.idl */,
97665011144FAA4200F6BB51 /* EventFactory.h */,
- BC9A6142146859D9006057FD /* EventFactory.in */,
935FBC4409BA00B900E230B1 /* EventListener.h */,
85AFA7410AAF298400E84305 /* EventListener.idl */,
AD4495F1141FC08900541EDF /* EventListenerMap.cpp */,
@@ -23523,6 +23523,7 @@
FD31603E12B0267600C1A359 /* RealtimeAnalyserNode.h in Headers */,
BC4368E80C226E32005EFB5F /* Rect.h in Headers */,
BCAB418213E356E800D8AAF3 /* Region.h in Headers */,
+ 8ABAFBA014F5107500A4984B /* RegionNodeList.h in Headers */,
85031B4C0A44EFC700F992E0 /* RegisteredEventListener.h in Headers */,
B2C3DA2D0D006C1D00EF6F26 /* RegularExpression.h in Headers */,
93309E01099E64920056E581 /* RemoveCSSPropertyCommand.h in Headers */,
@@ -24379,7 +24380,6 @@
E1BE512E0CF6C512002EA959 /* XSLTUnicodeSort.h in Headers */,
977E2E0F12F0FC9C00C13379 /* XSSAuditor.h in Headers */,
FD537353137B651800008DCE /* ZeroPole.h in Headers */,
- 8ABAFBA014F5107500A4984B /* RegionNodeList.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -26638,6 +26638,7 @@
FD31603B12B0267600C1A359 /* RealtimeAnalyser.cpp in Sources */,
FD31603D12B0267600C1A359 /* RealtimeAnalyserNode.cpp in Sources */,
BCAB418113E356E800D8AAF3 /* Region.cpp in Sources */,
+ 8ABAFB9F14F5107500A4984B /* RegionNodeList.cpp in Sources */,
85031B4B0A44EFC700F992E0 /* RegisteredEventListener.cpp in Sources */,
B2C3DA2C0D006C1D00EF6F26 /* RegularExpression.cpp in Sources */,
93309E00099E64920056E581 /* RemoveCSSPropertyCommand.cpp in Sources */,
@@ -27333,7 +27334,6 @@
E1BE512D0CF6C512002EA959 /* XSLTUnicodeSort.cpp in Sources */,
977E2E0E12F0FC9C00C13379 /* XSSAuditor.cpp in Sources */,
FD537352137B651800008DCE /* ZeroPole.cpp in Sources */,
- 8ABAFB9F14F5107500A4984B /* RegionNodeList.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Deleted: trunk/Source/WebCore/dom/EventFactory.in (109067 => 109068)
--- trunk/Source/WebCore/dom/EventFactory.in 2012-02-28 04:17:32 UTC (rev 109067)
+++ trunk/Source/WebCore/dom/EventFactory.in 2012-02-28 04:41:18 UTC (rev 109068)
@@ -1,44 +0,0 @@
-namespace="Event"
-
-Event
-Events interfaceName=Event
-HTMLEvents interfaceName=Event
-BeforeLoadEvent
-CloseEvent
-CompositionEvent
-CustomEvent
-ErrorEvent
-HashChangeEvent
-KeyboardEvent
-KeyboardEvents interfaceName=KeyboardEvent
-MessageEvent
-MouseEvent
-MouseEvents interfaceName=MouseEvent
-MutationEvent
-MutationEvents interfaceName=MutationEvent
-OverflowEvent
-PageTransitionEvent
-PopStateEvent
-ProgressEvent
-TextEvent
-UIEvent
-UIEvents interfaceName=UIEvent
-WebKitAnimationEvent
-WebKitTransitionEvent
-WheelEvent
-XMLHttpRequestProgressEvent
-AudioProcessingEvent conditional=WEB_AUDIO
-OfflineAudioCompletionEvent conditional=WEB_AUDIO
-MediaStreamEvent conditional=MEDIA_STREAM
-SpeechInputEvent conditional=INPUT_SPEECH
-WebGLContextEvent conditional=WEBGL
-StorageEvent
-SVGEvents interfaceName=Event, conditional=SVG
-SVGZoomEvent conditional=SVG
-SVGZoomEvents interfaceName=SVGZoomEvent, conditional=SVG
-IDBVersionChangeEvent conditional=INDEXED_DATABASE
-TouchEvent conditional=TOUCH_EVENTS, runtimeConditional=touchEnabled
-DeviceMotionEvent conditional=DEVICE_ORIENTATION
-DeviceOrientationEvent conditional=DEVICE_ORIENTATION
-OrientationEvent interfaceName=Event, conditional=ORIENTATION_EVENTS
-TrackEvent conditional=VIDEO_TRACK
Copied: trunk/Source/WebCore/dom/EventNames.in (from rev 109067, trunk/Source/WebCore/dom/EventFactory.in) (0 => 109068)
--- trunk/Source/WebCore/dom/EventNames.in (rev 0)
+++ trunk/Source/WebCore/dom/EventNames.in 2012-02-28 04:41:18 UTC (rev 109068)
@@ -0,0 +1,44 @@
+namespace="Event"
+
+Event
+Events interfaceName=Event
+HTMLEvents interfaceName=Event
+BeforeLoadEvent
+CloseEvent
+CompositionEvent
+CustomEvent
+ErrorEvent
+HashChangeEvent
+KeyboardEvent
+KeyboardEvents interfaceName=KeyboardEvent
+MessageEvent
+MouseEvent
+MouseEvents interfaceName=MouseEvent
+MutationEvent
+MutationEvents interfaceName=MutationEvent
+OverflowEvent
+PageTransitionEvent
+PopStateEvent
+ProgressEvent
+TextEvent
+UIEvent
+UIEvents interfaceName=UIEvent
+WebKitAnimationEvent
+WebKitTransitionEvent
+WheelEvent
+XMLHttpRequestProgressEvent
+AudioProcessingEvent conditional=WEB_AUDIO
+OfflineAudioCompletionEvent conditional=WEB_AUDIO
+MediaStreamEvent conditional=MEDIA_STREAM
+SpeechInputEvent conditional=INPUT_SPEECH
+WebGLContextEvent conditional=WEBGL
+StorageEvent
+SVGEvents interfaceName=Event, conditional=SVG
+SVGZoomEvent conditional=SVG
+SVGZoomEvents interfaceName=SVGZoomEvent, conditional=SVG
+IDBVersionChangeEvent conditional=INDEXED_DATABASE
+TouchEvent conditional=TOUCH_EVENTS, runtimeConditional=touchEnabled
+DeviceMotionEvent conditional=DEVICE_ORIENTATION
+DeviceOrientationEvent conditional=DEVICE_ORIENTATION
+OrientationEvent interfaceName=Event, conditional=ORIENTATION_EVENTS
+TrackEvent conditional=VIDEO_TRACK
