Merge changes I03b28d93,Ie53e458f

* changes:
  Merge WebKit at r59636: Fix Android ifdef, commas moved upstream. http://trac.webkit.org/changeset/59035/trunk/WebCore/bridge/npapi.h#file0
  Merge WebKit at r59636: Fix makefiles

7 files changed, 45 insertions, 22 deletions

diff --git a/JavaScriptCore/Android.mk b/JavaScriptCore/Android.mk
index e51000d..211cea9 100644
--- a/JavaScriptCore/Android.mk
+++ b/JavaScriptCore/Android.mk
@@ -178,6 +178,7 @@ LOCAL_SRC_FILES := \
 	wtf/text/AtomicString.cpp \
 	wtf/text/CString.cpp \
 	wtf/text/StringImpl.cpp \
+	wtf/text/StringStatics.cpp \
 	wtf/text/WTFString.cpp \
 	\
 	wtf/unicode/CollatorDefault.cpp \
diff --git a/JavaScriptCore/Android.v8.wtf.mk b/JavaScriptCore/Android.v8.wtf.mk
index c1f114d..16554b1 100644
--- a/JavaScriptCore/Android.v8.wtf.mk
+++ b/JavaScriptCore/Android.v8.wtf.mk
@@ -56,6 +56,7 @@ LOCAL_SRC_FILES := \
 	wtf/text/AtomicString.cpp \
 	wtf/text/CString.cpp \
 	wtf/text/StringImpl.cpp \
+	wtf/text/StringStatics.cpp \
 	wtf/text/WTFString.cpp \
 	\
 	wtf/unicode/CollatorDefault.cpp \
diff --git a/WebCore/Android.derived.jscbindings.mk b/WebCore/Android.derived.jscbindings.mk
index b77b610..42523a5 100644
--- a/WebCore/Android.derived.jscbindings.mk
+++ b/WebCore/Android.derived.jscbindings.mk
@@ -161,6 +161,7 @@ GEN := \
     $(intermediates)/html/JSFile.h \
     $(intermediates)/html/JSFileError.h \
     $(intermediates)/html/JSFileList.h \
+    $(intermediates)/html/JSFileReader.h \
     $(intermediates)/html/JSHTMLAllCollection.h \
     $(intermediates)/html/JSHTMLAnchorElement.h \
     $(intermediates)/html/JSHTMLAppletElement.h \
@@ -207,6 +208,7 @@ GEN := \
     $(intermediates)/html/JSHTMLMediaElement.h \
     $(intermediates)/html/JSHTMLMenuElement.h \
     $(intermediates)/html/JSHTMLMetaElement.h \
+    $(intermediates)/html/JSHTMLMeterElement.h \
     $(intermediates)/html/JSHTMLModElement.h \
     $(intermediates)/html/JSHTMLOListElement.h \
     $(intermediates)/html/JSHTMLObjectElement.h \
