[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

eric at webkit.org eric at webkit.org
Thu Apr 8 00:30:14 UTC 2010


The following commit has been merged in the webkit-1.2 branch:
commit b069887456591dc9cd369e9da295381b6b8bf279
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Dec 9 22:47:04 2009 +0000

    2009-12-09  Steve Block  <steveblock at google.com>
    
            Reviewed by Adam Barth.
    
            Adds Android Makefiles for building with V8.
            https://bugs.webkit.org/show_bug.cgi?id=32278
    
            * Android.mk: Modified. Includes Makefiles for V8.
    2009-12-09  Steve Block  <steveblock at google.com>
    
            Reviewed by Adam Barth.
    
            Updates Android Makefiles with latest additions.
            https://bugs.webkit.org/show_bug.cgi?id=32278
    
            * Android.mk: Modified.
            * Android.v8.wtf.mk: Modified.
    2009-12-09  Steve Block  <steveblock at google.com>
    
            Reviewed by Adam Barth.
    
            Adds Android Makefiles for building with V8.
            Also updates existing Android Makefiles with latest additions.
            https://bugs.webkit.org/show_bug.cgi?id=32278
    
            Build fix only, no new tests.
    
            * Android.derived.jscbindings.mk: Modified.
            * Android.derived.mk: Modified.
            * Android.derived.v8bindings.mk: Added.
            * Android.jscbindings.mk: Modified.
            * Android.mk: Modified.
            * Android.v8bindings.mk: Added.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51926 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Android.mk b/Android.mk
index a1f7db9..211ca61 100644
--- a/Android.mk
+++ b/Android.mk
@@ -63,15 +63,6 @@ WEBKIT_SRC_FILES :=
 include $(BASE_PATH)/bison_check.mk
 
 ifeq ($(JAVASCRIPT_ENGINE),v8)
-d := V8Binding
-LOCAL_PATH := $(BASE_PATH)/$d
-WEBCORE_PATH := $(BASE_PATH)/WebCore
-intermediates := $(base_intermediates)/WebCore
-JAVASCRIPTCORE_PATH := $(BASE_PATH)/JavaScriptCore
-include $(LOCAL_PATH)/V8Binding.derived.mk
-WEBKIT_SRC_FILES += $(addprefix $d/, $(LOCAL_SRC_FILES))
-WEBKIT_SRC_FILES += $(addprefix WebCore/, $(WEBCORE_SRC_FILES))
-
 # Include WTF source file.
 d := JavaScriptCore
 LOCAL_PATH := $(BASE_PATH)/$d
@@ -83,12 +74,17 @@ endif  # JAVASCRIPT_ENGINE == v8
 # Include source files for WebCore
 d := WebCore
 LOCAL_PATH := $(BASE_PATH)/$d
+JAVASCRIPTCORE_PATH := $(BASE_PATH)/JavaScriptCore
 intermediates := $(base_intermediates)/$d
 include $(LOCAL_PATH)/Android.mk
 ifeq ($(JAVASCRIPT_ENGINE),jsc)
 include $(LOCAL_PATH)/Android.jscbindings.mk
 endif
+ifeq ($(JAVASCRIPT_ENGINE),v8)
+include $(LOCAL_PATH)/Android.v8bindings.mk
+endif
 WEBKIT_SRC_FILES += $(addprefix $d/,$(LOCAL_SRC_FILES))
+LOCAL_C_INCLUDES := $(BINDING_C_INCLUDES)
 
 # Include the derived source files for WebCore. Uses the same path as
 # WebCore
@@ -96,7 +92,9 @@ include $(LOCAL_PATH)/Android.derived.mk
 ifeq ($(JAVASCRIPT_ENGINE),jsc)
 include $(LOCAL_PATH)/Android.derived.jscbindings.mk
 endif
-WEBKIT_SRC_FILES += $(addprefix $d/,$(LOCAL_SRC_FILES))
+ifeq ($(JAVASCRIPT_ENGINE),v8)
+include $(LOCAL_PATH)/Android.derived.v8bindings.mk
+endif
 
 # Redefine LOCAL_PATH here so the build system is not confused
 LOCAL_PATH := $(BASE_PATH)
@@ -132,7 +130,10 @@ LOCAL_LDLIBS += -lpthread -ldl
 # any files that include <unicode/ucnv.h> will include our ucnv.h first. We
 # also add external/ as an include directory so that we can specify the real
 # icu header directory as a more exact reference to avoid including our ucnv.h.
-LOCAL_C_INCLUDES := \
+#
+# Note that JavasCriptCore/ must be included after WebCore/, so that we pick up
+# the right config.h.
+LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \
 	$(JNI_H_INCLUDE) \
 	$(LOCAL_PATH)/WebKit/android/icu \
 	external/ \
@@ -148,10 +149,6 @@ LOCAL_C_INCLUDES := \
 	external/skia/src/ports \
 	external/sqlite/dist \
 	frameworks/base/core/jni/android/graphics
-ifeq ($(JAVASCRIPT_ENGINE),v8)
-LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \
-	external/v8/include
-endif
 
 LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \
 	$(LOCAL_PATH)/WebCore \
@@ -160,6 +157,7 @@ LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \
 	$(LOCAL_PATH)/WebCore/dom \
 	$(LOCAL_PATH)/WebCore/editing \
 	$(LOCAL_PATH)/WebCore/history \
+	$(LOCAL_PATH)/WebCore/history/android \
 	$(LOCAL_PATH)/WebCore/html \
 	$(LOCAL_PATH)/WebCore/html/canvas \
 	$(LOCAL_PATH)/WebCore/inspector \
@@ -191,13 +189,6 @@ LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \
 	$(LOCAL_PATH)/WebCore/storage \
 	$(LOCAL_PATH)/WebCore/workers \
 	$(LOCAL_PATH)/WebCore/xml
-ifeq ($(JAVASCRIPT_ENGINE),jsc)
-LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \
-	$(LOCAL_PATH)/WebCore/bindings/js \
-	$(LOCAL_PATH)/WebCore/bridge \
-	$(LOCAL_PATH)/WebCore/bridge/c \
-	$(LOCAL_PATH)/WebCore/bridge/jni
-endif
 
 LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \
 	$(LOCAL_PATH)/WebKit/android \
@@ -208,55 +199,16 @@ LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \
 	$(LOCAL_PATH)/WebKit/android/stl
 
 LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \
+	$(LOCAL_PATH)/JavaScriptCore \
 	$(LOCAL_PATH)/JavaScriptCore/wtf \
 	$(LOCAL_PATH)/JavaScriptCore/wtf/unicode \
 	$(LOCAL_PATH)/JavaScriptCore/wtf/unicode/icu
-ifeq ($(JAVASCRIPT_ENGINE),jsc)
-LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \
-	$(LOCAL_PATH)/JavaScriptCore \
-	$(LOCAL_PATH)/JavaScriptCore/API \
-	$(LOCAL_PATH)/JavaScriptCore/assembler \
-	$(LOCAL_PATH)/JavaScriptCore/bytecode \
-	$(LOCAL_PATH)/JavaScriptCore/bytecompiler \
-	$(LOCAL_PATH)/JavaScriptCore/debugger \
-	$(LOCAL_PATH)/JavaScriptCore/parser \
-	$(LOCAL_PATH)/JavaScriptCore/jit \
-	$(LOCAL_PATH)/JavaScriptCore/interpreter \
-	$(LOCAL_PATH)/JavaScriptCore/pcre \
-	$(LOCAL_PATH)/JavaScriptCore/profiler \
-	$(LOCAL_PATH)/JavaScriptCore/runtime \
-	$(LOCAL_PATH)/JavaScriptCore/wrec \
-	$(LOCAL_PATH)/JavaScriptCore/ForwardingHeaders
-endif
 
 LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \
 	$(base_intermediates)/WebCore/ \
 	$(base_intermediates)/WebCore/css \
 	$(base_intermediates)/WebCore/html \
 	$(base_intermediates)/WebCore/platform
-ifeq ($(JAVASCRIPT_ENGINE),jsc)
-LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \
-	$(base_intermediates)/WebCore/bindings/js \
-	$(base_intermediates)/WebCore/dom \
-	$(base_intermediates)/WebCore/html/canvas \
-	$(base_intermediates)/WebCore/inspector \
-	$(base_intermediates)/WebCore/loader/appcache \
-	$(base_intermediates)/WebCore/page \
-	$(base_intermediates)/WebCore/plugins \
-	$(base_intermediates)/WebCore/storage \
-	$(base_intermediates)/WebCore/workers \
-	$(base_intermediates)/WebCore/xml
-endif
-ifeq ($(JAVASCRIPT_ENGINE),v8)
-LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \
-	$(base_intermediates)/WebCore/bindings \
-	$(base_intermediates)/JavaScriptCore
-endif
-
-ifeq ($(JAVASCRIPT_ENGINE),v8)
-LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \
-	$(BINDING_C_INCLUDES)
-endif
 
 ifeq ($(ENABLE_SVG), true)
 LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \
diff --git a/ChangeLog b/ChangeLog
index c252e35..38999c8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2009-12-09  Steve Block  <steveblock at google.com>
+
+        Reviewed by Adam Barth.
+
+        Adds Android Makefiles for building with V8.
+        https://bugs.webkit.org/show_bug.cgi?id=32278
+
+        * Android.mk: Modified. Includes Makefiles for V8.
+
 2009-12-08  Steve Block  <steveblock at google.com>
 
         Reviewed by Adam Barth.
diff --git a/JavaScriptCore/Android.mk b/JavaScriptCore/Android.mk
index d2b3c99..425d69c 100644
--- a/JavaScriptCore/Android.mk
+++ b/JavaScriptCore/Android.mk
@@ -167,6 +167,8 @@ LOCAL_SRC_FILES := \
 	wtf/TypeTraits.cpp \
 	wtf/dtoa.cpp \
 	\
+	wtf/android/MainThreadAndroid.cpp \
+	\
 	wtf/unicode/CollatorDefault.cpp \
 	wtf/unicode/UTF8.cpp \
 	\
diff --git a/JavaScriptCore/Android.v8.wtf.mk b/JavaScriptCore/Android.v8.wtf.mk
index 0c9780e..53a50d9 100644
--- a/JavaScriptCore/Android.v8.wtf.mk
+++ b/JavaScriptCore/Android.v8.wtf.mk
@@ -45,6 +45,8 @@ LOCAL_SRC_FILES := \
 	wtf/Threading.cpp \
 	wtf/ThreadingPthreads.cpp \
 	\
+	wtf/android/MainThreadAndroid.cpp \
+	\
 	wtf/TypeTraits.cpp \
 	wtf/dtoa.cpp \
 	\
diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index d23dbfd..352ce76 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,13 @@
+2009-12-09  Steve Block  <steveblock at google.com>
+
+        Reviewed by Adam Barth.
+
+        Updates Android Makefiles with latest additions.
+        https://bugs.webkit.org/show_bug.cgi?id=32278
+
+        * Android.mk: Modified.
+        * Android.v8.wtf.mk: Modified.
+
 2009-12-09  Sam Weinig  <sam at webkit.org>
 
         Reviewed by Gavin Barraclough.
diff --git a/WebCore/Android.derived.jscbindings.mk b/WebCore/Android.derived.jscbindings.mk
index 62717b2..c74713a 100644
--- a/WebCore/Android.derived.jscbindings.mk
+++ b/WebCore/Android.derived.jscbindings.mk
@@ -49,8 +49,9 @@ js_binding_scripts := $(addprefix $(LOCAL_PATH)/,\
 			bindings/scripts/generate-bindings.pl \
 		)
 
-FEATURE_DEFINES := ENABLE_DATABASE=1 ENABLE_OFFLINE_WEB_APPLICATIONS=1 ENABLE_DOM_STORAGE=1 ENABLE_VIDEO=1 ENABLE_WORKERS=1 ENABLE_GEOLOCATION=1 ENABLE_CHANNEL_MESSAGING=1
+FEATURE_DEFINES := ANDROID_ORIENTATION_SUPPORT ENABLE_TOUCH_EVENTS=1 ENABLE_DATABASE=1 ENABLE_OFFLINE_WEB_APPLICATIONS=1 ENABLE_DOM_STORAGE=1 ENABLE_VIDEO=1 ENABLE_WORKERS=1 ENABLE_GEOLOCATION=1 ENABLE_CHANNEL_MESSAGING=1
 
+# CSS
 GEN := \
     $(intermediates)/css/JSCSSCharsetRule.h \
     $(intermediates)/css/JSCSSFontFaceRule.h \
@@ -90,13 +91,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) $(GEN:%.h=%.cpp)
 # above rules.  Specifying this explicitly makes -j2 work.
 $(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/css/%.cpp : $(intermediates)/css/%.h
 
-# MANUAL MERGE : I took this out because compiling the result shows:
-# out/.../JSEventTarget.cpp: In function 'JSC::JSValue* WebCore::jsEventTargetPrototypeFunctionAddEventListener(JSC::ExecState*, JSC::JSObject*, JSC::JSValue*, const JSC::ArgList&)':
-# out/.../JSEventTarget.cpp:90: error: 'toEventListener' was not declared in this scope
-# but I can't find toEventListener anywhere, nor can I figure out how toEventListener
-# is generated
-#    $(intermediates)/dom/JSEventTarget.h \
-
+# DOM
 GEN := \
     $(intermediates)/dom/JSAttr.h \
     $(intermediates)/dom/JSBeforeLoadEvent.h \
@@ -152,7 +147,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) $(GEN:%.h=%.cpp)
 # above rules.  Specifying this explicitly makes -j2 work.
 $(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/dom/%.cpp : $(intermediates)/dom/%.h
 
-
+# HTML
 GEN := \
     $(intermediates)/html/JSDataGridColumn.h \
     $(intermediates)/html/JSDataGridColumnList.h \
@@ -245,6 +240,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) $(GEN:%.h=%.cpp)
 # above rules.  Specifying this explicitly makes -j2 work.
 $(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/html/%.cpp : $(intermediates)/html/%.h
 
+# Canvas
 GEN := \
     $(intermediates)/html/canvas/JSCanvasGradient.h \
     $(intermediates)/html/canvas/JSCanvasNumberArray.h \
@@ -262,6 +258,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) $(GEN:%.h=%.cpp)
 # above rules.  Specifying this explicitly makes -j2 work.
 $(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/html/canvas/%.cpp : $(intermediates)/html/canvas/%.h
 
+# Appcache
 GEN := \
     $(intermediates)/loader/appcache/JSDOMApplicationCache.h
 
@@ -275,11 +272,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) $(GEN:%.h=%.cpp)
 # above rules.  Specifying this explicitly makes -j2 work.
 $(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/loader/appcache/%.cpp : $(intermediates)/loader/appcache/%.h
 
-# MANUAL MERGE : I took this out because compiling the result shows:
-# out/.../JSAbstractView.cpp:27:26: error: AbstractView.h: No such file or directory
-# I can't find AbstractView.h anywhere
-#    $(intermediates)/page/JSAbstractView.h \
-
+# page
 GEN := \
     $(intermediates)/page/JSBarInfo.h \
     $(intermediates)/page/JSConsole.h \
@@ -322,7 +315,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) $(GEN:%.h=%.cpp)
 # above rules.  Specifying this explicitly makes -j2 work.
 $(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/plugins/%.cpp : $(intermediates)/plugins/%.h
 
-# New section for Database storage API
+# Database
 GEN := \
     $(intermediates)/storage/JSDatabase.h \
     $(intermediates)/storage/JSSQLError.h \
@@ -340,7 +333,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) $(GEN:%.h=%.cpp)
 # above rules.  Specifying this explicitly makes -j2 work.
 $(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/storage/%.cpp : $(intermediates)/storage/%.h
 
-# new section for DOM Storage APIs
+# DOM Storage
 GEN := \
     $(intermediates)/storage/JSStorage.h \
     $(intermediates)/storage/JSStorageEvent.h
@@ -355,7 +348,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) $(GEN:%.h=%.cpp)
 # above rules.  Specifying this explicitly makes -j2 work.
 $(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/storage/%.cpp : $(intermediates)/storage/%.h
 
-#new section for svg
+# SVG
 ifeq ($(ENABLE_SVG), true)
 GEN := \
     $(intermediates)/svg/JSSVGAElement.h \
@@ -501,7 +494,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) $(GEN:%.h=%.cpp)
 $(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/svg/%.cpp : $(intermediates)/svg/%.h
 endif
 
-# new section for Workers
+# Workers
 GEN := \
     $(intermediates)/workers/JSAbstractWorker.h \
     $(intermediates)/workers/JSDedicatedWorkerContext.h \
@@ -521,7 +514,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) $(GEN:%.h=%.cpp)
 # above rules.  Specifying this explicitly makes -j2 work.
 $(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/workers/%.cpp : $(intermediates)/workers/%.h
 
-#new section for xml/DOMParser.idl
+# XML
 GEN := \
     $(intermediates)/xml/JSDOMParser.h \
     $(intermediates)/xml/JSXMLHttpRequest.h \
@@ -545,10 +538,8 @@ $(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/xml/%.cpp : $(intermediates)/xml/
 
 GEN:= $(intermediates)/HTMLNames.cpp $(intermediates)/HTMLElementFactory.cpp  $(intermediates)/JSHTMLElementWrapperFactory.cpp
 $(GEN): PRIVATE_PATH := $(LOCAL_PATH)
-$(GEN): PRIVATE_CUSTOM_TOOL = perl -I $(PRIVATE_PATH)/bindings/scripts $< --tags $(html_tags) --attrs $(html_attrs)  --extraDefines "$(FEATURE_DEFINES)" --factory --wrapperFactory --output $(dir $@)
-$(GEN): html_tags := $(LOCAL_PATH)/html/HTMLTagNames.in
-$(GEN): html_attrs := $(LOCAL_PATH)/html/HTMLAttributeNames.in
-$(GEN): $(LOCAL_PATH)/dom/make_names.pl $(html_tags) $(html_attrs)
+$(GEN): PRIVATE_CUSTOM_TOOL = perl -I $(PRIVATE_PATH)/bindings/scripts $< --tags $(PRIVATE_PATH)/html/HTMLTagNames.in --attrs $(PRIVATE_PATH)/html/HTMLAttributeNames.in --extraDefines "$(FEATURE_DEFINES)" --factory --wrapperFactory --output $(dir $@)
+$(GEN): $(LOCAL_PATH)/dom/make_names.pl $(LOCAL_PATH)/html/HTMLTagNames.in $(LOCAL_PATH)/html/HTMLAttributeNames.in
 	$(transform-generated-source)
 LOCAL_GENERATED_SOURCES += $(GEN)
 
@@ -558,10 +549,8 @@ ifeq ($(ENABLE_SVG), true)
 GEN:= $(intermediates)/SVGNames.cpp  $(intermediates)/SVGElementFactory.cpp $(intermediates)/JSSVGElementWrapperFactory.cpp
 SVG_FLAGS:=ENABLE_SVG_AS_IMAGE=1 ENABLE_SVG_FILTERS=1 ENABLE_SVG_FONTS=1 ENABLE_SVG_FOREIGN_OBJECT=1 ENABLE_SVG_USE=1
 $(GEN): PRIVATE_PATH := $(LOCAL_PATH)
-$(GEN): PRIVATE_CUSTOM_TOOL = perl -I $(PRIVATE_PATH)/bindings/scripts $< --tags $(svg_tags) --attrs $(svg_attrs) --extraDefines "$(SVG_FLAGS)" --factory --wrapperFactory --output $(dir $@)
-$(GEN): svg_tags := $(LOCAL_PATH)/svg/svgtags.in
-$(GEN): svg_attrs := $(LOCAL_PATH)/svg/svgattrs.in
-$(GEN): $(LOCAL_PATH)/dom/make_names.pl $(svg_tags) $(svg_attrs)
+$(GEN): PRIVATE_CUSTOM_TOOL = perl -I $(PRIVATE_PATH)/bindings/scripts $< --tags $(PRIVATE_PATH)/svg/svgtags.in --attrs $(PRIVATE_PATH)/svg/svgattrs.in --extraDefines "$(SVG_FLAGS)" --factory --wrapperFactory --output $(dir $@)
+$(GEN): $(LOCAL_PATH)/dom/make_names.pl $(LOCAL_PATH)/svg/svgtags.in $(LOCAL_PATH)/svg/svgattrs.in
 	$(transform-generated-source)
 LOCAL_GENERATED_SOURCES += $(GEN)
 endif
diff --git a/WebCore/Android.derived.mk b/WebCore/Android.derived.mk
index e559064..c0afe81 100644
--- a/WebCore/Android.derived.mk
+++ b/WebCore/Android.derived.mk
@@ -23,7 +23,6 @@
 ## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ##
 
-LOCAL_SRC_FILES :=
 # CSS property names and value keywords
 
 GEN := $(intermediates)/css/CSSPropertyNames.h
@@ -101,16 +100,6 @@ $(GEN): $(LOCAL_BISON)
 
 LOCAL_GENERATED_SOURCES += $(GEN)
 
-# XPath grammar
-
-GEN := $(intermediates)/XPathGrammar.cpp
-$(GEN) : PRIVATE_YACCFLAGS := -p xpathyy
-$(GEN): $(LOCAL_PATH)/xml/XPathGrammar.y
-	$(call local-transform-y-to-cpp,.cpp)
-$(GEN): $(LOCAL_BISON)
-
-LOCAL_GENERATED_SOURCES += $(GEN)
-	                         
 # user agent style sheets
 
 style_sheets := $(LOCAL_PATH)/css/html.css $(LOCAL_PATH)/css/quirks.css $(LOCAL_PATH)/css/view-source.css $(LOCAL_PATH)/css/mediaControls.css
diff --git a/WebCore/Android.derived.v8bindings.mk b/WebCore/Android.derived.v8bindings.mk
new file mode 100644
index 0000000..7b687e8
--- /dev/null
+++ b/WebCore/Android.derived.v8bindings.mk
@@ -0,0 +1,547 @@
+##
+## Copyright 2009, The Android Open Source Project
+##
+## Redistribution and use in source and binary forms, with or without
+## modification, are permitted provided that the following conditions
+## are met:
+##  * Redistributions of source code must retain the above copyright
+##    notice, this list of conditions and the following disclaimer.
+##  * Redistributions in binary form must reproduce the above copyright
+##    notice, this list of conditions and the following disclaimer in the
+##    documentation and/or other materials provided with the distribution.
+##
+## THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY
+## EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+## IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+## PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+## CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+## EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+## PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+## PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+## OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+##
+
+js_binding_scripts := \
+	$(LOCAL_PATH)/bindings/scripts/CodeGenerator.pm \
+	$(LOCAL_PATH)/bindings/scripts/CodeGeneratorV8.pm \
+	$(LOCAL_PATH)/bindings/scripts/IDLParser.pm \
+	$(LOCAL_PATH)/bindings/scripts/IDLStructure.pm \
+	$(LOCAL_PATH)/bindings/scripts/generate-bindings.pl
+
+FEATURE_DEFINES := ANDROID_ORIENTATION_SUPPORT ENABLE_TOUCH_EVENTS=1 V8_BINDING ENABLE_DATABASE=1 ENABLE_OFFLINE_WEB_APPLICATIONS=1 ENABLE_DOM_STORAGE=1 ENABLE_VIDEO=1 ENABLE_WORKERS=1 ENABLE_GEOLOCATION=1
+
+# CSS
+GEN := \
+    $(intermediates)/bindings/V8CSSCharsetRule.h \
+    $(intermediates)/bindings/V8CSSFontFaceRule.h \
+    $(intermediates)/bindings/V8CSSImportRule.h \
+    $(intermediates)/bindings/V8CSSMediaRule.h \
+    $(intermediates)/bindings/V8CSSPageRule.h \
+    $(intermediates)/bindings/V8CSSPrimitiveValue.h \
+    $(intermediates)/bindings/V8CSSRule.h \
+    $(intermediates)/bindings/V8CSSRuleList.h \
+    $(intermediates)/bindings/V8CSSStyleDeclaration.h \
+    $(intermediates)/bindings/V8CSSStyleRule.h \
+    $(intermediates)/bindings/V8CSSStyleSheet.h \
+    $(intermediates)/bindings/V8CSSUnknownRule.h \
+    $(intermediates)/bindings/V8CSSValue.h \
+    $(intermediates)/bindings/V8CSSValueList.h \
+    $(intermediates)/bindings/V8CSSVariablesDeclaration.h \
+    $(intermediates)/bindings/V8CSSVariablesRule.h \
+    $(intermediates)/bindings/V8Counter.h \
+    $(intermediates)/bindings/V8Media.h \
+    $(intermediates)/bindings/V8MediaList.h \
+    $(intermediates)/bindings/V8Rect.h \
+    $(intermediates)/bindings/V8RGBColor.h \
+    $(intermediates)/bindings/V8StyleSheet.h \
+    $(intermediates)/bindings/V8StyleSheetList.h  \
+    $(intermediates)/bindings/V8WebKitCSSKeyframeRule.h \
+    $(intermediates)/bindings/V8WebKitCSSKeyframesRule.h \
+    $(intermediates)/bindings/V8WebKitCSSMatrix.h \
+    $(intermediates)/bindings/V8WebKitCSSTransformValue.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 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)
+
+
+# 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)/bindings/%.cpp : $(intermediates)/bindings/%.h
+
+# DOM
+GEN := \
+    $(intermediates)/bindings/V8Attr.h \
+    $(intermediates)/bindings/V8BeforeLoadEvent.h \
+    $(intermediates)/bindings/V8CDATASection.h \
+    $(intermediates)/bindings/V8CharacterData.h \
+    $(intermediates)/bindings/V8ClientRect.h \
+    $(intermediates)/bindings/V8ClientRectList.h \
+    $(intermediates)/bindings/V8Clipboard.h \
+    $(intermediates)/bindings/V8Comment.h \
+    $(intermediates)/bindings/V8DOMCoreException.h \
+    $(intermediates)/bindings/V8DOMImplementation.h \
+    $(intermediates)/bindings/V8Document.h \
+    $(intermediates)/bindings/V8DocumentFragment.h \
+    $(intermediates)/bindings/V8DocumentType.h \
+    $(intermediates)/bindings/V8Element.h \
+    $(intermediates)/bindings/V8Entity.h \
+    $(intermediates)/bindings/V8EntityReference.h \
+    $(intermediates)/bindings/V8ErrorEvent.h \
+    $(intermediates)/bindings/V8Event.h \
+    $(intermediates)/bindings/V8EventException.h \
+    $(intermediates)/bindings/V8KeyboardEvent.h \
+    $(intermediates)/bindings/V8MessageChannel.h \
+    $(intermediates)/bindings/V8MessageEvent.h \
+    $(intermediates)/bindings/V8MessagePort.h \
+    $(intermediates)/bindings/V8MouseEvent.h \
+    $(intermediates)/bindings/V8MutationEvent.h \
+    $(intermediates)/bindings/V8NamedNodeMap.h \
+    $(intermediates)/bindings/V8Node.h \
+    $(intermediates)/bindings/V8NodeFilter.h \
+    $(intermediates)/bindings/V8NodeIterator.h \
+    $(intermediates)/bindings/V8NodeList.h \
+    $(intermediates)/bindings/V8Notation.h \
+    $(intermediates)/bindings/V8OverflowEvent.h \
+    $(intermediates)/bindings/V8PageTransitionEvent.h \
+    $(intermediates)/bindings/V8ProcessingInstruction.h \
+    $(intermediates)/bindings/V8ProgressEvent.h \
+    $(intermediates)/bindings/V8Range.h \
+    $(intermediates)/bindings/V8RangeException.h \
+    $(intermediates)/bindings/V8Text.h \
+    $(intermediates)/bindings/V8TextEvent.h \
+    $(intermediates)/bindings/V8TreeWalker.h \
+    $(intermediates)/bindings/V8UIEvent.h \
+    $(intermediates)/bindings/V8WebKitAnimationEvent.h \
+    $(intermediates)/bindings/V8WebKitTransitionEvent.h \
+    $(intermediates)/bindings/V8WheelEvent.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)/dom/%.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)/bindings/%.cpp : $(intermediates)/bindings/%.h
+
+# HTML
+GEN := \
+    $(intermediates)/bindings/V8DataGridColumn.h \
+    $(intermediates)/bindings/V8DataGridColumnList.h \
+    $(intermediates)/bindings/V8File.h \
+    $(intermediates)/bindings/V8FileList.h \
+    $(intermediates)/bindings/V8HTMLAllCollection.h \
+    $(intermediates)/bindings/V8HTMLAnchorElement.h \
+    $(intermediates)/bindings/V8HTMLAppletElement.h \
+    $(intermediates)/bindings/V8HTMLAreaElement.h \
+    $(intermediates)/bindings/V8HTMLAudioElement.h \
+    $(intermediates)/bindings/V8HTMLBRElement.h \
+    $(intermediates)/bindings/V8HTMLBaseElement.h \
+    $(intermediates)/bindings/V8HTMLBaseFontElement.h \
+    $(intermediates)/bindings/V8HTMLBlockquoteElement.h \
+    $(intermediates)/bindings/V8HTMLBodyElement.h \
+    $(intermediates)/bindings/V8HTMLButtonElement.h \
+    $(intermediates)/bindings/V8HTMLCanvasElement.h \
+    $(intermediates)/bindings/V8HTMLCollection.h \
+    $(intermediates)/bindings/V8HTMLDataGridCellElement.h \
+    $(intermediates)/bindings/V8HTMLDataGridColElement.h \
+    $(intermediates)/bindings/V8HTMLDataGridElement.h \
+    $(intermediates)/bindings/V8HTMLDataGridRowElement.h \
+    $(intermediates)/bindings/V8HTMLDataListElement.h \
+    $(intermediates)/bindings/V8HTMLDListElement.h \
+    $(intermediates)/bindings/V8HTMLDirectoryElement.h \
+    $(intermediates)/bindings/V8HTMLDivElement.h \
+    $(intermediates)/bindings/V8HTMLDocument.h \
+    $(intermediates)/bindings/V8HTMLElement.h \
+    $(intermediates)/bindings/V8HTMLEmbedElement.h \
+    $(intermediates)/bindings/V8HTMLFieldSetElement.h \
+    $(intermediates)/bindings/V8HTMLFontElement.h \
+    $(intermediates)/bindings/V8HTMLFormElement.h \
+    $(intermediates)/bindings/V8HTMLFrameElement.h \
+    $(intermediates)/bindings/V8HTMLFrameSetElement.h \
+    $(intermediates)/bindings/V8HTMLHRElement.h \
+    $(intermediates)/bindings/V8HTMLHeadElement.h \
+    $(intermediates)/bindings/V8HTMLHeadingElement.h \
+    $(intermediates)/bindings/V8HTMLHtmlElement.h \
+    $(intermediates)/bindings/V8HTMLIFrameElement.h \
+    $(intermediates)/bindings/V8HTMLImageElement.h \
+    $(intermediates)/bindings/V8HTMLInputElement.h \
+    $(intermediates)/bindings/V8HTMLIsIndexElement.h \
+    $(intermediates)/bindings/V8HTMLLIElement.h \
+    $(intermediates)/bindings/V8HTMLLabelElement.h \
+    $(intermediates)/bindings/V8HTMLLegendElement.h \
+    $(intermediates)/bindings/V8HTMLLinkElement.h \
+    $(intermediates)/bindings/V8HTMLMapElement.h \
+    $(intermediates)/bindings/V8HTMLMarqueeElement.h \
+    $(intermediates)/bindings/V8HTMLMediaElement.h \
+    $(intermediates)/bindings/V8HTMLMenuElement.h \
+    $(intermediates)/bindings/V8HTMLMetaElement.h \
+    $(intermediates)/bindings/V8HTMLModElement.h \
+    $(intermediates)/bindings/V8HTMLOListElement.h \
+    $(intermediates)/bindings/V8HTMLObjectElement.h \
+    $(intermediates)/bindings/V8HTMLOptGroupElement.h \
+    $(intermediates)/bindings/V8HTMLOptionElement.h \
+    $(intermediates)/bindings/V8HTMLOptionsCollection.h \
+    $(intermediates)/bindings/V8HTMLParagraphElement.h \
+    $(intermediates)/bindings/V8HTMLParamElement.h \
+    $(intermediates)/bindings/V8HTMLPreElement.h \
+    $(intermediates)/bindings/V8HTMLQuoteElement.h \
+    $(intermediates)/bindings/V8HTMLScriptElement.h \
+    $(intermediates)/bindings/V8HTMLSelectElement.h \
+    $(intermediates)/bindings/V8HTMLSourceElement.h \
+    $(intermediates)/bindings/V8HTMLStyleElement.h \
+    $(intermediates)/bindings/V8HTMLTableCaptionElement.h \
+    $(intermediates)/bindings/V8HTMLTableCellElement.h \
+    $(intermediates)/bindings/V8HTMLTableColElement.h \
+    $(intermediates)/bindings/V8HTMLTableElement.h \
+    $(intermediates)/bindings/V8HTMLTableRowElement.h \
+    $(intermediates)/bindings/V8HTMLTableSectionElement.h \
+    $(intermediates)/bindings/V8HTMLTextAreaElement.h \
+    $(intermediates)/bindings/V8HTMLTitleElement.h \
+    $(intermediates)/bindings/V8HTMLUListElement.h \
+    $(intermediates)/bindings/V8HTMLVideoElement.h \
+    $(intermediates)/bindings/V8ImageData.h \
+    $(intermediates)/bindings/V8MediaError.h \
+    $(intermediates)/bindings/V8TextMetrics.h \
+    $(intermediates)/bindings/V8TimeRanges.h \
+    $(intermediates)/bindings/V8ValidityState.h \
+    $(intermediates)/bindings/V8VoidCallback.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)/html/%.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)/bindings/%.cpp : $(intermediates)/bindings/%.h
+
+# Canvas
+GEN := \
+    $(intermediates)/bindings/V8CanvasGradient.h \
+    $(intermediates)/bindings/V8CanvasNumberArray.h \
+    $(intermediates)/bindings/V8CanvasPattern.h \
+    $(intermediates)/bindings/V8CanvasRenderingContext.h \
+    $(intermediates)/bindings/V8CanvasRenderingContext2D.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 --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)
+
+# 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)/bindings/%.cpp : $(intermediates)/bindings/%.h
+
+# Appcache
+GEN := \
+    $(intermediates)/bindings/V8DOMApplicationCache.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)/loader/appcache/%.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)/bindings/%.cpp : $(intermediates)/bindings/%.h
+
+# page
+GEN := \
+    $(intermediates)/bindings/V8BarInfo.h \
+    $(intermediates)/bindings/V8Console.h \
+    $(intermediates)/bindings/V8Coordinates.h \
+    $(intermediates)/bindings/V8DOMSelection.h \
+    $(intermediates)/bindings/V8DOMWindow.h \
+    $(intermediates)/bindings/V8Geolocation.h \
+    $(intermediates)/bindings/V8Geoposition.h \
+    $(intermediates)/bindings/V8History.h \
+    $(intermediates)/bindings/V8Location.h \
+    $(intermediates)/bindings/V8Navigator.h \
+    $(intermediates)/bindings/V8PositionError.h \
+    $(intermediates)/bindings/V8Screen.h \
+    $(intermediates)/bindings/V8WebKitPoint.h \
+    $(intermediates)/bindings/V8WorkerNavigator.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)/page/%.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)/bindings/%.cpp : $(intermediates)/bindings/%.h
+
+GEN := \
+    $(intermediates)/bindings/V8MimeType.h \
+    $(intermediates)/bindings/V8MimeTypeArray.h \
+    $(intermediates)/bindings/V8Plugin.h \
+    $(intermediates)/bindings/V8PluginArray.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)/plugins/%.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)/bindings/%.cpp : $(intermediates)/bindings/%.h
+
+# Database
+GEN := \
+    $(intermediates)/bindings/V8Database.h \
+    $(intermediates)/bindings/V8SQLError.h \
+    $(intermediates)/bindings/V8SQLResultSet.h \
+    $(intermediates)/bindings/V8SQLResultSetRowList.h \
+    $(intermediates)/bindings/V8SQLTransaction.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)/storage/%.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)/bindings/%.cpp : $(intermediates)/bindings/%.h
+
+# DOM Storage
+GEN := \
+    $(intermediates)/bindings/V8Storage.h \
+    $(intermediates)/bindings/V8StorageEvent.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)/storage/%.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)/bindings/%.cpp : $(intermediates)/bindings/%.h
+
+# SVG
+ifeq ($(ENABLE_SVG), true)
+GEN := \
+    $(intermediates)/bindings/V8SVGAElement.h \
+    $(intermediates)/bindings/V8SVGAltGlyphElement.h \
+    $(intermediates)/bindings/V8SVGAngle.h \
+    $(intermediates)/bindings/V8SVGCircleElement.h \
+    $(intermediates)/bindings/V8SVGClipPathElement.h \
+    $(intermediates)/bindings/V8SVGColor.h \
+    $(intermediates)/bindings/V8SVGComponentTransferFunctionElement.h \
+    $(intermediates)/bindings/V8SVGCursorElement.h \
+    $(intermediates)/bindings/V8SVGDefsElement.h \
+    $(intermediates)/bindings/V8SVGDescElement.h \
+    $(intermediates)/bindings/V8SVGDocument.h \
+    $(intermediates)/bindings/V8SVGElement.h \
+    $(intermediates)/bindings/V8SVGElementInstance.h \
+    $(intermediates)/bindings/V8SVGElementInstanceList.h \
+    $(intermediates)/bindings/V8SVGEllipseElement.h \
+    $(intermediates)/bindings/V8SVGException.h \
+    $(intermediates)/bindings/V8SVGFEBlendElement.h \
+    $(intermediates)/bindings/V8SVGFEColorMatrixElement.h \
+    $(intermediates)/bindings/V8SVGFEComponentTransferElement.h \
+    $(intermediates)/bindings/V8SVGFECompositeElement.h \
+    $(intermediates)/bindings/V8SVGFEDiffuseLightingElement.h \
+    $(intermediates)/bindings/V8SVGFEDisplacementMapElement.h \
+    $(intermediates)/bindings/V8SVGFEDistantLightElement.h \
+    $(intermediates)/bindings/V8SVGFEFloodElement.h \
+    $(intermediates)/bindings/V8SVGFEFuncAElement.h \
+    $(intermediates)/bindings/V8SVGFEFuncBElement.h \
+    $(intermediates)/bindings/V8SVGFEFuncGElement.h \
+    $(intermediates)/bindings/V8SVGFEFuncRElement.h \
+    $(intermediates)/bindings/V8SVGFEGaussianBlurElement.h \
+    $(intermediates)/bindings/V8SVGFEImageElement.h \
+    $(intermediates)/bindings/V8SVGFEMergeElement.h \
+    $(intermediates)/bindings/V8SVGFEMergeNodeElement.h \
+    $(intermediates)/bindings/V8SVGFEOffsetElement.h \
+    $(intermediates)/bindings/V8SVGFEPointLightElement.h \
+    $(intermediates)/bindings/V8SVGFESpecularLightingElement.h \
+    $(intermediates)/bindings/V8SVGFESpotLightElement.h \
+    $(intermediates)/bindings/V8SVGFETileElement.h \
+    $(intermediates)/bindings/V8SVGFETurbulenceElement.h \
+    $(intermediates)/bindings/V8SVGFilterElement.h \
+    $(intermediates)/bindings/V8SVGFontElement.h \
+    $(intermediates)/bindings/V8SVGFontFaceElement.h \
+    $(intermediates)/bindings/V8SVGFontFaceFormatElement.h \
+    $(intermediates)/bindings/V8SVGFontFaceNameElement.h \
+    $(intermediates)/bindings/V8SVGFontFaceSrcElement.h \
+    $(intermediates)/bindings/V8SVGFontFaceUriElement.h \
+    $(intermediates)/bindings/V8SVGForeignObjectElement.h \
+    $(intermediates)/bindings/V8SVGGElement.h \
+    $(intermediates)/bindings/V8SVGGlyphElement.h \
+    $(intermediates)/bindings/V8SVGGradientElement.h \
+    $(intermediates)/bindings/V8SVGHKernElement.h \
+    $(intermediates)/bindings/V8SVGImageElement.h \
+    $(intermediates)/bindings/V8SVGLength.h \
+    $(intermediates)/bindings/V8SVGLengthList.h \
+    $(intermediates)/bindings/V8SVGLineElement.h \
+    $(intermediates)/bindings/V8SVGLinearGradientElement.h \
+    $(intermediates)/bindings/V8SVGMarkerElement.h \
+    $(intermediates)/bindings/V8SVGMaskElement.h \
+    $(intermediates)/bindings/V8SVGMatrix.h \
+    $(intermediates)/bindings/V8SVGMetadataElement.h \
+    $(intermediates)/bindings/V8SVGMissingGlyphElement.h \
+    $(intermediates)/bindings/V8SVGNumber.h \
+    $(intermediates)/bindings/V8SVGNumberList.h \
+    $(intermediates)/bindings/V8SVGPaint.h \
+    $(intermediates)/bindings/V8SVGPathElement.h \
+    $(intermediates)/bindings/V8SVGPathSeg.h \
+    $(intermediates)/bindings/V8SVGPathSegArcAbs.h \
+    $(intermediates)/bindings/V8SVGPathSegArcRel.h \
+    $(intermediates)/bindings/V8SVGPathSegClosePath.h \
+    $(intermediates)/bindings/V8SVGPathSegCurvetoCubicAbs.h \
+    $(intermediates)/bindings/V8SVGPathSegCurvetoCubicRel.h \
+    $(intermediates)/bindings/V8SVGPathSegCurvetoCubicSmoothAbs.h \
+    $(intermediates)/bindings/V8SVGPathSegCurvetoCubicSmoothRel.h \
+    $(intermediates)/bindings/V8SVGPathSegCurvetoQuadraticAbs.h \
+    $(intermediates)/bindings/V8SVGPathSegCurvetoQuadraticRel.h \
+    $(intermediates)/bindings/V8SVGPathSegCurvetoQuadraticSmoothAbs.h \
+    $(intermediates)/bindings/V8SVGPathSegCurvetoQuadraticSmoothRel.h \
+    $(intermediates)/bindings/V8SVGPathSegLinetoAbs.h \
+    $(intermediates)/bindings/V8SVGPathSegLinetoHorizontalAbs.h \
+    $(intermediates)/bindings/V8SVGPathSegLinetoHorizontalRel.h \
+    $(intermediates)/bindings/V8SVGPathSegLinetoRel.h \
+    $(intermediates)/bindings/V8SVGPathSegLinetoVerticalAbs.h \
+    $(intermediates)/bindings/V8SVGPathSegLinetoVerticalRel.h \
+    $(intermediates)/bindings/V8SVGPathSegList.h \
+    $(intermediates)/bindings/V8SVGPathSegMovetoAbs.h \
+    $(intermediates)/bindings/V8SVGPathSegMovetoRel.h \
+    $(intermediates)/bindings/V8SVGPatternElement.h \
+    $(intermediates)/bindings/V8SVGPoint.h \
+    $(intermediates)/bindings/V8SVGPointList.h \
+    $(intermediates)/bindings/V8SVGPolygonElement.h \
+    $(intermediates)/bindings/V8SVGPolylineElement.h \
+    $(intermediates)/bindings/V8SVGPreserveAspectRatio.h \
+    $(intermediates)/bindings/V8SVGRadialGradientElement.h \
+    $(intermediates)/bindings/V8SVGRect.h \
+    $(intermediates)/bindings/V8SVGRectElement.h \
+    $(intermediates)/bindings/V8SVGRenderingIntent.h \
+    $(intermediates)/bindings/V8SVGSVGElement.h \
+    $(intermediates)/bindings/V8SVGScriptElement.h \
+    $(intermediates)/bindings/V8SVGStopElement.h \
+    $(intermediates)/bindings/V8SVGStringList.h \
+    $(intermediates)/bindings/V8SVGStyleElement.h \
+    $(intermediates)/bindings/V8SVGSwitchElement.h \
+    $(intermediates)/bindings/V8SVGSymbolElement.h \
+    $(intermediates)/bindings/V8SVGTRefElement.h \
+    $(intermediates)/bindings/V8SVGTSpanElement.h \
+    $(intermediates)/bindings/V8SVGTextContentElement.h \
+    $(intermediates)/bindings/V8SVGTextElement.h \
+    $(intermediates)/bindings/V8SVGTextPathElement.h \
+    $(intermediates)/bindings/V8SVGTextPositioningElement.h \
+    $(intermediates)/bindings/V8SVGTitleElement.h \
+    $(intermediates)/bindings/V8SVGTransform.h \
+    $(intermediates)/bindings/V8SVGTransformList.h \
+    $(intermediates)/bindings/V8SVGURIReference.h \
+    $(intermediates)/bindings/V8SVGUnitTypes.h \
+    $(intermediates)/bindings/V8SVGUseElement.h \
+    $(intermediates)/bindings/V8SVGViewElement.h \
+    $(intermediates)/bindings/V8SVGZoomEvent.h \
+    \
+    $(intermediates)/bindings/V8SVGAnimatedAngle.h \
+    $(intermediates)/bindings/V8SVGAnimatedEnumeration.h \
+    $(intermediates)/bindings/V8SVGAnimatedBoolean.h \
+    $(intermediates)/bindings/V8SVGAnimatedInteger.h \
+    $(intermediates)/bindings/V8SVGAnimatedLength.h \
+    $(intermediates)/bindings/V8SVGAnimatedLengthList.h \
+    $(intermediates)/bindings/V8SVGAnimatedNumber.h \
+    $(intermediates)/bindings/V8SVGAnimatedNumberList.h \
+    $(intermediates)/bindings/V8SVGAnimatedPoints.h \
+    $(intermediates)/bindings/V8SVGAnimatedPreserveAspectRatio.h \
+    $(intermediates)/bindings/V8SVGAnimatedRect.h \
+    $(intermediates)/bindings/V8SVGAnimatedString.h \
+    $(intermediates)/bindings/V8SVGAnimatedTransformList.h
+
+ifeq ($(ENABLE_SVG_ANIMATION), true)
+GEN += \
+    $(intermediates)/bindings/V8SVGAnimateColorElement.h \
+    $(intermediates)/bindings/V8SVGAnimateElement.h \
+    $(intermediates)/bindings/V8SVGAnimateTransformElement.h \
+    $(intermediates)/bindings/V8SVGAnimationElement.h \
+    $(intermediates)/bindings/V8SVGSetElement.h
+endif
+
+$(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)
+
+# 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)/bindings/%.cpp : $(intermediates)/bindings/%.h
+endif
+
+# Workers
+GEN := \
+	$(intermediates)/bindings/V8AbstractWorker.h \
+	$(intermediates)/bindings/V8DedicatedWorkerContext.h \
+	$(intermediates)/bindings/V8SharedWorker.h \
+	$(intermediates)/bindings/V8SharedWorkerContext.h \
+	$(intermediates)/bindings/V8Worker.h \
+	$(intermediates)/bindings/V8WorkerContext.h \
+	$(intermediates)/bindings/V8WorkerLocation.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 --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)
+
+# 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)/bindings/%.cpp : $(intermediates)/bindings/%.h
+
+# XML
+GEN := \
+    $(intermediates)/bindings/V8DOMParser.h \
+    $(intermediates)/bindings/V8XMLHttpRequest.h \
+    $(intermediates)/bindings/V8XMLHttpRequestException.h \
+    $(intermediates)/bindings/V8XMLHttpRequestProgressEvent.h \
+    $(intermediates)/bindings/V8XMLHttpRequestUpload.h \
+    $(intermediates)/bindings/V8XMLSerializer.h \
+    $(intermediates)/bindings/V8XPathNSResolver.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)/xml/%.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)/bindings/%.cpp : $(intermediates)/bindings/%.h
+#end
+
+# HTML tag and attribute names
+
+GEN:= $(intermediates)/HTMLNames.cpp $(intermediates)/HTMLElementFactory.cpp
+$(GEN): PRIVATE_PATH := $(LOCAL_PATH)
+$(GEN): PRIVATE_CUSTOM_TOOL = perl -I $(PRIVATE_PATH)/bindings/scripts $< --tags $(PRIVATE_PATH)/html/HTMLTagNames.in --attrs $(PRIVATE_PATH)/html/HTMLAttributeNames.in --factory --wrapperFactory --output $(dir $@)
+$(GEN): $(LOCAL_PATH)/dom/make_names.pl $(LOCAL_PATH)/html/HTMLTagNames.in $(LOCAL_PATH)/html/HTMLAttributeNames.in
+	$(transform-generated-source)
+LOCAL_GENERATED_SOURCES += $(GEN)
+
+# SVG tag and attribute names
+
+ifeq ($(ENABLE_SVG), true)
+GEN:= $(intermediates)/SVGNames.cpp  $(intermediates)/SVGElementFactory.cpp
+SVG_FLAGS:=ENABLE_SVG_AS_IMAGE=1 ENABLE_SVG_FILTERS=1 ENABLE_SVG_FONTS=1 ENABLE_SVG_FOREIGN_OBJECT=1 ENABLE_SVG_USE=1
+$(GEN): PRIVATE_PATH := $(LOCAL_PATH)
+$(GEN): PRIVATE_CUSTOM_TOOL = perl -I $(PRIVATE_PATH)/bindings/scripts $< --tags $(PRIVATE_PATH)/svg/svgtags.in --attrs $(PRIVATE_PATH)/svg/svgattrs.in --extraDefines "$(SVG_FLAGS)" --factory --wrapperFactory --output $(dir $@)
+$(GEN): $(LOCAL_PATH)/dom/make_names.pl $(LOCAL_PATH)/svg/svgtags.in $(LOCAL_PATH)/svg/svgattrs.in
+	$(transform-generated-source)
+LOCAL_GENERATED_SOURCES += $(GEN)
+endif
diff --git a/WebCore/Android.jscbindings.mk b/WebCore/Android.jscbindings.mk
index bab2b56..7055b90 100644
--- a/WebCore/Android.jscbindings.mk
+++ b/WebCore/Android.jscbindings.mk
@@ -23,6 +23,38 @@
 ## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ##
 
