diff options
author | Steve Block <steveblock@google.com> | 2010-02-18 06:32:09 -0800 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-02-18 06:32:09 -0800 |
commit | 9c8b266fb74dbb8b53cf7b4ad9997a6c6ff09305 (patch) | |
tree | efad51820ddd43d3f2f41d23cc2f6c1b629f0cc3 | |
parent | e03a758f107563565c65a697d3e2f9f531da1758 (diff) | |
parent | e1856da6b02fd4ba281b9a8f2ddc84a4016d355b (diff) | |
download | external_webkit-9c8b266fb74dbb8b53cf7b4ad9997a6c6ff09305.zip external_webkit-9c8b266fb74dbb8b53cf7b4ad9997a6c6ff09305.tar.gz external_webkit-9c8b266fb74dbb8b53cf7b4ad9997a6c6ff09305.tar.bz2 |
Merge "Cherry-pick WebKit change 54957 to use V8 DerivedSourcesAllInOne.cpp"
-rw-r--r-- | WebCore/Android.derived.v8bindings.mk | 35 | ||||
-rw-r--r-- | WebCore/Android.v8bindings.mk | 1 | ||||
-rw-r--r-- | WebCore/bindings/v8/DerivedSourcesAllInOne.cpp | 13 |
3 files changed, 33 insertions, 16 deletions
diff --git a/WebCore/Android.derived.v8bindings.mk b/WebCore/Android.derived.v8bindings.mk index 062ef93..29899ef 100644 --- a/WebCore/Android.derived.v8bindings.mk +++ b/WebCore/Android.derived.v8bindings.mk @@ -66,7 +66,7 @@ $(GEN): PRIVATE_PATH := $(LOCAL_PATH) $(GEN): PRIVATE_CUSTOM_TOOL = SOURCE_ROOT=$(PRIVATE_PATH) perl -I$(PRIVATE_PATH)/bindings/scripts $(PRIVATE_PATH)/bindings/scripts/generate-bindings.pl --defines "$(FEATURE_DEFINES) LANGUAGE_JAVASCRIPT" --generator V8 --include css --include dom --include html --outputdir $(dir $@) $< $(GEN): $(intermediates)/bindings/V8%.h : $(LOCAL_PATH)/css/%.idl $(js_binding_scripts) $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) $(GEN:%.h=%.cpp) +LOCAL_GENERATED_SOURCES += $(GEN) # We also need the .cpp files, which are generated as side effects of the # above rules. Specifying this explicitly makes -j2 work. @@ -128,7 +128,7 @@ $(GEN): PRIVATE_PATH := $(LOCAL_PATH) $(GEN): PRIVATE_CUSTOM_TOOL = SOURCE_ROOT=$(PRIVATE_PATH) perl -I$(PRIVATE_PATH)/bindings/scripts $(PRIVATE_PATH)/bindings/scripts/generate-bindings.pl --defines "$(FEATURE_DEFINES) LANGUAGE_JAVASCRIPT" --generator V8 --include dom --include html --outputdir $(dir $@) $< $(GEN): $(intermediates)/bindings/V8%.h : $(LOCAL_PATH)/dom/%.idl $(js_binding_scripts) $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) $(GEN:%.h=%.cpp) +LOCAL_GENERATED_SOURCES += $(GEN) # We also need the .cpp files, which are generated as side effects of the # above rules. Specifying this explicitly makes -j2 work. @@ -222,7 +222,7 @@ $(GEN): PRIVATE_PATH := $(LOCAL_PATH) $(GEN): PRIVATE_CUSTOM_TOOL = SOURCE_ROOT=$(PRIVATE_PATH) perl -I$(PRIVATE_PATH)/bindings/scripts $(PRIVATE_PATH)/bindings/scripts/generate-bindings.pl --defines "$(FEATURE_DEFINES) LANGUAGE_JAVASCRIPT" --generator V8 --include dom --include html --outputdir $(dir $@) $< $(GEN): $(intermediates)/bindings/V8%.h : $(LOCAL_PATH)/html/%.idl $(js_binding_scripts) $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) $(GEN:%.h=%.cpp) +LOCAL_GENERATED_SOURCES += $(GEN) # We also need the .cpp files, which are generated as side effects of the # above rules. Specifying this explicitly makes -j2 work. @@ -241,6 +241,7 @@ GEN := \ $(intermediates)/bindings/V8WebGLArrayBuffer.h \ $(intermediates)/bindings/V8WebGLBuffer.h \ $(intermediates)/bindings/V8WebGLByteArray.h \ + $(intermediates)/bindings/V8WebGLContextAttributes.h \ $(intermediates)/bindings/V8WebGLFloatArray.h \ $(intermediates)/bindings/V8WebGLFramebuffer.h \ $(intermediates)/bindings/V8WebGLIntArray.h \ @@ -250,6 +251,7 @@ GEN := \ $(intermediates)/bindings/V8WebGLShader.h \ $(intermediates)/bindings/V8WebGLShortArray.h \ $(intermediates)/bindings/V8WebGLTexture.h \ + $(intermediates)/bindings/V8WebGLUniformLocation.h \ $(intermediates)/bindings/V8WebGLUnsignedByteArray.h \ $(intermediates)/bindings/V8WebGLUnsignedIntArray.h \ $(intermediates)/bindings/V8WebGLUnsignedShortArray.h @@ -258,7 +260,7 @@ $(GEN): PRIVATE_PATH := $(LOCAL_PATH) $(GEN): PRIVATE_CUSTOM_TOOL = SOURCE_ROOT=$(PRIVATE_PATH) perl -I$(PRIVATE_PATH)/bindings/scripts $(PRIVATE_PATH)/bindings/scripts/generate-bindings.pl --defines "$(FEATURE_DEFINES) LANGUAGE_JAVASCRIPT" --generator V8 --include dom --include html --include html/canvas --outputdir $(dir $@) $< $(GEN): $(intermediates)/bindings/V8%.h : $(LOCAL_PATH)/html/canvas/%.idl $(js_binding_scripts) $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) $(GEN:%.h=%.cpp) +LOCAL_GENERATED_SOURCES += $(GEN) # We also need the .cpp files, which are generated as side effects of the # above rules. Specifying this explicitly makes -j2 work. @@ -272,7 +274,7 @@ $(GEN): PRIVATE_PATH := $(LOCAL_PATH) $(GEN): PRIVATE_CUSTOM_TOOL = SOURCE_ROOT=$(PRIVATE_PATH) perl -I$(PRIVATE_PATH)/bindings/scripts $(PRIVATE_PATH)/bindings/scripts/generate-bindings.pl --defines "$(FEATURE_DEFINES) LANGUAGE_JAVASCRIPT" --generator V8 --include dom --include html --outputdir $(dir $@) $< $(GEN): $(intermediates)/bindings/V8%.h : $(LOCAL_PATH)/loader/appcache/%.idl $(js_binding_scripts) $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) $(GEN:%.h=%.cpp) +LOCAL_GENERATED_SOURCES += $(GEN) # We also need the .cpp files, which are generated as side effects of the # above rules. Specifying this explicitly makes -j2 work. @@ -299,7 +301,7 @@ $(GEN): PRIVATE_PATH := $(LOCAL_PATH) $(GEN): PRIVATE_CUSTOM_TOOL = SOURCE_ROOT=$(PRIVATE_PATH) perl -I$(PRIVATE_PATH)/bindings/scripts $(PRIVATE_PATH)/bindings/scripts/generate-bindings.pl --defines "$(FEATURE_DEFINES) LANGUAGE_JAVASCRIPT" --generator V8 --include dom --include html --outputdir $(dir $@) $< $(GEN): $(intermediates)/bindings/V8%.h : $(LOCAL_PATH)/page/%.idl $(js_binding_scripts) $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) $(GEN:%.h=%.cpp) +LOCAL_GENERATED_SOURCES += $(GEN) # We also need the .cpp files, which are generated as side effects of the # above rules. Specifying this explicitly makes -j2 work. @@ -315,7 +317,7 @@ $(GEN): PRIVATE_PATH := $(LOCAL_PATH) $(GEN): PRIVATE_CUSTOM_TOOL = SOURCE_ROOT=$(PRIVATE_PATH) perl -I$(PRIVATE_PATH)/bindings/scripts $(PRIVATE_PATH)/bindings/scripts/generate-bindings.pl --defines "$(FEATURE_DEFINES) LANGUAGE_JAVASCRIPT" --generator V8 --include dom --include html --outputdir $(dir $@) $< $(GEN): $(intermediates)/bindings/V8%.h : $(LOCAL_PATH)/plugins/%.idl $(js_binding_scripts) $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) $(GEN:%.h=%.cpp) +LOCAL_GENERATED_SOURCES += $(GEN) # We also need the .cpp files, which are generated as side effects of the # above rules. Specifying this explicitly makes -j2 work. @@ -333,7 +335,7 @@ $(GEN): PRIVATE_PATH := $(LOCAL_PATH) $(GEN): PRIVATE_CUSTOM_TOOL = SOURCE_ROOT=$(PRIVATE_PATH) perl -I$(PRIVATE_PATH)/bindings/scripts $(PRIVATE_PATH)/bindings/scripts/generate-bindings.pl --defines "$(FEATURE_DEFINES) LANGUAGE_JAVASCRIPT" --generator V8 --include dom --include html --outputdir $(dir $@) $< $(GEN): $(intermediates)/bindings/V8%.h : $(LOCAL_PATH)/storage/%.idl $(js_binding_scripts) $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) $(GEN:%.h=%.cpp) +LOCAL_GENERATED_SOURCES += $(GEN) # We also need the .cpp files, which are generated as side effects of the # above rules. Specifying this explicitly makes -j2 work. @@ -348,7 +350,7 @@ $(GEN): PRIVATE_PATH := $(LOCAL_PATH) $(GEN): PRIVATE_CUSTOM_TOOL = SOURCE_ROOT=$(PRIVATE_PATH) perl -I$(PRIVATE_PATH)/bindings/scripts $(PRIVATE_PATH)/bindings/scripts/generate-bindings.pl --defines "$(FEATURE_DEFINES) LANGUAGE_JAVASCRIPT" --generator V8 --include dom --include html --outputdir $(dir $@) $< $(GEN): $(intermediates)/bindings/V8%.h : $(LOCAL_PATH)/storage/%.idl $(js_binding_scripts) $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) $(GEN:%.h=%.cpp) +LOCAL_GENERATED_SOURCES += $(GEN) # We also need the .cpp files, which are generated as side effects of the # above rules. Specifying this explicitly makes -j2 work. @@ -506,7 +508,7 @@ $(GEN): PRIVATE_PATH := $(LOCAL_PATH) $(GEN): PRIVATE_CUSTOM_TOOL = SOURCE_ROOT=$(PRIVATE_PATH) perl -I$(PRIVATE_PATH)/bindings/scripts $(PRIVATE_PATH)/bindings/scripts/generate-bindings.pl --defines "$(FEATURE_DEFINES) LANGUAGE_JAVASCRIPT" --generator V8 --include css --include dom --include html --include svg --outputdir $(dir $@) $< $(GEN): $(intermediates)/bindings/V8%.h : $(LOCAL_PATH)/svg/%.idl $(js_binding_scripts) $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) $(GEN:%.h=%.cpp) +LOCAL_GENERATED_SOURCES += $(GEN) # We also need the .cpp files, which are generated as side effects of the # above rules. Specifying this explicitly makes -j2 work. @@ -526,7 +528,7 @@ $(GEN): PRIVATE_PATH := $(LOCAL_PATH) $(GEN): PRIVATE_CUSTOM_TOOL = SOURCE_ROOT=$(PRIVATE_PATH) perl -I$(PRIVATE_PATH)/bindings/scripts $(PRIVATE_PATH)/bindings/scripts/generate-bindings.pl --defines "$(FEATURE_DEFINES) LANGUAGE_JAVASCRIPT" --generator V8 --include dom --include html --include workers --outputdir $(dir $@) $< $(GEN): $(intermediates)/bindings/V8%.h : $(LOCAL_PATH)/workers/%.idl $(js_binding_scripts) $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) $(GEN:%.h=%.cpp) +LOCAL_GENERATED_SOURCES += $(GEN) # We also need the .cpp files, which are generated as side effects of the # above rules. Specifying this explicitly makes -j2 work. @@ -548,7 +550,7 @@ $(GEN): PRIVATE_PATH := $(LOCAL_PATH) $(GEN): PRIVATE_CUSTOM_TOOL = SOURCE_ROOT=$(PRIVATE_PATH) perl -I$(PRIVATE_PATH)/bindings/scripts $(PRIVATE_PATH)/bindings/scripts/generate-bindings.pl --defines "$(FEATURE_DEFINES) LANGUAGE_JAVASCRIPT" --generator V8 --include dom --include html --outputdir $(dir $@) $< $(GEN): $(intermediates)/bindings/V8%.h : $(LOCAL_PATH)/xml/%.idl $(js_binding_scripts) $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) $(GEN:%.h=%.cpp) +LOCAL_GENERATED_SOURCES += $(GEN) # We also need the .cpp files, which are generated as side effects of the # above rules. Specifying this explicitly makes -j2 work. @@ -566,7 +568,7 @@ $(GEN): PRIVATE_PATH := $(LOCAL_PATH) $(GEN): PRIVATE_CUSTOM_TOOL = SOURCE_ROOT=$(PRIVATE_PATH) perl -I$(PRIVATE_PATH)/bindings/scripts $(PRIVATE_PATH)/bindings/scripts/generate-bindings.pl --defines "$(FEATURE_DEFINES) LANGUAGE_JAVASCRIPT" --generator V8 --include dom --include html --outputdir $(dir $@) $< $(GEN): $(intermediates)/bindings/V8%.h : $(LOCAL_PATH)/inspector/%.idl $(js_binding_scripts) $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) $(GEN:%.h=%.cpp) +LOCAL_GENERATED_SOURCES += $(GEN) # We also need the .cpp files, which are generated as side effects of the # above rules. Specifying this explicitly makes -j2 work. @@ -575,13 +577,14 @@ $(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/bindings/%.cpp : $(intermediates) # Notifications # These headers are required by the V8 bindings even when Notifications are disabled GEN := \ - $(intermediates)/bindings/V8Notification.h + $(intermediates)/bindings/V8Notification.h \ + $(intermediates)/bindings/V8NotificationCenter.h $(GEN): PRIVATE_PATH := $(LOCAL_PATH) $(GEN): PRIVATE_CUSTOM_TOOL = SOURCE_ROOT=$(PRIVATE_PATH) perl -I$(PRIVATE_PATH)/bindings/scripts $(PRIVATE_PATH)/bindings/scripts/generate-bindings.pl --defines "$(FEATURE_DEFINES) LANGUAGE_JAVASCRIPT" --generator V8 --include dom --include html --outputdir $(dir $@) $< $(GEN): $(intermediates)/bindings/V8%.h : $(LOCAL_PATH)/notifications/%.idl $(js_binding_scripts) $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) $(GEN:%.h=%.cpp) +LOCAL_GENERATED_SOURCES += $(GEN) # We also need the .cpp files, which are generated as side effects of the # above rules. Specifying this explicitly makes -j2 work. @@ -596,7 +599,7 @@ $(GEN): PRIVATE_PATH := $(LOCAL_PATH) $(GEN): PRIVATE_CUSTOM_TOOL = SOURCE_ROOT=$(PRIVATE_PATH) perl -I$(PRIVATE_PATH)/bindings/scripts $(PRIVATE_PATH)/bindings/scripts/generate-bindings.pl --defines "$(FEATURE_DEFINES) LANGUAGE_JAVASCRIPT" --generator V8 --include dom --include html --outputdir $(dir $@) $< $(GEN): $(intermediates)/bindings/V8%.h : $(LOCAL_PATH)/websockets/%.idl $(js_binding_scripts) $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) $(GEN:%.h=%.cpp) +LOCAL_GENERATED_SOURCES += $(GEN) # We also need the .cpp files, which are generated as side effects of the # above rules. Specifying this explicitly makes -j2 work. diff --git a/WebCore/Android.v8bindings.mk b/WebCore/Android.v8bindings.mk index 3b53c23..673d2ab 100644 --- a/WebCore/Android.v8bindings.mk +++ b/WebCore/Android.v8bindings.mk @@ -50,6 +50,7 @@ LOCAL_SRC_FILES += \ bindings/v8/DOMData.cpp \ bindings/v8/DOMDataStore.cpp \ bindings/v8/DOMWrapperWorld.cpp \ + bindings/v8/DerivedSourcesAllInOne.cpp \ bindings/v8/IsolatedWorld.cpp \ bindings/v8/MainThreadDOMData.cpp \ bindings/v8/NPV8Object.cpp \ diff --git a/WebCore/bindings/v8/DerivedSourcesAllInOne.cpp b/WebCore/bindings/v8/DerivedSourcesAllInOne.cpp index b626499..07d1187 100644 --- a/WebCore/bindings/v8/DerivedSourcesAllInOne.cpp +++ b/WebCore/bindings/v8/DerivedSourcesAllInOne.cpp @@ -70,6 +70,9 @@ #include "bindings/V8Clipboard.cpp" #include "bindings/V8Comment.cpp" #include "bindings/V8CompositionEvent.cpp" +// ANDROID +// Temporary modification - will not be upstreamed +#include "bindings/V8Connection.cpp" #include "bindings/V8Console.cpp" #include "bindings/V8Coordinates.cpp" #include "bindings/V8Counter.cpp" @@ -225,6 +228,16 @@ #include "bindings/V8TreeWalker.cpp" #include "bindings/V8UIEvent.cpp" #include "bindings/V8ValidityState.cpp" +// ANDROID +// Do not upstream. +// The Android build requires V8VoidCallback.h, but not V8VoidCallback.cpp. The +// same is true of Chromium. Now that we use DerivedSourcesAllInOne.cpp, the +// generation of header files (in Android.derived.v8bindings.mk) is separate +// from building the corresponding source files (this file). This will allow us +// to remove V8VoidCallback.cpp from the Android build (once we have removed +// DOM_OBJECT_VOIDCALLBACK_TYPES, which currently exists only to satisfy +// V8VoidCallback.cpp) +#include "bindings/V8VoidCallback.cpp" #include "bindings/V8WebKitAnimationEvent.cpp" #include "bindings/V8WebKitCSSKeyframeRule.cpp" #include "bindings/V8WebKitCSSKeyframesRule.cpp" |