@@ -251,20 +253,20 @@ $(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/html/%.cpp : $(intermediates)/htm
 
 # Canvas
 GEN := \
+    $(intermediates)/html/canvas/JSArrayBuffer.h \
     $(intermediates)/html/canvas/JSCanvasGradient.h \
     $(intermediates)/html/canvas/JSCanvasNumberArray.h \
     $(intermediates)/html/canvas/JSCanvasPattern.h \
     $(intermediates)/html/canvas/JSCanvasRenderingContext.h \
     $(intermediates)/html/canvas/JSCanvasRenderingContext2D.h \
-    $(intermediates)/html/canvas/JSWebGLArrayBuffer.h \
-    $(intermediates)/html/canvas/JSWebGLByteArray.h \
-    $(intermediates)/html/canvas/JSWebGLFloatArray.h \
-    $(intermediates)/html/canvas/JSWebGLIntArray.h \
+    $(intermediates)/html/canvas/JSFloatArray.h \
+    $(intermediates)/html/canvas/JSInt8Array.h \
+    $(intermediates)/html/canvas/JSInt16Array.h \
+    $(intermediates)/html/canvas/JSInt32Array.h \
+    $(intermediates)/html/canvas/JSUint8Array.h \
+    $(intermediates)/html/canvas/JSUint16Array.h \
+    $(intermediates)/html/canvas/JSUint32Array.h \
     $(intermediates)/html/canvas/JSWebGLRenderingContext.h \
-    $(intermediates)/html/canvas/JSWebGLShortArray.h \
-    $(intermediates)/html/canvas/JSWebGLUnsignedByteArray.h \
-    $(intermediates)/html/canvas/JSWebGLUnsignedIntArray.h \
-    $(intermediates)/html/canvas/JSWebGLUnsignedShortArray.h
 
 $(GEN): PRIVATE_PATH := $(LOCAL_PATH)
 $(GEN): PRIVATE_CUSTOM_TOOL = perl -I$(PRIVATE_PATH)/bindings/scripts $(PRIVATE_PATH)/bindings/scripts/generate-bindings.pl --defines "$(FEATURE_DEFINES) LANGUAGE_JAVASCRIPT" --generator JS --include dom --include html --outputdir $(dir $@) $<
@@ -338,6 +340,11 @@ $(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/plugins/%.cpp : $(intermediates)/
 GEN := \
     $(intermediates)/storage/JSDatabase.h \
     $(intermediates)/storage/JSDatabaseCallback.h \
+    $(intermediates)/storage/JSDatabaseSync.h \
+    $(intermediates)/storage/JSIDBErrorEvent.h \
+    $(intermediates)/storage/JSIDBEvent.h \
+    $(intermediates)/storage/JSIDBRequest.h \
+    $(intermediates)/storage/JSIDBSuccessEvent.h \
     $(intermediates)/storage/JSSQLError.h \
     $(intermediates)/storage/JSSQLResultSet.h \
     $(intermediates)/storage/JSSQLResultSetRowList.h \
@@ -345,10 +352,12 @@ GEN := \
     $(intermediates)/storage/JSSQLStatementErrorCallback.h \
     $(intermediates)/storage/JSSQLTransaction.h \
     $(intermediates)/storage/JSSQLTransactionCallback.h \
+    $(intermediates)/storage/JSSQLTransactionSync.h \
+    $(intermediates)/storage/JSSQLTransactionSyncCallback.h \
     $(intermediates)/storage/JSSQLTransactionErrorCallback.h
 
 $(GEN): PRIVATE_PATH := $(LOCAL_PATH)
-$(GEN): PRIVATE_CUSTOM_TOOL = perl -I$(PRIVATE_PATH)/bindings/scripts $(PRIVATE_PATH)/bindings/scripts/generate-bindings.pl --defines "$(FEATURE_DEFINES) LANGUAGE_JAVASCRIPT" --generator JS --include dom --include html --outputdir $(dir $@) $<
+$(GEN): PRIVATE_CUSTOM_TOOL = perl -I$(PRIVATE_PATH)/bindings/scripts $(PRIVATE_PATH)/bindings/scripts/generate-bindings.pl --defines "$(FEATURE_DEFINES) LANGUAGE_JAVASCRIPT" --generator JS --include dom --include html --include storage --outputdir $(dir $@) $<
 $(GEN): $(intermediates)/storage/JS%.h : $(LOCAL_PATH)/storage/%.idl $(js_binding_scripts)
 	$(transform-generated-source)
 LOCAL_GENERATED_SOURCES += $(GEN) $(GEN:%.h=%.cpp)
diff --git a/WebCore/Android.derived.v8bindings.mk b/WebCore/Android.derived.v8bindings.mk
index bace1e3..e66e55b 100644
--- a/WebCore/Android.derived.v8bindings.mk
+++ b/WebCore/Android.derived.v8bindings.mk
@@ -145,6 +145,7 @@ GEN := \
     $(intermediates)/bindings/V8File.h \
     $(intermediates)/bindings/V8FileError.h \
     $(intermediates)/bindings/V8FileList.h \
+    $(intermediates)/bindings/V8FileReader.h \
     $(intermediates)/bindings/V8HTMLAllCollection.h \
     $(intermediates)/bindings/V8HTMLAnchorElement.h \
     $(intermediates)/bindings/V8HTMLAppletElement.h \
@@ -191,6 +192,7 @@ GEN := \
     $(intermediates)/bindings/V8HTMLMediaElement.h \
     $(intermediates)/bindings/V8HTMLMenuElement.h \
     $(intermediates)/bindings/V8HTMLMetaElement.h \
+    $(intermediates)/bindings/V8HTMLMeterElement.h \
     $(intermediates)/bindings/V8HTMLModElement.h \
     $(intermediates)/bindings/V8HTMLOListElement.h \
     $(intermediates)/bindings/V8HTMLObjectElement.h \
@@ -235,31 +237,30 @@ $(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/bindings/%.cpp : $(intermediates)
 
 # Canvas
 GEN := \
+    $(intermediates)/bindings/V8ArrayBuffer.h \
     $(intermediates)/bindings/V8CanvasGradient.h \
     $(intermediates)/bindings/V8CanvasNumberArray.h \
     $(intermediates)/bindings/V8CanvasPattern.h \
     $(intermediates)/bindings/V8CanvasPixelArray.h \
     $(intermediates)/bindings/V8CanvasRenderingContext.h \
     $(intermediates)/bindings/V8CanvasRenderingContext2D.h \
+    $(intermediates)/bindings/V8FloatArray.h \
+    $(intermediates)/bindings/V8Int8Array.h \
+    $(intermediates)/bindings/V8Int16Array.h \
+    $(intermediates)/bindings/V8Int32Array.h \
+    $(intermediates)/bindings/V8Uint8Array.h \
+    $(intermediates)/bindings/V8Uint16Array.h \
+    $(intermediates)/bindings/V8Uint32Array.h \
     $(intermediates)/bindings/V8WebGLActiveInfo.h \
-    $(intermediates)/bindings/V8WebGLArray.h \
-    $(intermediates)/bindings/V8WebGLArrayBuffer.h \
     $(intermediates)/bindings/V8WebGLBuffer.h \
-    $(intermediates)/bindings/V8WebGLByteArray.h \
     $(intermediates)/bindings/V8WebGLContextAttributes.h \
-    $(intermediates)/bindings/V8WebGLFloatArray.h \
     $(intermediates)/bindings/V8WebGLFramebuffer.h \
-    $(intermediates)/bindings/V8WebGLIntArray.h \
     $(intermediates)/bindings/V8WebGLProgram.h \
     $(intermediates)/bindings/V8WebGLRenderbuffer.h \
     $(intermediates)/bindings/V8WebGLRenderingContext.h \
     $(intermediates)/bindings/V8WebGLShader.h \
-    $(intermediates)/bindings/V8WebGLShortArray.h \
     $(intermediates)/bindings/V8WebGLTexture.h \
     $(intermediates)/bindings/V8WebGLUniformLocation.h \
-    $(intermediates)/bindings/V8WebGLUnsignedByteArray.h \
-    $(intermediates)/bindings/V8WebGLUnsignedIntArray.h \
-    $(intermediates)/bindings/V8WebGLUnsignedShortArray.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 $@) $<
@@ -333,6 +334,11 @@ $(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/bindings/%.cpp : $(intermediates)
 GEN := \
     $(intermediates)/bindings/V8Database.h \
     $(intermediates)/bindings/V8DatabaseCallback.h \
+    $(intermediates)/bindings/V8DatabaseSync.h \
+    $(intermediates)/bindings/V8IDBEvent.h \
+    $(intermediates)/bindings/V8IDBErrorEvent.h \
+    $(intermediates)/bindings/V8IDBRequest.h \
+    $(intermediates)/bindings/V8IDBSuccessEvent.h \
     $(intermediates)/bindings/V8SQLError.h \
     $(intermediates)/bindings/V8SQLResultSet.h \
     $(intermediates)/bindings/V8SQLResultSetRowList.h \
@@ -340,10 +346,12 @@ GEN := \
     $(intermediates)/bindings/V8SQLStatementErrorCallback.h \
     $(intermediates)/bindings/V8SQLTransaction.h \
     $(intermediates)/bindings/V8SQLTransactionCallback.h \
-    $(intermediates)/bindings/V8SQLTransactionErrorCallback.h
+    $(intermediates)/bindings/V8SQLTransactionErrorCallback.h \
+    $(intermediates)/bindings/V8SQLTransactionSync.h \
+    $(intermediates)/bindings/V8SQLTransactionSyncCallback.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): 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 storage --outputdir $(dir $@) $<
 $(GEN): $(intermediates)/bindings/V8%.h : $(LOCAL_PATH)/storage/%.idl $(js_binding_scripts)
 	$(transform-generated-source)
 LOCAL_GENERATED_SOURCES += $(GEN) $(GEN:%.h=%.cpp)
diff --git a/WebCore/Android.jscbindings.mk b/WebCore/Android.jscbindings.mk
index ceb1f66..7a44e51 100644
--- a/WebCore/Android.jscbindings.mk
+++ b/WebCore/Android.jscbindings.mk
@@ -92,6 +92,7 @@ LOCAL_SRC_FILES += \
 	bindings/js/JSDataGridColumnListCustom.cpp \
 	bindings/js/JSDataGridDataSource.cpp \
 	bindings/js/JSDatabaseCustom.cpp \
+	bindings/js/JSDatabaseSyncCustom.cpp \
 	bindings/js/JSDedicatedWorkerContextCustom.cpp \
 	bindings/js/JSDocumentCustom.cpp \
 	bindings/js/JSElementCustom.cpp \
@@ -140,6 +141,7 @@ LOCAL_SRC_FILES += \
 	bindings/js/JSPopStateEventCustom.cpp \
 	bindings/js/JSSQLResultSetRowListCustom.cpp \
 	bindings/js/JSSQLTransactionCustom.cpp \
+	bindings/js/JSSQLTransactionSyncCustom.cpp \
 	bindings/js/JSSVGElementInstanceCustom.cpp \
 	bindings/js/JSSVGLengthCustom.cpp \
 	bindings/js/JSSVGMatrixCustom.cpp \
diff --git a/WebCore/Android.v8bindings.mk b/WebCore/Android.v8bindings.mk
index 7f9b6ae..15d7d6e 100644
--- a/WebCore/Android.v8bindings.mk
+++ b/WebCore/Android.v8bindings.mk
@@ -116,6 +116,7 @@ LOCAL_SRC_FILES += \
 	bindings/v8/custom/V8DOMWindowCustom.cpp \
 	bindings/v8/custom/V8DataGridColumnListCustom.cpp \
 	bindings/v8/custom/V8DatabaseCustom.cpp \
+	bindings/v8/custom/V8DatabaseSyncCustom.cpp \
 	bindings/v8/custom/V8DedicatedWorkerContextCustom.cpp \
 	bindings/v8/custom/V8DocumentCustom.cpp \
 	bindings/v8/custom/V8DocumentLocationCustom.cpp \
@@ -153,6 +154,7 @@ LOCAL_SRC_FILES += \
 	bindings/v8/custom/V8PopStateEventCustom.cpp \
 	bindings/v8/custom/V8SQLResultSetRowListCustom.cpp \
 	bindings/v8/custom/V8SQLTransactionCustom.cpp \
+	bindings/v8/custom/V8SQLTransactionSyncCustom.cpp \
 	bindings/v8/custom/V8WebSocketCustom.cpp
 
 ifeq ($(ENABLE_SVG), true)
diff --git a/WebCore/bridge/npapi.h b/WebCore/bridge/npapi.h
index 54d01bd..c7705b7 100644
--- a/WebCore/bridge/npapi.h
+++ b/WebCore/bridge/npapi.h
@@ -340,10 +340,10 @@ typedef enum {
     /* Used when the plugin returns 0 from NPN_WriteReady and wishes the browser
      * to wait a certain amount of millis before calling NPN_WriteReady again.
      */
-    NPPDataDeliveryDelayMs = 100,
+    , NPPDataDeliveryDelayMs = 100
 
     // TODO(reed): upstream
-    NPPFakeValueToForce32Bits = 0x7FFFFFFF
+    , NPPFakeValueToForce32Bits = 0x7FFFFFFF
 #endif
 } NPPVariable;