Merge WebKit at r75315: Fix Makefiles

See http://trac.webkit.org/changeset/74646

Change-Id: Ib0ef9902925ddb13ec97fad0753515b10b1d3c01

6 files changed, 7 insertions, 31 deletions

diff --git a/Source/JavaScriptCore/Android.mk b/Source/JavaScriptCore/Android.mk
index d72b686..579451b 100644
--- a/Source/JavaScriptCore/Android.mk
+++ b/Source/JavaScriptCore/Android.mk
@@ -200,17 +200,13 @@ LOCAL_SRC_FILES := \
 	\
 	wtf/unicode/icu/CollatorICU.cpp \
 	\
-<<<<<<< HEAD:JavaScriptCore/Android.mk
 	wtf/url/src/URLCharacterTypes.cpp \
 	wtf/url/src/URLEscape.cpp \
 	wtf/url/src/URLSegments.cpp \
 	\
-	yarr/RegexCompiler.cpp \
-=======
-	yarr/RegexPattern.cpp \
->>>>>>> webkit.org at r75315:Source/JavaScriptCore/Android.mk
 	yarr/RegexInterpreter.cpp \
-	yarr/RegexJIT.cpp
+	yarr/RegexJIT.cpp \
+	yarr/RegexPattern.cpp
 
 # generated headers
 JSC_OBJECTS := $(addprefix $(intermediates)/runtime/, \
diff --git a/Source/WebCore/Android.derived.jscbindings.mk b/Source/WebCore/Android.derived.jscbindings.mk
index 0cc8fa7..e66ef1b 100644
--- a/Source/WebCore/Android.derived.jscbindings.mk
+++ b/Source/WebCore/Android.derived.jscbindings.mk
@@ -25,7 +25,7 @@
 ##
 
 # lookup tables for old-style JavaScript bindings
-create_hash_table := $(LOCAL_PATH)/Source/JavaScriptCore/create_hash_table
+create_hash_table := $(LOCAL_PATH)/../JavaScriptCore/create_hash_table
 
 GEN := $(addprefix $(intermediates)/, \
 			bindings/js/JSDOMWindowBase.lut.h \
diff --git a/Source/WebCore/Android.derived.mk b/Source/WebCore/Android.derived.mk
index 3c8f577..f6967ef 100644
--- a/Source/WebCore/Android.derived.mk
+++ b/Source/WebCore/Android.derived.mk
@@ -78,7 +78,7 @@ LOCAL_GENERATED_SOURCES += $(GEN)
 
 GEN := $(intermediates)/html/HTMLEntityTable.cpp
 $(GEN): SCRIPT := $(LOCAL_PATH)/html/parser/create-html-entity-table
-$(GEN): WEBKITPY_RESOURCES_DIRECTORY := $(LOCAL_PATH)/../Tools/Scripts/webkitpy
+$(GEN): WEBKITPY_RESOURCES_DIRECTORY := $(LOCAL_PATH)/../../Tools/Scripts/webkitpy
 $(GEN): PRIVATE_CUSTOM_TOOL = $(dir $@)$(notdir $(SCRIPT)) -o $@ $<
 $(GEN): $(LOCAL_PATH)/html/parser/HTMLEntityNames.in
 	@echo "Generating HTMLEntityTable.cpp"
@@ -193,7 +193,7 @@ ifeq ($(ENABLE_AUTOFILL),true)
 # WebKit <-> Chromium bindings which include headers from the Chromuim project.
 
 THIRD_PARTY = $(intermediates)/third_party
-CHROMIUM_SRC_DIR := $(LOCAL_PATH)/../../chromium
+CHROMIUM_SRC_DIR := $(LOCAL_PATH)/../../../chromium
 SCRIPT := $(CHROMIUM_SRC_DIR)/android/generateAndroidForwardingHeader.pl
 
 GEN := $(THIRD_PARTY)/expat/files/lib/expat.h
diff --git a/Source/WebCore/Android.jscbindings.mk b/Source/WebCore/Android.jscbindings.mk
index b14769a..697f5ef 100644
--- a/Source/WebCore/Android.jscbindings.mk
+++ b/Source/WebCore/Android.jscbindings.mk
@@ -46,7 +46,6 @@ BINDING_C_INCLUDES := \
 	$(JAVASCRIPTCORE_PATH)/wrec \
 	$(JAVASCRIPTCORE_PATH)/ForwardingHeaders \
 	\
-<<<<<<< HEAD:WebCore/Android.jscbindings.mk
 	$(WEBCORE_INTERMEDIATES_PATH)/bindings/js \
 	$(WEBCORE_INTERMEDIATES_PATH)/dom \
 	$(WEBCORE_INTERMEDIATES_PATH)/fileapi \
@@ -60,18 +59,6 @@ BINDING_C_INCLUDES := \
 	$(WEBCORE_INTERMEDIATES_PATH)/webaudio \
 	$(WEBCORE_INTERMEDIATES_PATH)/workers \
 	$(WEBCORE_INTERMEDIATES_PATH)/xml
-=======
-	$(base_intermediates)/Source/WebCore/bindings/js \
-	$(base_intermediates)/Source/WebCore/dom \
-	$(base_intermediates)/Source/WebCore/html/canvas \
-	$(base_intermediates)/Source/WebCore/inspector \
-	$(base_intermediates)/Source/WebCore/loader/appcache \
-	$(base_intermediates)/Source/WebCore/page \
-	$(base_intermediates)/Source/WebCore/plugins \
-	$(base_intermediates)/Source/WebCore/storage \
-	$(base_intermediates)/Source/WebCore/workers \
-	$(base_intermediates)/Source/WebCore/xml
->>>>>>> webkit.org at r75315:Source/WebCore/Android.jscbindings.mk
 
 LOCAL_SRC_FILES += \
 	bindings/js/DOMObjectHashTableMap.cpp \
@@ -176,7 +163,6 @@ LOCAL_SRC_FILES += \
 	bindings/js/JSNodeListCustom.cpp \
 	bindings/js/JSOptionConstructor.cpp \
 	bindings/js/JSPluginElementFunctions.cpp \
-	bindings/js/JSPopStateEventCustom.cpp \
 	bindings/js/JSProcessingInstructionCustom.cpp \
 	bindings/js/JSSQLResultSetRowListCustom.cpp \
 	bindings/js/JSSQLTransactionCustom.cpp \
@@ -220,8 +206,6 @@ LOCAL_SRC_FILES += \
 	bindings/js/SerializedScriptValue.cpp \
 	bindings/js/WorkerScriptController.cpp \
 	\
-	bindings/js/specialization/JSBindingState.cpp \
-	\
 	bindings/ScriptControllerBase.cpp \
 	\
 	bridge/IdentifierRep.cpp \
diff --git a/Source/WebCore/Android.mk b/Source/WebCore/Android.mk
index c1bfb0b..a1a56d6 100644
--- a/Source/WebCore/Android.mk
+++ b/Source/WebCore/Android.mk
@@ -799,6 +799,7 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
 	rendering/RenderFrame.cpp \
 	rendering/RenderFrameBase.cpp \
 	rendering/RenderFrameSet.cpp \
+	rendering/RenderFullScreen.cpp \
 	rendering/RenderHTMLCanvas.cpp \
 	rendering/RenderIFrame.cpp \
 	rendering/RenderImage.cpp \
diff --git a/Source/WebCore/Android.v8bindings.mk b/Source/WebCore/Android.v8bindings.mk
index 3cce546..63b6ae1 100644
--- a/Source/WebCore/Android.v8bindings.mk
+++ b/Source/WebCore/Android.v8bindings.mk
@@ -36,14 +36,9 @@ BINDING_C_INCLUDES := \
 	$(LOCAL_PATH)/bridge/jni/v8 \
 	$(LOCAL_PATH)/bridge/jsc \
 	\
-<<<<<<< HEAD:WebCore/Android.v8bindings.mk
 	$(WEBCORE_INTERMEDIATES_PATH)/bindings \
 	$(WEBCORE_INTERMEDIATES_PATH)/svg \
-	$(base_intermediates)/JavaScriptCore
-=======
-	$(base_intermediates)/Source/WebCore/bindings \
 	$(base_intermediates)/Source/JavaScriptCore
->>>>>>> webkit.org at r75315:Source/WebCore/Android.v8bindings.mk
 
 LOCAL_SRC_FILES += \
 	bindings/ScriptControllerBase.cpp \
@@ -79,6 +74,7 @@ LOCAL_SRC_FILES += \
 	bindings/v8/V8DOMWindowShell.cpp \
 	bindings/v8/V8DOMWrapper.cpp \
 	bindings/v8/V8DataGridDataSource.cpp \
+	bindings/v8/V8EventListener.cpp \
 	bindings/v8/V8EventListenerList.cpp \
 	bindings/v8/V8GCController.cpp \
 	bindings/v8/V8GCForContextDispose.cpp \
@@ -109,7 +105,6 @@ LOCAL_SRC_FILES += \
 	bindings/v8/custom/V8ConsoleCustom.cpp \
 	bindings/v8/custom/V8CoordinatesCustom.cpp \
 	bindings/v8/custom/V8CustomApplicationInstalledCallback.cpp \
-	bindings/v8/custom/V8CustomEventListener.cpp \
 	bindings/v8/custom/V8CustomPositionCallback.cpp \
 	bindings/v8/custom/V8CustomPositionErrorCallback.cpp \
 	bindings/v8/custom/V8CustomSQLStatementErrorCallback.cpp \