diff options
| -rw-r--r-- | Android.v8.mk | 4 | ||||
| -rw-r--r-- | V8Binding/Android.libv8.mk | 13 | ||||
| -rw-r--r-- | V8Binding/Android.v8shell.mk | 4 | ||||
| -rw-r--r-- | V8Binding/V8Binding.derived.mk | 40 | ||||
| -rw-r--r-- | V8Binding/binding/DOMObjectsInclude.h (renamed from V8Binding/bindings/DOMObjectsInclude.h) | 3 | ||||
| -rw-r--r-- | V8Binding/binding/JSDOMBinding.cpp (renamed from V8Binding/bindings/JSDOMBinding.cpp) | 0 | ||||
| -rw-r--r-- | V8Binding/binding/JSDOMBinding.h (renamed from V8Binding/bindings/JSDOMBinding.h) | 0 | ||||
| -rw-r--r-- | V8Binding/binding/JSXPathNSResolver.cpp (renamed from V8Binding/bindings/JSXPathNSResolver.cpp) | 0 | ||||
| -rw-r--r-- | V8Binding/binding/JSXPathNSResolver.h (renamed from V8Binding/bindings/JSXPathNSResolver.h) | 0 | ||||
| -rw-r--r-- | V8Binding/binding/NPV8Object.cpp (renamed from V8Binding/bindings/NPV8Object.cpp) | 0 | ||||
| -rw-r--r-- | V8Binding/binding/NPV8Object.h (renamed from V8Binding/bindings/NPV8Object.h) | 0 | ||||
| -rw-r--r-- | V8Binding/binding/RGBColor.cpp (renamed from V8Binding/bindings/RGBColor.cpp) | 0 | ||||
| -rw-r--r-- | V8Binding/binding/RGBColor.h (renamed from V8Binding/bindings/RGBColor.h) | 0 | ||||
| -rw-r--r-- | V8Binding/binding/ScriptController.cpp (renamed from V8Binding/bindings/ScriptController.cpp) | 0 | ||||
| -rw-r--r-- | V8Binding/binding/ScriptController.h (renamed from V8Binding/bindings/ScriptController.h) | 0 | ||||
| -rw-r--r-- | V8Binding/binding/UndetectableHTMLCollection.idl (renamed from V8Binding/bindings/UndetectableHTMLCollection.idl) | 0 | ||||
| -rw-r--r-- | V8Binding/binding/V8CanvasPixelArrayCustom.cpp (renamed from V8Binding/bindings/V8CanvasPixelArrayCustom.cpp) | 0 | ||||
| -rw-r--r-- | V8Binding/binding/V8InitializeThreading.cpp (renamed from V8Binding/bindings/V8InitializeThreading.cpp) | 0 | ||||
| -rw-r--r-- | V8Binding/binding/V8InitializeThreading.h (renamed from V8Binding/bindings/V8InitializeThreading.h) | 0 | ||||
| -rw-r--r-- | V8Binding/binding/V8MessagePortCustom.cpp (renamed from V8Binding/bindings/V8MessagePortCustom.cpp) | 0 | ||||
| -rw-r--r-- | V8Binding/binding/V8NPObject.cpp (renamed from V8Binding/bindings/V8NPObject.cpp) | 0 | ||||
| -rw-r--r-- | V8Binding/binding/V8NPObject.h (renamed from V8Binding/bindings/V8NPObject.h) | 0 | ||||
| -rw-r--r-- | V8Binding/binding/V8NPUtils.cpp (renamed from V8Binding/bindings/V8NPUtils.cpp) | 0 | ||||
| -rw-r--r-- | V8Binding/binding/V8NPUtils.h (renamed from V8Binding/bindings/V8NPUtils.h) | 0 | ||||
| -rw-r--r-- | V8Binding/binding/V8SVGPODTypeWrapper.h (renamed from V8Binding/bindings/V8SVGPODTypeWrapper.h) | 0 | ||||
| -rw-r--r-- | V8Binding/binding/V8Utilities.cpp (renamed from V8Binding/bindings/V8Utilities.cpp) | 0 | ||||
| -rw-r--r-- | V8Binding/binding/V8Utilities.h (renamed from V8Binding/bindings/V8Utilities.h) | 0 | ||||
| -rw-r--r-- | V8Binding/binding/V8WorkerContextCustom.cpp (renamed from V8Binding/bindings/V8WorkerContextCustom.cpp) | 0 | ||||
| -rw-r--r-- | V8Binding/binding/V8WorkerCustom.cpp (renamed from V8Binding/bindings/V8WorkerCustom.cpp) | 0 | ||||
| -rw-r--r-- | V8Binding/binding/dom_wrapper_map.h (renamed from V8Binding/bindings/dom_wrapper_map.h) | 0 | ||||
| -rw-r--r-- | V8Binding/binding/npruntime.cpp (renamed from V8Binding/bindings/npruntime.cpp) | 0 | ||||
| -rw-r--r-- | V8Binding/binding/npruntime_impl.h (renamed from V8Binding/bindings/npruntime_impl.h) | 0 | ||||
| -rw-r--r-- | V8Binding/binding/npruntime_internal.h (renamed from V8Binding/bindings/npruntime_internal.h) | 0 | ||||
| -rw-r--r-- | V8Binding/binding/npruntime_priv.h (renamed from V8Binding/bindings/npruntime_priv.h) | 0 | ||||
| -rw-r--r-- | V8Binding/binding/v8_binding.cpp (renamed from V8Binding/bindings/v8_binding.cpp) | 0 | ||||
| -rw-r--r-- | V8Binding/binding/v8_binding.h (renamed from V8Binding/bindings/v8_binding.h) | 0 | ||||
| -rw-r--r-- | V8Binding/binding/v8_custom.cpp (renamed from V8Binding/bindings/v8_custom.cpp) | 0 | ||||
| -rw-r--r-- | V8Binding/binding/v8_custom.h (renamed from V8Binding/bindings/v8_custom.h) | 0 | ||||
| -rw-r--r-- | V8Binding/binding/v8_helpers.cpp (renamed from V8Binding/bindings/v8_helpers.cpp) | 0 | ||||
| -rw-r--r-- | V8Binding/binding/v8_helpers.h (renamed from V8Binding/bindings/v8_helpers.h) | 0 | ||||
| -rw-r--r-- | V8Binding/binding/v8_index.cpp (renamed from V8Binding/bindings/v8_index.cpp) | 0 | ||||
| -rw-r--r-- | V8Binding/binding/v8_index.h (renamed from V8Binding/bindings/v8_index.h) | 0 | ||||
| -rw-r--r-- | V8Binding/binding/v8_npobject.h (renamed from V8Binding/bindings/v8_npobject.h) | 0 | ||||
| -rw-r--r-- | V8Binding/binding/v8_proxy.cpp (renamed from V8Binding/bindings/v8_proxy.cpp) | 0 | ||||
| -rw-r--r-- | V8Binding/binding/v8_proxy.h (renamed from V8Binding/bindings/v8_proxy.h) | 0 |
45 files changed, 34 insertions, 30 deletions
diff --git a/Android.v8.mk b/Android.v8.mk index d25730e..17e85c3 100644 --- a/Android.v8.mk +++ b/Android.v8.mk @@ -246,5 +246,5 @@ include $(BASE_PATH)/WebKit/android/wds/client/Android.mk include $(BASE_PATH)/WebKitTools/android/webkitmerge/Android.mk # Build libv8 and v8shell -include $(BASE_PATH)/v8/Android.mk -include $(BASE_PATH)/v8/Android.v8shell.mk +include $(BASE_PATH)/V8Binding/Android.libv8.mk +include $(BASE_PATH)/V8Binding/Android.v8shell.mk diff --git a/V8Binding/Android.libv8.mk b/V8Binding/Android.libv8.mk index 1e91788..c83b046 100644 --- a/V8Binding/Android.libv8.mk +++ b/V8Binding/Android.libv8.mk @@ -73,10 +73,11 @@ LOCAL_SRC_FILES := \ src/v8threads.cc \ src/variables.cc \ src/virtual-frame.cc \ + src/version.cc \ src/zone.cc ifeq ($(TARGET_ARCH),arm) - LOCAL_SRC_FILES += \ + LOCAL_SRC_FILES += \ src/assembler-arm.cc \ src/builtins-arm.cc \ src/codegen-arm.cc \ @@ -127,7 +128,9 @@ LOCAL_SRC_FILES += \ src/snapshot-empty.cc \ src/dtoa-config.c -LOCAL_JS_LIBRARY_FILES := $(addprefix $(LOCAL_PATH)/, \ +LOCAL_SRC_FILES := $(addprefix v8/, $(LOCAL_SRC_FILES)) + +LOCAL_JS_LIBRARY_FILES := $(addprefix $(LOCAL_PATH)/v8/, \ src/runtime.js \ src/v8natives.js \ src/array.js \ @@ -138,6 +141,7 @@ LOCAL_JS_LIBRARY_FILES := $(addprefix $(LOCAL_PATH)/, \ src/apinatives.js \ src/date-delay.js \ src/regexp-delay.js \ + src/json-delay.js \ src/macros.py \ ) @@ -156,13 +160,12 @@ LOCAL_CFLAGS += \ -Wno-endif-labels \ -Wno-import \ -Wno-format \ - -fno-exceptions \ - -fno-tree-sink + -fno-exceptions ifeq ($(TARGET_ARCH),arm) LOCAL_CFLAGS += -DARM endif -LOCAL_C_INCLUDES += $(LOCAL_PATH)/src +LOCAL_C_INCLUDES += $(LOCAL_PATH)/v8/src include $(BUILD_STATIC_LIBRARY) diff --git a/V8Binding/Android.v8shell.mk b/V8Binding/Android.v8shell.mk index ea18166..46cf4ee 100644 --- a/V8Binding/Android.v8shell.mk +++ b/V8Binding/Android.v8shell.mk @@ -1,13 +1,13 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) -LOCAL_SRC_FILES:= samples/shell.cc +LOCAL_SRC_FILES:= v8/samples/shell.cc LOCAL_MODULE := v8shell LOCAL_CPP_EXTENSION := .cc LOCAL_STATIC_LIBRARIES := libv8 -LOCAL_C_INCLUDES += $(LOCAL_PATH)/include +LOCAL_C_INCLUDES += $(LOCAL_PATH)/v8/include include $(BUILD_EXECUTABLE) diff --git a/V8Binding/V8Binding.derived.mk b/V8Binding/V8Binding.derived.mk index 3cf3665..22aca51 100644 --- a/V8Binding/V8Binding.derived.mk +++ b/V8Binding/V8Binding.derived.mk @@ -20,10 +20,10 @@ LOCAL_CFLAGS += -DWTF_USE_V8=1 v8binding_dir := $(LOCAL_PATH) BINDING_C_INCLUDES := \ - $(BASE_PATH)/v8/include \ + $(LOCAL_PATH)/v8/include \ $(WEBCORE_PATH)/bindings/v8 \ $(WEBCORE_PATH)/bindings/v8/custom \ - $(LOCAL_PATH)/v8 \ + $(LOCAL_PATH)/binding \ $(LOCAL_PATH)/npapi \ $(LOCAL_PATH)/jni \ $(JAVASCRIPTCORE_PATH)/wtf \ @@ -113,24 +113,24 @@ WEBCORE_SRC_FILES := $(WEBCORE_SRC_FILES) \ bindings/v8/custom/V8XMLSerializerConstructor.cpp LOCAL_SRC_FILES := \ - v8/V8InitializeThreading.cpp \ - v8/JSDOMBinding.cpp \ - v8/JSXPathNSResolver.cpp \ - v8/NPV8Object.cpp \ - v8/RGBColor.cpp \ - v8/V8CanvasPixelArrayCustom.cpp \ - v8/V8MessagePortCustom.cpp \ - v8/V8NPObject.cpp \ - v8/V8NPUtils.cpp \ - v8/V8Utilities.cpp \ - v8/V8WorkerContextCustom.cpp \ - v8/V8WorkerCustom.cpp \ - v8/npruntime.cpp \ - v8/v8_binding.cpp \ - v8/v8_custom.cpp \ - v8/v8_helpers.cpp \ - v8/v8_index.cpp \ - v8/v8_proxy.cpp \ + binding/V8InitializeThreading.cpp \ + binding/JSDOMBinding.cpp \ + binding/JSXPathNSResolver.cpp \ + binding/NPV8Object.cpp \ + binding/RGBColor.cpp \ + binding/V8CanvasPixelArrayCustom.cpp \ + binding/V8MessagePortCustom.cpp \ + binding/V8NPObject.cpp \ + binding/V8NPUtils.cpp \ + binding/V8Utilities.cpp \ + binding/V8WorkerContextCustom.cpp \ + binding/V8WorkerCustom.cpp \ + binding/npruntime.cpp \ + binding/v8_binding.cpp \ + binding/v8_custom.cpp \ + binding/v8_helpers.cpp \ + binding/v8_index.cpp \ + binding/v8_proxy.cpp \ \ jni/jni_class.cpp \ jni/jni_instance.cpp \ diff --git a/V8Binding/bindings/DOMObjectsInclude.h b/V8Binding/binding/DOMObjectsInclude.h index 0268bca..a79f03d 100644 --- a/V8Binding/bindings/DOMObjectsInclude.h +++ b/V8Binding/binding/DOMObjectsInclude.h @@ -24,9 +24,10 @@ #include "CSSPageRule.h" #include "CSSRule.h" #include "CSSRuleList.h" -#include "CSSValueList.h" +#include "CSSStyleDeclaration.h" #include "CSSStyleRule.h" #include "CSSStyleSheet.h" +#include "CSSValueList.h" #include "CSSVariablesDeclaration.h" #include "CSSVariablesRule.h" #include "Database.h" diff --git a/V8Binding/bindings/JSDOMBinding.cpp b/V8Binding/binding/JSDOMBinding.cpp index c72a92b..c72a92b 100644 --- a/V8Binding/bindings/JSDOMBinding.cpp +++ b/V8Binding/binding/JSDOMBinding.cpp diff --git a/V8Binding/bindings/JSDOMBinding.h b/V8Binding/binding/JSDOMBinding.h index 8ed5602..8ed5602 100644 --- a/V8Binding/bindings/JSDOMBinding.h +++ b/V8Binding/binding/JSDOMBinding.h diff --git a/V8Binding/bindings/JSXPathNSResolver.cpp b/V8Binding/binding/JSXPathNSResolver.cpp index 2fb2849..2fb2849 100644 --- a/V8Binding/bindings/JSXPathNSResolver.cpp +++ b/V8Binding/binding/JSXPathNSResolver.cpp diff --git a/V8Binding/bindings/JSXPathNSResolver.h b/V8Binding/binding/JSXPathNSResolver.h index f0c340c..f0c340c 100644 --- a/V8Binding/bindings/JSXPathNSResolver.h +++ b/V8Binding/binding/JSXPathNSResolver.h diff --git a/V8Binding/bindings/NPV8Object.cpp b/V8Binding/binding/NPV8Object.cpp index defe6bf..defe6bf 100644 --- a/V8Binding/bindings/NPV8Object.cpp +++ b/V8Binding/binding/NPV8Object.cpp diff --git a/V8Binding/bindings/NPV8Object.h b/V8Binding/binding/NPV8Object.h index 1b9713e..1b9713e 100644 --- a/V8Binding/bindings/NPV8Object.h +++ b/V8Binding/binding/NPV8Object.h diff --git a/V8Binding/bindings/RGBColor.cpp b/V8Binding/binding/RGBColor.cpp index 4a37ea6..4a37ea6 100644 --- a/V8Binding/bindings/RGBColor.cpp +++ b/V8Binding/binding/RGBColor.cpp diff --git a/V8Binding/bindings/RGBColor.h b/V8Binding/binding/RGBColor.h index afc0500..afc0500 100644 --- a/V8Binding/bindings/RGBColor.h +++ b/V8Binding/binding/RGBColor.h diff --git a/V8Binding/bindings/ScriptController.cpp b/V8Binding/binding/ScriptController.cpp index e53606e..e53606e 100644 --- a/V8Binding/bindings/ScriptController.cpp +++ b/V8Binding/binding/ScriptController.cpp diff --git a/V8Binding/bindings/ScriptController.h b/V8Binding/binding/ScriptController.h index 40534fb..40534fb 100644 --- a/V8Binding/bindings/ScriptController.h +++ b/V8Binding/binding/ScriptController.h diff --git a/V8Binding/bindings/UndetectableHTMLCollection.idl b/V8Binding/binding/UndetectableHTMLCollection.idl index bcb2aee..bcb2aee 100644 --- a/V8Binding/bindings/UndetectableHTMLCollection.idl +++ b/V8Binding/binding/UndetectableHTMLCollection.idl diff --git a/V8Binding/bindings/V8CanvasPixelArrayCustom.cpp b/V8Binding/binding/V8CanvasPixelArrayCustom.cpp index d5441a1..d5441a1 100644 --- a/V8Binding/bindings/V8CanvasPixelArrayCustom.cpp +++ b/V8Binding/binding/V8CanvasPixelArrayCustom.cpp diff --git a/V8Binding/bindings/V8InitializeThreading.cpp b/V8Binding/binding/V8InitializeThreading.cpp index 869e374..869e374 100644 --- a/V8Binding/bindings/V8InitializeThreading.cpp +++ b/V8Binding/binding/V8InitializeThreading.cpp diff --git a/V8Binding/bindings/V8InitializeThreading.h b/V8Binding/binding/V8InitializeThreading.h index e548441..e548441 100644 --- a/V8Binding/bindings/V8InitializeThreading.h +++ b/V8Binding/binding/V8InitializeThreading.h diff --git a/V8Binding/bindings/V8MessagePortCustom.cpp b/V8Binding/binding/V8MessagePortCustom.cpp index 6405b67..6405b67 100644 --- a/V8Binding/bindings/V8MessagePortCustom.cpp +++ b/V8Binding/binding/V8MessagePortCustom.cpp diff --git a/V8Binding/bindings/V8NPObject.cpp b/V8Binding/binding/V8NPObject.cpp index 60e66a9..60e66a9 100644 --- a/V8Binding/bindings/V8NPObject.cpp +++ b/V8Binding/binding/V8NPObject.cpp diff --git a/V8Binding/bindings/V8NPObject.h b/V8Binding/binding/V8NPObject.h index 04cbff1..04cbff1 100644 --- a/V8Binding/bindings/V8NPObject.h +++ b/V8Binding/binding/V8NPObject.h diff --git a/V8Binding/bindings/V8NPUtils.cpp b/V8Binding/binding/V8NPUtils.cpp index 04e6ede..04e6ede 100644 --- a/V8Binding/bindings/V8NPUtils.cpp +++ b/V8Binding/binding/V8NPUtils.cpp diff --git a/V8Binding/bindings/V8NPUtils.h b/V8Binding/binding/V8NPUtils.h index 2e07e66..2e07e66 100644 --- a/V8Binding/bindings/V8NPUtils.h +++ b/V8Binding/binding/V8NPUtils.h diff --git a/V8Binding/bindings/V8SVGPODTypeWrapper.h b/V8Binding/binding/V8SVGPODTypeWrapper.h index 79553c2..79553c2 100644 --- a/V8Binding/bindings/V8SVGPODTypeWrapper.h +++ b/V8Binding/binding/V8SVGPODTypeWrapper.h diff --git a/V8Binding/bindings/V8Utilities.cpp b/V8Binding/binding/V8Utilities.cpp index 8853506..8853506 100644 --- a/V8Binding/bindings/V8Utilities.cpp +++ b/V8Binding/binding/V8Utilities.cpp diff --git a/V8Binding/bindings/V8Utilities.h b/V8Binding/binding/V8Utilities.h index f4346f6..f4346f6 100644 --- a/V8Binding/bindings/V8Utilities.h +++ b/V8Binding/binding/V8Utilities.h diff --git a/V8Binding/bindings/V8WorkerContextCustom.cpp b/V8Binding/binding/V8WorkerContextCustom.cpp index e646bb5..e646bb5 100644 --- a/V8Binding/bindings/V8WorkerContextCustom.cpp +++ b/V8Binding/binding/V8WorkerContextCustom.cpp diff --git a/V8Binding/bindings/V8WorkerCustom.cpp b/V8Binding/binding/V8WorkerCustom.cpp index 1f7e5fe..1f7e5fe 100644 --- a/V8Binding/bindings/V8WorkerCustom.cpp +++ b/V8Binding/binding/V8WorkerCustom.cpp diff --git a/V8Binding/bindings/dom_wrapper_map.h b/V8Binding/binding/dom_wrapper_map.h index e95ff88..e95ff88 100644 --- a/V8Binding/bindings/dom_wrapper_map.h +++ b/V8Binding/binding/dom_wrapper_map.h diff --git a/V8Binding/bindings/npruntime.cpp b/V8Binding/binding/npruntime.cpp index f32c63d..f32c63d 100644 --- a/V8Binding/bindings/npruntime.cpp +++ b/V8Binding/binding/npruntime.cpp diff --git a/V8Binding/bindings/npruntime_impl.h b/V8Binding/binding/npruntime_impl.h index 31db922..31db922 100644 --- a/V8Binding/bindings/npruntime_impl.h +++ b/V8Binding/binding/npruntime_impl.h diff --git a/V8Binding/bindings/npruntime_internal.h b/V8Binding/binding/npruntime_internal.h index 75bf2b0..75bf2b0 100644 --- a/V8Binding/bindings/npruntime_internal.h +++ b/V8Binding/binding/npruntime_internal.h diff --git a/V8Binding/bindings/npruntime_priv.h b/V8Binding/binding/npruntime_priv.h index 8b1ddec..8b1ddec 100644 --- a/V8Binding/bindings/npruntime_priv.h +++ b/V8Binding/binding/npruntime_priv.h diff --git a/V8Binding/bindings/v8_binding.cpp b/V8Binding/binding/v8_binding.cpp index 3a36fc5..3a36fc5 100644 --- a/V8Binding/bindings/v8_binding.cpp +++ b/V8Binding/binding/v8_binding.cpp diff --git a/V8Binding/bindings/v8_binding.h b/V8Binding/binding/v8_binding.h index 8300dd7..8300dd7 100644 --- a/V8Binding/bindings/v8_binding.h +++ b/V8Binding/binding/v8_binding.h diff --git a/V8Binding/bindings/v8_custom.cpp b/V8Binding/binding/v8_custom.cpp index 855e192..855e192 100644 --- a/V8Binding/bindings/v8_custom.cpp +++ b/V8Binding/binding/v8_custom.cpp diff --git a/V8Binding/bindings/v8_custom.h b/V8Binding/binding/v8_custom.h index caeac41..caeac41 100644 --- a/V8Binding/bindings/v8_custom.h +++ b/V8Binding/binding/v8_custom.h diff --git a/V8Binding/bindings/v8_helpers.cpp b/V8Binding/binding/v8_helpers.cpp index 7a72ab5..7a72ab5 100644 --- a/V8Binding/bindings/v8_helpers.cpp +++ b/V8Binding/binding/v8_helpers.cpp diff --git a/V8Binding/bindings/v8_helpers.h b/V8Binding/binding/v8_helpers.h index b7f15aa..b7f15aa 100644 --- a/V8Binding/bindings/v8_helpers.h +++ b/V8Binding/binding/v8_helpers.h diff --git a/V8Binding/bindings/v8_index.cpp b/V8Binding/binding/v8_index.cpp index df138dc..df138dc 100644 --- a/V8Binding/bindings/v8_index.cpp +++ b/V8Binding/binding/v8_index.cpp diff --git a/V8Binding/bindings/v8_index.h b/V8Binding/binding/v8_index.h index 71453c3..71453c3 100644 --- a/V8Binding/bindings/v8_index.h +++ b/V8Binding/binding/v8_index.h diff --git a/V8Binding/bindings/v8_npobject.h b/V8Binding/binding/v8_npobject.h index c2d8550..c2d8550 100644 --- a/V8Binding/bindings/v8_npobject.h +++ b/V8Binding/binding/v8_npobject.h diff --git a/V8Binding/bindings/v8_proxy.cpp b/V8Binding/binding/v8_proxy.cpp index 45b56d7..45b56d7 100644 --- a/V8Binding/bindings/v8_proxy.cpp +++ b/V8Binding/binding/v8_proxy.cpp diff --git a/V8Binding/bindings/v8_proxy.h b/V8Binding/binding/v8_proxy.h index 17a2d1b..17a2d1b 100644 --- a/V8Binding/bindings/v8_proxy.h +++ b/V8Binding/binding/v8_proxy.h |