+BINDING_C_INCLUDES := \
+	$(LOCAL_PATH)/bindings/js \
+	$(LOCAL_PATH)/bridge \
+	$(LOCAL_PATH)/bridge/c \
+	$(LOCAL_PATH)/bridge/jni \
+	$(LOCAL_PATH)/bridge/jni/jsc \
+	\
+	$(JAVASCRIPTCORE_PATH)/API \
+	$(JAVASCRIPTCORE_PATH)/assembler \
+	$(JAVASCRIPTCORE_PATH)/bytecode \
+	$(JAVASCRIPTCORE_PATH)/bytecompiler \
+	$(JAVASCRIPTCORE_PATH)/debugger \
+	$(JAVASCRIPTCORE_PATH)/parser \
+	$(JAVASCRIPTCORE_PATH)/jit \
+	$(JAVASCRIPTCORE_PATH)/interpreter \
+	$(JAVASCRIPTCORE_PATH)/pcre \
+	$(JAVASCRIPTCORE_PATH)/profiler \
+	$(JAVASCRIPTCORE_PATH)/runtime \
+	$(JAVASCRIPTCORE_PATH)/wrec \
+	$(JAVASCRIPTCORE_PATH)/ForwardingHeaders \
+	\
+	$(base_intermediates)/WebCore/bindings/js \
+	$(base_intermediates)/WebCore/dom \
+	$(base_intermediates)/WebCore/html/canvas \
+	$(base_intermediates)/WebCore/inspector \
+	$(base_intermediates)/WebCore/loader/appcache \
+	$(base_intermediates)/WebCore/page \
+	$(base_intermediates)/WebCore/plugins \
+	$(base_intermediates)/WebCore/storage \
+	$(base_intermediates)/WebCore/workers \
+	$(base_intermediates)/WebCore/xml
+
 LOCAL_SRC_FILES += \
 	bindings/js/GCController.cpp \
 	bindings/js/JSAbstractWorkerCustom.cpp \
