diff options
| -rw-r--r-- | WebCore/Android.derived.jscbindings.mk | 28 | ||||
| -rw-r--r-- | WebCore/Android.derived.v8bindings.mk | 35 | ||||
| -rw-r--r-- | WebCore/Android.jscbindings.mk | 18 | ||||
| -rw-r--r-- | WebCore/Android.mk | 25 | ||||
| -rw-r--r-- | WebCore/Android.v8bindings.mk | 13 |
5 files changed, 41 insertions, 78 deletions
diff --git a/WebCore/Android.derived.jscbindings.mk b/WebCore/Android.derived.jscbindings.mk index 2eb19f5..d7ca0a4 100644 --- a/WebCore/Android.derived.jscbindings.mk +++ b/WebCore/Android.derived.jscbindings.mk @@ -101,6 +101,7 @@ GEN := \ $(intermediates)/dom/JSClientRectList.h \ $(intermediates)/dom/JSClipboard.h \ $(intermediates)/dom/JSComment.h \ + $(intermediates)/dom/JSCompositionEvent.h \ $(intermediates)/dom/JSDOMCoreException.h \ $(intermediates)/dom/JSDOMImplementation.h \ $(intermediates)/dom/JSDocument.h \ @@ -126,6 +127,7 @@ GEN := \ $(intermediates)/dom/JSNotation.h \ $(intermediates)/dom/JSOverflowEvent.h \ $(intermediates)/dom/JSPageTransitionEvent.h \ + $(intermediates)/dom/JSPopStateEvent.h \ $(intermediates)/dom/JSProcessingInstruction.h \ $(intermediates)/dom/JSProgressEvent.h \ $(intermediates)/dom/JSRange.h \ @@ -245,28 +247,20 @@ $(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/html/%.cpp : $(intermediates)/htm # Canvas GEN := \ - $(intermediates)/html/canvas/JSCanvasActiveInfo.h \ - $(intermediates)/html/canvas/JSCanvasArray.h \ - $(intermediates)/html/canvas/JSCanvasArrayBuffer.h \ - $(intermediates)/html/canvas/JSCanvasBuffer.h \ - $(intermediates)/html/canvas/JSCanvasByteArray.h \ - $(intermediates)/html/canvas/JSCanvasFloatArray.h \ - $(intermediates)/html/canvas/JSCanvasFramebuffer.h \ $(intermediates)/html/canvas/JSCanvasGradient.h \ - $(intermediates)/html/canvas/JSCanvasIntArray.h \ $(intermediates)/html/canvas/JSCanvasNumberArray.h \ $(intermediates)/html/canvas/JSCanvasPattern.h \ - $(intermediates)/html/canvas/JSCanvasProgram.h \ - $(intermediates)/html/canvas/JSCanvasRenderbuffer.h \ $(intermediates)/html/canvas/JSCanvasRenderingContext.h \ $(intermediates)/html/canvas/JSCanvasRenderingContext2D.h \ - $(intermediates)/html/canvas/JSCanvasRenderingContext3D.h \ - $(intermediates)/html/canvas/JSCanvasShader.h \ - $(intermediates)/html/canvas/JSCanvasShortArray.h \ - $(intermediates)/html/canvas/JSCanvasTexture.h \ - $(intermediates)/html/canvas/JSCanvasUnsignedByteArray.h \ - $(intermediates)/html/canvas/JSCanvasUnsignedIntArray.h \ - $(intermediates)/html/canvas/JSCanvasUnsignedShortArray.h + $(intermediates)/html/canvas/JSWebGLArrayBuffer.h \ + $(intermediates)/html/canvas/JSWebGLByteArray.h \ + $(intermediates)/html/canvas/JSWebGLFloatArray.h \ + $(intermediates)/html/canvas/JSWebGLIntArray.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 $@) $< diff --git a/WebCore/Android.derived.v8bindings.mk b/WebCore/Android.derived.v8bindings.mk index e0b5d98..33b7050 100644 --- a/WebCore/Android.derived.v8bindings.mk +++ b/WebCore/Android.derived.v8bindings.mk @@ -83,6 +83,7 @@ GEN := \ $(intermediates)/bindings/V8ClientRectList.h \ $(intermediates)/bindings/V8Clipboard.h \ $(intermediates)/bindings/V8Comment.h \ + $(intermediates)/bindings/V8CompositionEvent.h \ $(intermediates)/bindings/V8DOMCoreException.h \ $(intermediates)/bindings/V8DOMImplementation.h \ $(intermediates)/bindings/V8Document.h \ @@ -228,29 +229,29 @@ $(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/bindings/%.cpp : $(intermediates) # Canvas GEN := \ - $(intermediates)/bindings/V8CanvasActiveInfo.h \ - $(intermediates)/bindings/V8CanvasArray.h \ - $(intermediates)/bindings/V8CanvasArrayBuffer.h \ - $(intermediates)/bindings/V8CanvasBuffer.h \ - $(intermediates)/bindings/V8CanvasByteArray.h \ - $(intermediates)/bindings/V8CanvasFloatArray.h \ - $(intermediates)/bindings/V8CanvasFramebuffer.h \ $(intermediates)/bindings/V8CanvasGradient.h \ - $(intermediates)/bindings/V8CanvasIntArray.h \ $(intermediates)/bindings/V8CanvasNumberArray.h \ $(intermediates)/bindings/V8CanvasPattern.h \ $(intermediates)/bindings/V8CanvasPixelArray.h \ - $(intermediates)/bindings/V8CanvasProgram.h \ - $(intermediates)/bindings/V8CanvasRenderbuffer.h \ $(intermediates)/bindings/V8CanvasRenderingContext.h \ $(intermediates)/bindings/V8CanvasRenderingContext2D.h \ - $(intermediates)/bindings/V8CanvasRenderingContext3D.h \ - $(intermediates)/bindings/V8CanvasShader.h \ - $(intermediates)/bindings/V8CanvasShortArray.h \ - $(intermediates)/bindings/V8CanvasTexture.h \ - $(intermediates)/bindings/V8CanvasUnsignedByteArray.h \ - $(intermediates)/bindings/V8CanvasUnsignedIntArray.h \ - $(intermediates)/bindings/V8CanvasUnsignedShortArray.h + $(intermediates)/bindings/V8WebGLActiveInfo.h \ + $(intermediates)/bindings/V8WebGLArray.h \ + $(intermediates)/bindings/V8WebGLArrayBuffer.h \ + $(intermediates)/bindings/V8WebGLBuffer.h \ + $(intermediates)/bindings/V8WebGLByteArray.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/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 $@) $< diff --git a/WebCore/Android.jscbindings.mk b/WebCore/Android.jscbindings.mk index 0eaff05..6dd55ff 100644 --- a/WebCore/Android.jscbindings.mk +++ b/WebCore/Android.jscbindings.mk @@ -66,26 +66,9 @@ LOCAL_SRC_FILES += \ bindings/js/JSCSSStyleDeclarationCustom.cpp \ bindings/js/JSCSSValueCustom.cpp \ bindings/js/JSCallbackData.cpp \ - bindings/js/JSCanvasArrayBufferConstructor.cpp \ - bindings/js/JSCanvasArrayCustom.cpp \ - bindings/js/JSCanvasByteArrayConstructor.cpp \ - bindings/js/JSCanvasByteArrayCustom.cpp \ - bindings/js/JSCanvasFloatArrayConstructor.cpp \ - bindings/js/JSCanvasFloatArrayCustom.cpp \ - bindings/js/JSCanvasIntArrayConstructor.cpp \ - bindings/js/JSCanvasIntArrayCustom.cpp \ bindings/js/JSCanvasNumberArrayCustom.cpp \ bindings/js/JSCanvasRenderingContext2DCustom.cpp \ - bindings/js/JSCanvasRenderingContext3DCustom.cpp \ bindings/js/JSCanvasRenderingContextCustom.cpp \ - bindings/js/JSCanvasShortArrayConstructor.cpp \ - bindings/js/JSCanvasShortArrayCustom.cpp \ - bindings/js/JSCanvasUnsignedByteArrayConstructor.cpp \ - bindings/js/JSCanvasUnsignedByteArrayCustom.cpp \ - bindings/js/JSCanvasUnsignedIntArrayConstructor.cpp \ - bindings/js/JSCanvasUnsignedIntArrayCustom.cpp \ - bindings/js/JSCanvasUnsignedShortArrayConstructor.cpp \ - bindings/js/JSCanvasUnsignedShortArrayCustom.cpp \ bindings/js/JSClipboardCustom.cpp \ bindings/js/JSConsoleCustom.cpp \ bindings/js/JSCoordinatesCustom.cpp \ @@ -153,6 +136,7 @@ LOCAL_SRC_FILES += \ bindings/js/JSPluginArrayCustom.cpp \ bindings/js/JSPluginCustom.cpp \ bindings/js/JSPluginElementFunctions.cpp \ + bindings/js/JSPopStateEventCustom.cpp \ bindings/js/JSSQLResultSetRowListCustom.cpp \ bindings/js/JSSQLTransactionCustom.cpp \ bindings/js/JSSVGElementInstanceCustom.cpp \ diff --git a/WebCore/Android.mk b/WebCore/Android.mk index 71522f5..46d9caa 100644 --- a/WebCore/Android.mk +++ b/WebCore/Android.mk @@ -110,6 +110,7 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ dom/Clipboard.cpp \ dom/ClipboardEvent.cpp \ dom/Comment.cpp \ + dom/CompositionEvent.cpp \ dom/ContainerNode.cpp \ dom/DOMImplementation.cpp \ dom/Document.cpp \ @@ -148,6 +149,7 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ dom/OptionGroupElement.cpp \ dom/OverflowEvent.cpp \ dom/PageTransitionEvent.cpp \ + dom/PopStateEvent.cpp \ dom/Position.cpp \ dom/PositionIterator.cpp \ dom/ProcessingInstruction.cpp \ @@ -256,34 +258,19 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ html/HTMLTokenizer.cpp \ html/HTMLViewSourceDocument.cpp \ html/ImageData.cpp \ + html/ISODateTime.cpp \ html/PreloadScanner.cpp \ html/TimeRanges.cpp \ html/ValidityState.cpp \ \ - html/canvas/CanvasArray.cpp \ - html/canvas/CanvasArrayBuffer.cpp \ - html/canvas/CanvasBuffer.cpp \ - html/canvas/CanvasByteArray.cpp \ - html/canvas/CanvasFloatArray.cpp \ - html/canvas/CanvasFramebuffer.cpp \ html/canvas/CanvasGradient.cpp \ - html/canvas/CanvasIntArray.cpp \ html/canvas/CanvasNumberArray.cpp \ html/canvas/CanvasObject.cpp \ html/canvas/CanvasPattern.cpp \ html/canvas/CanvasPixelArray.cpp \ - html/canvas/CanvasProgram.cpp \ - html/canvas/CanvasRenderbuffer.cpp \ html/canvas/CanvasRenderingContext.cpp \ html/canvas/CanvasRenderingContext2D.cpp \ - html/canvas/CanvasRenderingContext3D.cpp \ - html/canvas/CanvasShader.cpp \ - html/canvas/CanvasShortArray.cpp \ html/canvas/CanvasStyle.cpp \ - html/canvas/CanvasTexture.cpp \ - html/canvas/CanvasUnsignedByteArray.cpp \ - html/canvas/CanvasUnsignedIntArray.cpp \ - html/canvas/CanvasUnsignedShortArray.cpp \ \ loader/Cache.cpp \ loader/CachedCSSStyleSheet.cpp \ @@ -550,7 +537,7 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ platform/text/String.cpp \ platform/text/StringBuilder.cpp \ platform/text/StringImpl.cpp \ - platform/text/TextBoundariesICU.cpp \ + platform/text/TextBoundaries.cpp \ platform/text/TextBreakIteratorICU.cpp \ platform/text/TextCodec.cpp \ platform/text/TextCodecICU.cpp \ @@ -629,6 +616,10 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ rendering/RenderPath.cpp \ rendering/RenderReplaced.cpp \ rendering/RenderReplica.cpp \ + rendering/RenderRuby.cpp \ + rendering/RenderRubyBase.cpp \ + rendering/RenderRubyRun.cpp \ + rendering/RenderRubyText.cpp ifeq ($(ENABLE_SVG), true) LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ diff --git a/WebCore/Android.v8bindings.mk b/WebCore/Android.v8bindings.mk index f683fca..5ab8e69 100644 --- a/WebCore/Android.v8bindings.mk +++ b/WebCore/Android.v8bindings.mk @@ -82,25 +82,17 @@ LOCAL_SRC_FILES += \ bindings/v8/V8WorkerContextEventListener.cpp \ bindings/v8/WorkerContextExecutionProxy.cpp \ bindings/v8/WorkerScriptController.cpp \ + bindings/v8/WorldContextHandle.cpp \ \ bindings/v8/npruntime.cpp \ \ bindings/v8/custom/V8AbstractWorkerCustom.cpp \ bindings/v8/custom/V8AttrCustom.cpp \ bindings/v8/custom/V8CSSStyleDeclarationCustom.cpp \ - bindings/v8/custom/V8CanvasArrayBufferCustom.cpp \ - bindings/v8/custom/V8CanvasByteArrayCustom.cpp \ - bindings/v8/custom/V8CanvasFloatArrayCustom.cpp \ - bindings/v8/custom/V8CanvasIntArrayCustom.cpp \ - bindings/v8/custom/V8CanvasPixelArrayCustom.cpp \ bindings/v8/custom/V8CanvasRenderingContext2DCustom.cpp \ - bindings/v8/custom/V8CanvasRenderingContext3DCustom.cpp \ - bindings/v8/custom/V8CanvasShortArrayCustom.cpp \ - bindings/v8/custom/V8CanvasUnsignedByteArrayCustom.cpp \ - bindings/v8/custom/V8CanvasUnsignedIntArrayCustom.cpp \ - bindings/v8/custom/V8CanvasUnsignedShortArrayCustom.cpp \ bindings/v8/custom/V8ClientRectListCustom.cpp \ bindings/v8/custom/V8ClipboardCustom.cpp \ + bindings/v8/custom/V8ConsoleCustom.cpp \ bindings/v8/custom/V8CoordinatesCustom.cpp \ bindings/v8/custom/V8CustomBinding.cpp \ bindings/v8/custom/V8CustomEventListener.cpp \ @@ -123,6 +115,7 @@ LOCAL_SRC_FILES += \ bindings/v8/custom/V8EventCustom.cpp \ bindings/v8/custom/V8FileListCustom.cpp \ bindings/v8/custom/V8GeolocationCustom.cpp \ + bindings/v8/custom/V8HistoryCustom.cpp \ bindings/v8/custom/V8HTMLAllCollectionCustom.cpp \ bindings/v8/custom/V8HTMLAudioElementConstructor.cpp \ bindings/v8/custom/V8HTMLCanvasElementCustom.cpp \ |