diff options
author | Steve Block <steveblock@google.com> | 2010-04-29 14:43:44 +0100 |
---|---|---|
committer | Steve Block <steveblock@google.com> | 2010-05-11 14:42:12 +0100 |
commit | cf4a15ec6c0f2acb7982307629d1ec244e7089ca (patch) | |
tree | 3159a869ee65b031df14c0ee6b8565519c04488b | |
parent | eebae91469b8f225fe78e97ce6dae26efcf6da43 (diff) | |
download | external_webkit-cf4a15ec6c0f2acb7982307629d1ec244e7089ca.zip external_webkit-cf4a15ec6c0f2acb7982307629d1ec244e7089ca.tar.gz external_webkit-cf4a15ec6c0f2acb7982307629d1ec244e7089ca.tar.bz2 |
Merge webkit.org at r58033 : Fix Makefiles
Change-Id: Ie97b3c249bbda11ec4bc249be915f88361858d85
-rw-r--r-- | JavaScriptCore/Android.mk | 2 | ||||
-rw-r--r-- | WebCore/Android.derived.jscbindings.mk | 16 | ||||
-rw-r--r-- | WebCore/Android.derived.v8bindings.mk | 35 | ||||
-rw-r--r-- | WebCore/Android.jscbindings.mk | 7 | ||||
-rw-r--r-- | WebCore/Android.mk | 10 | ||||
-rw-r--r-- | WebCore/Android.v8bindings.mk | 27 |
6 files changed, 47 insertions, 50 deletions
diff --git a/JavaScriptCore/Android.mk b/JavaScriptCore/Android.mk index 2c2a2d0..b823f2b 100644 --- a/JavaScriptCore/Android.mk +++ b/JavaScriptCore/Android.mk @@ -142,6 +142,7 @@ LOCAL_SRC_FILES := \ runtime/RegExpConstructor.cpp \ runtime/RegExpObject.cpp \ runtime/RegExpPrototype.cpp \ + runtime/RopeImpl.cpp \ runtime/ScopeChain.cpp \ runtime/SmallStrings.cpp \ runtime/StringConstructor.cpp \ @@ -151,7 +152,6 @@ LOCAL_SRC_FILES := \ runtime/StructureChain.cpp \ runtime/TimeoutChecker.cpp \ runtime/UString.cpp \ - runtime/UStringImpl.cpp \ \ wtf/Assertions.cpp \ wtf/ByteArray.cpp \ diff --git a/WebCore/Android.derived.jscbindings.mk b/WebCore/Android.derived.jscbindings.mk index 458a860..d51a4d5 100644 --- a/WebCore/Android.derived.jscbindings.mk +++ b/WebCore/Android.derived.jscbindings.mk @@ -100,6 +100,7 @@ GEN := \ $(intermediates)/dom/JSClientRectList.h \ $(intermediates)/dom/JSClipboard.h \ $(intermediates)/dom/JSComment.h \ + $(intermediates)/dom/JSCustomEvent.h \ $(intermediates)/dom/JSCompositionEvent.h \ $(intermediates)/dom/JSDOMCoreException.h \ $(intermediates)/dom/JSDOMImplementation.h \ @@ -214,6 +215,7 @@ GEN := \ $(intermediates)/html/JSHTMLParagraphElement.h \ $(intermediates)/html/JSHTMLParamElement.h \ $(intermediates)/html/JSHTMLPreElement.h \ + $(intermediates)/html/JSHTMLProgressElement.h \ $(intermediates)/html/JSHTMLQuoteElement.h \ $(intermediates)/html/JSHTMLScriptElement.h \ $(intermediates)/html/JSHTMLSelectElement.h \ @@ -555,6 +557,20 @@ LOCAL_GENERATED_SOURCES += $(GEN) $(GEN:%.h=%.cpp) $(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/xml/%.cpp : $(intermediates)/xml/%.h #end +# Inspector +# These headers are required even when Inspector is disabled +GEN := \ + $(intermediates)/inspector/JSScriptProfile.h +$(GEN): PRIVATE_PATH := $(LOCAL_PATH) +$(GEN): PRIVATE_CUSTOM_TOOL = perl -I$(PRIVATE_PATH)/bindings/scripts $(PRIVATE_PATH)/bindings/scripts/generate-bindings.pl --defines "$(FEATURE_DEFINES) LANGUAGE_JAVASCRIPT" --generator JS --include dom --include html --outputdir $(dir $@) $< +$(GEN): $(intermediates)/inspector/JS%.h : $(LOCAL_PATH)/inspector/%.idl $(js_binding_scripts) + $(transform-generated-source) +LOCAL_GENERATED_SOURCES += $(GEN) $(GEN:%.h=%.cpp) + +# We also need the .cpp files, which are generated as side effects of the +# above rules. Specifying this explicitly makes -j2 work. +$(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/inspector/%.cpp : $(intermediates)/inspector/%.h + # HTML tag and attribute names GEN:= $(intermediates)/HTMLNames.cpp $(intermediates)/HTMLNames.h $(intermediates)/HTMLElementFactory.cpp $(intermediates)/HTMLElementFactory.h $(intermediates)/JSHTMLElementWrapperFactory.cpp $(intermediates)/JSHTMLElementWrapperFactory.h diff --git a/WebCore/Android.derived.v8bindings.mk b/WebCore/Android.derived.v8bindings.mk index 87491bc..8d99043 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) +LOCAL_GENERATED_SOURCES += $(GEN) $(GEN:%.h=%.cpp) # We also need the .cpp files, which are generated as side effects of the # above rules. Specifying this explicitly makes -j2 work. @@ -83,6 +83,7 @@ GEN := \ $(intermediates)/bindings/V8Clipboard.h \ $(intermediates)/bindings/V8Comment.h \ $(intermediates)/bindings/V8CompositionEvent.h \ + $(intermediates)/bindings/V8CustomEvent.h \ $(intermediates)/bindings/V8DOMCoreException.h \ $(intermediates)/bindings/V8DOMImplementation.h \ $(intermediates)/bindings/V8Document.h \ @@ -128,7 +129,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) +LOCAL_GENERATED_SOURCES += $(GEN) $(GEN:%.h=%.cpp) # We also need the .cpp files, which are generated as side effects of the # above rules. Specifying this explicitly makes -j2 work. @@ -137,6 +138,7 @@ $(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/bindings/%.cpp : $(intermediates) # HTML GEN := \ $(intermediates)/bindings/V8Blob.h \ + $(intermediates)/bindings/V8DOMFormData.h \ $(intermediates)/bindings/V8DataGridColumn.h \ $(intermediates)/bindings/V8DataGridColumnList.h \ $(intermediates)/bindings/V8File.h \ @@ -196,6 +198,7 @@ GEN := \ $(intermediates)/bindings/V8HTMLParagraphElement.h \ $(intermediates)/bindings/V8HTMLParamElement.h \ $(intermediates)/bindings/V8HTMLPreElement.h \ + $(intermediates)/bindings/V8HTMLProgressElement.h \ $(intermediates)/bindings/V8HTMLQuoteElement.h \ $(intermediates)/bindings/V8HTMLScriptElement.h \ $(intermediates)/bindings/V8HTMLSelectElement.h \ @@ -222,7 +225,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) +LOCAL_GENERATED_SOURCES += $(GEN) $(GEN:%.h=%.cpp) # We also need the .cpp files, which are generated as side effects of the # above rules. Specifying this explicitly makes -j2 work. @@ -260,7 +263,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) +LOCAL_GENERATED_SOURCES += $(GEN) $(GEN:%.h=%.cpp) # We also need the .cpp files, which are generated as side effects of the # above rules. Specifying this explicitly makes -j2 work. @@ -274,7 +277,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) +LOCAL_GENERATED_SOURCES += $(GEN) $(GEN:%.h=%.cpp) # We also need the .cpp files, which are generated as side effects of the # above rules. Specifying this explicitly makes -j2 work. @@ -288,6 +291,7 @@ GEN := \ $(intermediates)/bindings/V8Coordinates.h \ $(intermediates)/bindings/V8DOMSelection.h \ $(intermediates)/bindings/V8DOMWindow.h \ + $(intermediates)/bindings/V8EventSource.h \ $(intermediates)/bindings/V8Geolocation.h \ $(intermediates)/bindings/V8Geoposition.h \ $(intermediates)/bindings/V8History.h \ @@ -301,7 +305,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) +LOCAL_GENERATED_SOURCES += $(GEN) $(GEN:%.h=%.cpp) # We also need the .cpp files, which are generated as side effects of the # above rules. Specifying this explicitly makes -j2 work. @@ -317,7 +321,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) +LOCAL_GENERATED_SOURCES += $(GEN) $(GEN:%.h=%.cpp) # We also need the .cpp files, which are generated as side effects of the # above rules. Specifying this explicitly makes -j2 work. @@ -335,7 +339,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) +LOCAL_GENERATED_SOURCES += $(GEN) $(GEN:%.h=%.cpp) # We also need the .cpp files, which are generated as side effects of the # above rules. Specifying this explicitly makes -j2 work. @@ -350,7 +354,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) +LOCAL_GENERATED_SOURCES += $(GEN) $(GEN:%.h=%.cpp) # We also need the .cpp files, which are generated as side effects of the # above rules. Specifying this explicitly makes -j2 work. @@ -507,7 +511,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) +LOCAL_GENERATED_SOURCES += $(GEN) $(GEN:%.h=%.cpp) # We also need the .cpp files, which are generated as side effects of the # above rules. Specifying this explicitly makes -j2 work. @@ -527,7 +531,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) +LOCAL_GENERATED_SOURCES += $(GEN) $(GEN:%.h=%.cpp) # We also need the .cpp files, which are generated as side effects of the # above rules. Specifying this explicitly makes -j2 work. @@ -535,7 +539,6 @@ $(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/bindings/%.cpp : $(intermediates) # XML GEN := \ - $(intermediates)/bindings/V8DOMFormData.h \ $(intermediates)/bindings/V8DOMParser.h \ $(intermediates)/bindings/V8XMLHttpRequest.h \ $(intermediates)/bindings/V8XMLHttpRequestException.h \ @@ -553,7 +556,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) +LOCAL_GENERATED_SOURCES += $(GEN) $(GEN:%.h=%.cpp) # We also need the .cpp files, which are generated as side effects of the # above rules. Specifying this explicitly makes -j2 work. @@ -571,7 +574,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) +LOCAL_GENERATED_SOURCES += $(GEN) $(GEN:%.h=%.cpp) # We also need the .cpp files, which are generated as side effects of the # above rules. Specifying this explicitly makes -j2 work. @@ -587,7 +590,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)/notifications/%.idl $(js_binding_scripts) $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) +LOCAL_GENERATED_SOURCES += $(GEN) $(GEN:%.h=%.cpp) # We also need the .cpp files, which are generated as side effects of the # above rules. Specifying this explicitly makes -j2 work. @@ -602,7 +605,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) +LOCAL_GENERATED_SOURCES += $(GEN) $(GEN:%.h=%.cpp) # 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.jscbindings.mk b/WebCore/Android.jscbindings.mk index 282186d..bd775b3 100644 --- a/WebCore/Android.jscbindings.mk +++ b/WebCore/Android.jscbindings.mk @@ -58,6 +58,8 @@ BINDING_C_INCLUDES := \ $(base_intermediates)/WebCore/xml LOCAL_SRC_FILES += \ + bindings/js/DOMObjectHashTableMap.cpp \ + bindings/js/DOMWrapperWorld.cpp \ bindings/js/GCController.cpp \ bindings/js/JSAbstractWorkerCustom.cpp \ bindings/js/JSAttrCustom.cpp \ @@ -86,11 +88,12 @@ LOCAL_SRC_FILES += \ bindings/js/JSDesktopNotificationsCustom.cpp \ bindings/js/JSDOMApplicationCacheCustom.cpp \ bindings/js/JSDOMBinding.cpp \ - bindings/js/JSDOMFormDataCustom.cpp \ + bindings/js/JSDOMFormDataCustom.cpp \ bindings/js/JSDOMGlobalObject.cpp \ bindings/js/JSDOMWindowBase.cpp \ bindings/js/JSDOMWindowCustom.cpp \ bindings/js/JSDOMWindowShell.cpp \ + bindings/js/JSDOMWrapper.cpp \ bindings/js/JSDataGridColumnListCustom.cpp \ bindings/js/JSDataGridDataSource.cpp \ bindings/js/JSDatabaseCustom.cpp \ @@ -186,6 +189,7 @@ LOCAL_SRC_FILES += \ \ bridge/IdentifierRep.cpp \ bridge/NP_jsobject.cpp \ + bridge/c/CRuntimeObject.cpp \ bridge/c/c_class.cpp \ bridge/c/c_instance.cpp \ bridge/c/c_runtime.cpp \ @@ -196,6 +200,7 @@ LOCAL_SRC_FILES += \ bridge/jni/jsc/JNIUtilityPrivate.cpp \ bridge/jni/jsc/JavaClassJSC.cpp \ bridge/jni/jsc/JavaInstanceJSC.cpp \ + bridge/jni/jsc/JavaRuntimeObject.cpp \ bridge/jsc/BridgeJSC.cpp \ bridge/npruntime.cpp \ bridge/runtime_array.cpp \ diff --git a/WebCore/Android.mk b/WebCore/Android.mk index 97ddbd6..217dd9f 100644 --- a/WebCore/Android.mk +++ b/WebCore/Android.mk @@ -103,6 +103,7 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ dom/BeforeUnloadEvent.cpp \ dom/CDATASection.cpp \ dom/CSSMappedAttributeDeclaration.cpp \ + dom/CanvasSurface.cpp \ dom/CharacterData.cpp \ dom/CheckedRadioButtons.cpp \ dom/ChildNodeList.cpp \ @@ -114,6 +115,7 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ dom/Comment.cpp \ dom/CompositionEvent.cpp \ dom/ContainerNode.cpp \ + dom/CustomEvent.cpp \ dom/DOMImplementation.cpp \ dom/Document.cpp \ dom/DocumentFragment.cpp \ @@ -245,11 +247,8 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ \ html/Blob.cpp \ html/CollectionCache.cpp \ -<<<<<<< HEAD html/DateComponents.cpp \ -======= html/DOMFormData.cpp \ ->>>>>>> webkit.org at r58033 html/File.cpp \ html/FileList.cpp \ html/FormDataList.cpp \ @@ -269,6 +268,7 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ html/HTMLViewSourceDocument.cpp \ html/ImageData.cpp \ html/PreloadScanner.cpp \ + html/StepRange.cpp \ html/TimeRanges.cpp \ html/ValidityState.cpp \ \ @@ -555,11 +555,7 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ platform/text/SegmentedString.cpp \ platform/text/String.cpp \ platform/text/StringBuilder.cpp \ -<<<<<<< HEAD - platform/text/StringImpl.cpp \ platform/text/TextBoundaries.cpp \ -======= ->>>>>>> webkit.org at r58033 platform/text/TextBreakIteratorICU.cpp \ platform/text/TextCodec.cpp \ platform/text/TextCodecICU.cpp \ diff --git a/WebCore/Android.v8bindings.mk b/WebCore/Android.v8bindings.mk index 3d36659..b7a5038 100644 --- a/WebCore/Android.v8bindings.mk +++ b/WebCore/Android.v8bindings.mk @@ -49,12 +49,8 @@ LOCAL_SRC_FILES += \ bindings/v8/DateExtension.cpp \ bindings/v8/DOMData.cpp \ bindings/v8/DOMDataStore.cpp \ -<<<<<<< HEAD bindings/v8/DOMWrapperWorld.cpp \ - bindings/v8/DerivedSourcesAllInOne.cpp \ bindings/v8/IsolatedWorld.cpp \ -======= ->>>>>>> webkit.org at r58033 bindings/v8/MainThreadDOMData.cpp \ bindings/v8/NPV8Object.cpp \ bindings/v8/ScheduledAction.cpp \ @@ -84,14 +80,10 @@ LOCAL_SRC_FILES += \ bindings/v8/V8DataGridDataSource.cpp \ bindings/v8/V8EventListenerList.cpp \ bindings/v8/V8GCController.cpp \ + bindings/v8/V8GCForContextDispose.cpp \ bindings/v8/V8Helpers.cpp \ bindings/v8/V8HiddenPropertyName.cpp \ -<<<<<<< HEAD bindings/v8/V8IsolatedContext.cpp \ - bindings/v8/V8Index.cpp \ -======= - bindings/v8/V8IsolatedWorld.cpp \ ->>>>>>> webkit.org at r58033 bindings/v8/V8LazyEventListener.cpp \ bindings/v8/V8NPObject.cpp \ bindings/v8/V8NPUtils.cpp \ @@ -123,7 +115,7 @@ LOCAL_SRC_FILES += \ bindings/v8/custom/V8CustomSQLTransactionCallback.cpp \ bindings/v8/custom/V8CustomSQLTransactionErrorCallback.cpp \ bindings/v8/custom/V8CustomVoidCallback.cpp \ - bindings/v8/custom/V8DOMFormDataCustom.cpp \ + bindings/v8/custom/V8DOMFormDataCustom.cpp \ bindings/v8/custom/V8DOMWindowCustom.cpp \ bindings/v8/custom/V8DataGridColumnListCustom.cpp \ bindings/v8/custom/V8DatabaseCallback.cpp \ @@ -134,11 +126,6 @@ LOCAL_SRC_FILES += \ bindings/v8/custom/V8ElementCustom.cpp \ bindings/v8/custom/V8EventCustom.cpp \ bindings/v8/custom/V8EventSourceConstructor.cpp \ -<<<<<<< HEAD - bindings/v8/custom/V8EventSourceCustom.cpp \ -======= - bindings/v8/custom/V8FileListCustom.cpp \ ->>>>>>> webkit.org at r58033 bindings/v8/custom/V8GeolocationCustom.cpp \ bindings/v8/custom/V8HistoryCustom.cpp \ bindings/v8/custom/V8HTMLAllCollectionCustom.cpp \ @@ -164,16 +151,11 @@ LOCAL_SRC_FILES += \ bindings/v8/custom/V8MessageEventCustom.cpp \ bindings/v8/custom/V8NamedNodeMapCustom.cpp \ bindings/v8/custom/V8NamedNodesCollection.cpp \ - bindings/v8/custom/V8NavigatorCustom.cpp \ bindings/v8/custom/V8NodeCustom.cpp \ bindings/v8/custom/V8NodeFilterCustom.cpp \ bindings/v8/custom/V8NodeIteratorCustom.cpp \ bindings/v8/custom/V8NodeListCustom.cpp \ -<<<<<<< HEAD bindings/v8/custom/V8PopStateEventCustom.cpp \ - bindings/v8/custom/V8ScreenCustom.cpp \ -======= ->>>>>>> webkit.org at r58033 bindings/v8/custom/V8SQLResultSetRowListCustom.cpp \ bindings/v8/custom/V8SQLTransactionCustom.cpp \ bindings/v8/custom/V8WebSocketCustom.cpp @@ -198,14 +180,9 @@ LOCAL_SRC_FILES += \ bindings/v8/custom/V8WorkerContextCustom.cpp \ bindings/v8/custom/V8WorkerCustom.cpp \ bindings/v8/custom/V8XMLHttpRequestConstructor.cpp \ -<<<<<<< HEAD bindings/v8/custom/V8XMLHttpRequestCustom.cpp \ - bindings/v8/custom/V8XMLHttpRequestUploadCustom.cpp \ \ bindings/v8/specialization/V8BindingState.cpp -======= - bindings/v8/custom/V8XMLHttpRequestCustom.cpp ->>>>>>> webkit.org at r58033 LOCAL_SRC_FILES += \ bridge/jni/JNIBridge.cpp \ |