@@ -157,6 +189,7 @@ LOCAL_SRC_FILES += \
 	bridge/jni/jni_instance.cpp \
 	bridge/jni/jni_runtime.cpp \
 	bridge/jni/jni_utility.cpp \
+	bridge/jni/jsc/jni_utility_private.cpp \
 	bridge/npruntime.cpp \
 	bridge/runtime.cpp \
 	bridge/runtime_array.cpp \
diff --git a/WebCore/Android.mk b/WebCore/Android.mk
index ec6cf94..293c43b 100644
--- a/WebCore/Android.mk
+++ b/WebCore/Android.mk
@@ -232,6 +232,8 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
 	history/HistoryItem.cpp \
 	history/PageCache.cpp \
 	\
+	history/android/HistoryItemAndroid.cpp \
+	\
 	html/CollectionCache.cpp \
 	html/File.cpp \
 	html/FileList.cpp \
@@ -389,6 +391,8 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
 	platform/android/EventLoopAndroid.cpp \
 	platform/android/FileChooserAndroid.cpp \
 	platform/android/FileSystemAndroid.cpp \
+	platform/android/GeolocationServiceAndroid.cpp \
+	platform/android/GeolocationServiceBridge.cpp \
 	platform/android/KeyEventAndroid.cpp \
 	platform/android/LocalizedStringsAndroid.cpp \
 	platform/android/PopupMenuAndroid.cpp \
