From 2daae5fd11344eaa88a0d92b0f6d65f8d2255c00 Mon Sep 17 00:00:00 2001
From: Ben Murdoch <benm@google.com>
Date: Thu, 2 Jun 2011 12:07:03 +0100
Subject: Merge WebKit at r84325: Initial merge by git.

Change-Id: Ic1a909300ecc0a13ddc6b4e784371d2ac6e3d59b
---
 Source/WebCore/Android.derived.v8bindings.mk | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'Source/WebCore/Android.derived.v8bindings.mk')

diff --git a/Source/WebCore/Android.derived.v8bindings.mk b/Source/WebCore/Android.derived.v8bindings.mk
index 12aca59..6d08c1a 100644
--- a/Source/WebCore/Android.derived.v8bindings.mk
+++ b/Source/WebCore/Android.derived.v8bindings.mk
@@ -149,6 +149,7 @@ $(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/bindings/%.cpp : $(intermediates)
 # Fileapi
 GEN := \
     $(intermediates)/bindings/V8Blob.h \
+<<<<<<< HEAD
     $(intermediates)/bindings/V8BlobBuilder.h \
     $(intermediates)/bindings/V8DOMFileSystem.h \
     $(intermediates)/bindings/V8DOMFileSystemSync.h \
@@ -192,6 +193,9 @@ $(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/bindings/%.cpp : $(intermediates)
 # HTML
 GEN := \
     $(intermediates)/bindings/V8DOMFormData.h \
+=======
+    $(intermediates)/bindings/V8DOMTokenList.h \
+>>>>>>> WebKit.org at r84325
     $(intermediates)/bindings/V8DOMSettableTokenList.h \
     $(intermediates)/bindings/V8DOMTokenList.h \
     $(intermediates)/bindings/V8DOMURL.h \
@@ -277,7 +281,8 @@ GEN := \
     $(intermediates)/bindings/V8TextMetrics.h \
     $(intermediates)/bindings/V8TimeRanges.h \
     $(intermediates)/bindings/V8ValidityState.h \
-    $(intermediates)/bindings/V8VoidCallback.h
+    $(intermediates)/bindings/V8VoidCallback.h \
+    $(intermediates)/bindings/V8WebKitBlobBuilder.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 $@) $<
@@ -360,6 +365,9 @@ GEN := \
     $(intermediates)/bindings/V8Location.h \
     $(intermediates)/bindings/V8MemoryInfo.h \
     $(intermediates)/bindings/V8Navigator.h \
+    $(intermediates)/bindings/V8NavigatorUserMediaError.h \
+    $(intermediates)/bindings/V8NavigatorUserMediaErrorCallback.h \
+    $(intermediates)/bindings/V8NavigatorUserMediaSuccessCallback.h \
     $(intermediates)/bindings/V8PositionError.h \
     $(intermediates)/bindings/V8Screen.h \
     $(intermediates)/bindings/V8SpeechInputEvent.h \
-- 
cgit v1.1