diff options
Diffstat (limited to 'WebCore/Android.v8bindings.mk')
| -rw-r--r-- | WebCore/Android.v8bindings.mk | 25 |
1 files changed, 20 insertions, 5 deletions
diff --git a/WebCore/Android.v8bindings.mk b/WebCore/Android.v8bindings.mk index 603ca74..3d36659 100644 --- a/WebCore/Android.v8bindings.mk +++ b/WebCore/Android.v8bindings.mk @@ -49,9 +49,12 @@ 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 \ @@ -83,8 +86,12 @@ LOCAL_SRC_FILES += \ bindings/v8/V8GCController.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 \ @@ -98,9 +105,7 @@ LOCAL_SRC_FILES += \ \ bindings/v8/npruntime.cpp \ \ - bindings/v8/custom/V8AbstractWorkerCustom.cpp \ bindings/v8/custom/V8AttrCustom.cpp \ - bindings/v8/custom/V8BarInfoCustom.cpp \ bindings/v8/custom/V8CSSRuleCustom.cpp \ bindings/v8/custom/V8CSSStyleDeclarationCustom.cpp \ bindings/v8/custom/V8CSSStyleSheetCustom.cpp \ @@ -118,10 +123,10 @@ LOCAL_SRC_FILES += \ bindings/v8/custom/V8CustomSQLTransactionCallback.cpp \ bindings/v8/custom/V8CustomSQLTransactionErrorCallback.cpp \ bindings/v8/custom/V8CustomVoidCallback.cpp \ - bindings/v8/custom/V8DOMApplicationCacheCustom.cpp \ - bindings/v8/custom/V8DOMSelectionCustom.cpp \ + bindings/v8/custom/V8DOMFormDataCustom.cpp \ bindings/v8/custom/V8DOMWindowCustom.cpp \ bindings/v8/custom/V8DataGridColumnListCustom.cpp \ + bindings/v8/custom/V8DatabaseCallback.cpp \ bindings/v8/custom/V8DatabaseCustom.cpp \ bindings/v8/custom/V8DedicatedWorkerContextCustom.cpp \ bindings/v8/custom/V8DocumentCustom.cpp \ @@ -129,7 +134,11 @@ 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 \ @@ -160,8 +169,11 @@ LOCAL_SRC_FILES += \ 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 @@ -170,7 +182,6 @@ ifeq ($(ENABLE_SVG), true) LOCAL_SRC_FILES += \ bindings/v8/custom/V8SVGDocumentCustom.cpp \ bindings/v8/custom/V8SVGElementCustom.cpp \ - bindings/v8/custom/V8SVGElementInstanceCustom.cpp \ bindings/v8/custom/V8SVGLengthCustom.cpp \ bindings/v8/custom/V8SVGMatrixCustom.cpp \ bindings/v8/custom/V8SVGPathSegCustom.cpp @@ -187,10 +198,14 @@ 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 \ |