@@ -396,6 +400,9 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
 	platform/android/ScreenAndroid.cpp \
 	platform/android/ScrollViewAndroid.cpp \
 	platform/android/SearchPopupMenuAndroid.cpp \
+	platform/android/SharedTimerAndroid.cpp \
+	platform/android/SoundAndroid.cpp \
+	platform/android/SSLKeyGeneratorAndroid.cpp \
 	platform/android/SystemTimeAndroid.cpp \
 	platform/android/TemporaryLinkStubs.cpp \
 	platform/android/WidgetAndroid.cpp \
diff --git a/WebCore/Android.v8bindings.mk b/WebCore/Android.v8bindings.mk
new file mode 100644
index 0000000..a4b3965
--- /dev/null
+++ b/WebCore/Android.v8bindings.mk
@@ -0,0 +1,170 @@
+##
+## Copyright 2009, The Android Open Source Project
+##
+## Redistribution and use in source and binary forms, with or without
+## modification, are permitted provided that the following conditions
+## are met:
+##  * Redistributions of source code must retain the above copyright
+##    notice, this list of conditions and the following disclaimer.
+##  * Redistributions in binary form must reproduce the above copyright
+##    notice, this list of conditions and the following disclaimer in the
+##    documentation and/or other materials provided with the distribution.
+##
+## THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY
+## EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+## IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+## PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+## CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+## EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+## PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+## PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+## OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+##
+
+LOCAL_CFLAGS += -DWTF_USE_V8=1
+
+BINDING_C_INCLUDES := \
+	external/v8/include \
+	\
+	$(LOCAL_PATH)/bindings/v8 \
+	$(LOCAL_PATH)/bindings/v8/custom \
+	$(LOCAL_PATH)/bridge \
+	\
+	$(base_intermediates)/WebCore/bindings \
+	$(base_intermediates)/JavaScriptCore
+
+LOCAL_SRC_FILES += \
+	bindings/ScriptControllerBase.cpp \
+	\
+	bindings/v8/ChildThreadDOMData.cpp \
+	bindings/v8/DateExtension.cpp \
+	bindings/v8/DOMData.cpp \
+	bindings/v8/DOMDataStore.cpp \
+	bindings/v8/MainThreadDOMData.cpp \
+	bindings/v8/NPV8Object.cpp \
+	bindings/v8/RuntimeEnabledFeatures.cpp \
+	bindings/v8/ScheduledAction.cpp \
+	bindings/v8/ScopedDOMDataStore.cpp \
+	bindings/v8/ScriptArray.cpp \
+	bindings/v8/ScriptCallFrame.cpp \
+	bindings/v8/ScriptCallStack.cpp \
+	bindings/v8/ScriptController.cpp \
+	bindings/v8/ScriptEventListener.cpp \
+	bindings/v8/ScriptFunctionCall.cpp \
+	bindings/v8/ScriptInstance.cpp \
+	bindings/v8/ScriptObject.cpp \
+	bindings/v8/ScriptScope.cpp \
+	bindings/v8/ScriptState.cpp \
+	bindings/v8/ScriptStringImpl.cpp \
+	bindings/v8/ScriptValue.cpp \
+	bindings/v8/StaticDOMDataStore.cpp \
+	bindings/v8/V8AbstractEventListener.cpp \
+	bindings/v8/V8Binding.cpp \
+	bindings/v8/V8Collection.cpp \
+	bindings/v8/V8ConsoleMessage.cpp \
+	bindings/v8/V8DOMMap.cpp \
+	bindings/v8/V8DOMWrapper.cpp \
+	bindings/v8/V8DataGridDataSource.cpp \
+	bindings/v8/V8EventListenerList.cpp \
+	bindings/v8/V8GCController.cpp \
+	bindings/v8/V8Helpers.cpp \
+	bindings/v8/V8HiddenPropertyName.cpp \
+	bindings/v8/V8Index.cpp \
+	bindings/v8/V8IsolatedWorld.cpp \
+	bindings/v8/V8LazyEventListener.cpp \
+	bindings/v8/V8NPObject.cpp \
+	bindings/v8/V8NPUtils.cpp \
+	bindings/v8/V8NodeFilterCondition.cpp \
+	bindings/v8/V8Proxy.cpp \
+	bindings/v8/V8Utilities.cpp \
+	bindings/v8/V8WorkerContextEventListener.cpp \
+	bindings/v8/WorkerContextExecutionProxy.cpp \
+	bindings/v8/WorkerScriptController.cpp \
+	\
+	bindings/v8/npruntime.cpp \
+	\
+	bindings/v8/custom/V8AbstractWorkerCustom.cpp \
+	bindings/v8/custom/V8AttrCustom.cpp \
+	bindings/v8/custom/V8CSSStyleDeclarationCustom.cpp \
+	bindings/v8/custom/V8CanvasRenderingContext2DCustom.cpp \
+	bindings/v8/custom/V8ClientRectListCustom.cpp \
+	bindings/v8/custom/V8ClipboardCustom.cpp \
+	bindings/v8/custom/V8CoordinatesCustom.cpp \
+	bindings/v8/custom/V8CustomBinding.cpp \
+	bindings/v8/custom/V8CustomEventListener.cpp \
+	bindings/v8/custom/V8CustomPositionCallback.cpp \
+	bindings/v8/custom/V8CustomPositionErrorCallback.cpp \
+	bindings/v8/custom/V8CustomSQLStatementCallback.cpp \
+	bindings/v8/custom/V8CustomSQLStatementErrorCallback.cpp \
+	bindings/v8/custom/V8CustomSQLTransactionCallback.cpp \
+	bindings/v8/custom/V8CustomSQLTransactionErrorCallback.cpp \
+	bindings/v8/custom/V8CustomVoidCallback.cpp \
+	bindings/v8/custom/V8DOMApplicationCacheCustom.cpp \
+	bindings/v8/custom/V8DOMParserConstructor.cpp \
+	bindings/v8/custom/V8DOMWindowCustom.cpp \
+	bindings/v8/custom/V8DataGridColumnListCustom.cpp \
+	bindings/v8/custom/V8DatabaseCustom.cpp \
+	bindings/v8/custom/V8DedicatedWorkerContextCustom.cpp \
+	bindings/v8/custom/V8DocumentCustom.cpp \
+	bindings/v8/custom/V8DocumentLocationCustom.cpp \
+	bindings/v8/custom/V8ElementCustom.cpp \
+	bindings/v8/custom/V8EventCustom.cpp \
+	bindings/v8/custom/V8FileListCustom.cpp \
+	bindings/v8/custom/V8GeolocationCustom.cpp \
+	bindings/v8/custom/V8HTMLAllCollectionCustom.cpp \
+	bindings/v8/custom/V8HTMLAudioElementConstructor.cpp \
+	bindings/v8/custom/V8HTMLCanvasElementCustom.cpp \
+	bindings/v8/custom/V8HTMLCollectionCustom.cpp \
+	bindings/v8/custom/V8HTMLDataGridElementCustom.cpp \
+	bindings/v8/custom/V8HTMLDocumentCustom.cpp \
+	bindings/v8/custom/V8HTMLFormElementCustom.cpp \
+	bindings/v8/custom/V8HTMLFrameElementCustom.cpp \
+	bindings/v8/custom/V8HTMLFrameSetElementCustom.cpp \
+	bindings/v8/custom/V8HTMLIFrameElementCustom.cpp \
+	bindings/v8/custom/V8HTMLImageElementConstructor.cpp \
+	bindings/v8/custom/V8HTMLInputElementCustom.cpp \
+	bindings/v8/custom/V8HTMLOptionElementConstructor.cpp \
+	bindings/v8/custom/V8HTMLOptionsCollectionCustom.cpp \
+	bindings/v8/custom/V8HTMLPlugInElementCustom.cpp \
+	bindings/v8/custom/V8HTMLSelectElementCollectionCustom.cpp \
+	bindings/v8/custom/V8HTMLSelectElementCustom.cpp \
+	bindings/v8/custom/V8LocationCustom.cpp \
+	bindings/v8/custom/V8MessageChannelConstructor.cpp \
+	bindings/v8/custom/V8MessagePortCustom.cpp \
+	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 \
+	bindings/v8/custom/V8SQLResultSetRowListCustom.cpp \
+	bindings/v8/custom/V8SQLTransactionCustom.cpp \
+	bindings/v8/custom/V8WebSocketCustom.cpp
+
+ifeq ($(ENABLE_SVG), true)
+LOCAL_SRC_FILES += \
+	bindings/v8/custom/V8SVGElementInstanceCustom.cpp \
+	bindings/v8/custom/V8SVGLengthCustom.cpp \
+	bindings/v8/custom/V8SVGMatrixCustom.cpp
+endif
+
+LOCAL_SRC_FILES += \
+	bindings/v8/custom/V8SharedWorkerCustom.cpp \
+	bindings/v8/custom/V8StorageCustom.cpp \
+	bindings/v8/custom/V8StyleSheetListCustom.cpp \
+	bindings/v8/custom/V8TreeWalkerCustom.cpp \
+	bindings/v8/custom/V8WebKitCSSMatrixConstructor.cpp \
+	bindings/v8/custom/V8WebKitPointConstructor.cpp \
+	bindings/v8/custom/V8WorkerContextCustom.cpp \
+	bindings/v8/custom/V8WorkerCustom.cpp \
+	bindings/v8/custom/V8XMLHttpRequestConstructor.cpp \
+	bindings/v8/custom/V8XMLHttpRequestCustom.cpp \
+	bindings/v8/custom/V8XMLHttpRequestUploadCustom.cpp \
+	bindings/v8/custom/V8XMLSerializerConstructor.cpp
+
+LOCAL_SRC_FILES += \
+	bridge/jni/jni_utility.cpp
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 2288451..63e5e86 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,20 @@
+2009-12-09  Steve Block  <steveblock at google.com>
+
+        Reviewed by Adam Barth.
+
+        Adds Android Makefiles for building with V8.
+        Also updates existing Android Makefiles with latest additions.
+        https://bugs.webkit.org/show_bug.cgi?id=32278
+
+        Build fix only, no new tests.
+
+        * Android.derived.jscbindings.mk: Modified.
+        * Android.derived.mk: Modified.
+        * Android.derived.v8bindings.mk: Added.
+        * Android.jscbindings.mk: Modified.
+        * Android.mk: Modified.
+        * Android.v8bindings.mk: Added.
+
 2009-12-09  Jonathan Dixon  <joth at chromium.org>
 
         Reviewed by Dimitri Glazkov.

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list