diff options
Diffstat (limited to 'WebCore')
| -rw-r--r-- | WebCore/Android.derived.mk | 36 | ||||
| -rw-r--r-- | WebCore/Android.mk | 64 | ||||
| -rw-r--r-- | WebCore/Android.v8.mk | 34 | ||||
| -rw-r--r-- | WebCore/config.h | 4 |
4 files changed, 124 insertions, 14 deletions
diff --git a/WebCore/Android.derived.mk b/WebCore/Android.derived.mk index c505908..7a5cd0a 100644 --- a/WebCore/Android.derived.mk +++ b/WebCore/Android.derived.mk @@ -259,6 +259,7 @@ $(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/css/%.cpp : $(intermediates)/css/ GEN := \ $(intermediates)/dom/JSAttr.h \ + $(intermediates)/dom/JSBeforeLoadEvent.h \ $(intermediates)/dom/JSCDATASection.h \ $(intermediates)/dom/JSCharacterData.h \ $(intermediates)/dom/JSClientRect.h \ @@ -289,6 +290,7 @@ GEN := \ $(intermediates)/dom/JSNodeList.h \ $(intermediates)/dom/JSNotation.h \ $(intermediates)/dom/JSOverflowEvent.h \ + $(intermediates)/dom/JSPageTransitionEvent.h \ $(intermediates)/dom/JSProcessingInstruction.h \ $(intermediates)/dom/JSProgressEvent.h \ $(intermediates)/dom/JSRange.h \ @@ -330,11 +332,12 @@ GEN := \ $(intermediates)/html/JSHTMLBodyElement.h \ $(intermediates)/html/JSHTMLButtonElement.h \ $(intermediates)/html/JSHTMLCanvasElement.h \ - $(intermediates)/html/JSHTMLCollection.h \ + $(intermediates)/html/JSHTMLCollection.h \ $(intermediates)/html/JSHTMLDataGridElement.h \ $(intermediates)/html/JSHTMLDataGridCellElement.h \ $(intermediates)/html/JSHTMLDataGridColElement.h \ $(intermediates)/html/JSHTMLDataGridRowElement.h \ + $(intermediates)/html/JSHTMLDataListElement.h \ $(intermediates)/html/JSHTMLDListElement.h \ $(intermediates)/html/JSHTMLDirectoryElement.h \ $(intermediates)/html/JSHTMLDivElement.h \ @@ -405,9 +408,27 @@ LOCAL_GENERATED_SOURCES += $(GEN) $(GEN:%.h=%.cpp) $(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/html/%.cpp : $(intermediates)/html/%.h GEN := \ - $(intermediates)/html/canvas/JSCanvasGradient.h \ - $(intermediates)/html/canvas/JSCanvasPattern.h \ - $(intermediates)/html/canvas/JSCanvasRenderingContext2D.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 $(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 $@) $< @@ -420,7 +441,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) $(GEN:%.h=%.cpp) $(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/html/canvas/%.cpp : $(intermediates)/html/canvas/%.h GEN := \ - $(intermediates)/inspector/JSInspectorBackend.h \ + $(intermediates)/inspector/JSInspectorBackend.h \ $(intermediates)/inspector/JSJavaScriptCallFrame.h $(GEN): PRIVATE_PATH := $(LOCAL_PATH) @@ -454,7 +475,7 @@ $(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/loader/appcache/%.cpp : $(interme GEN := \ $(intermediates)/page/JSBarInfo.h \ $(intermediates)/page/JSConsole.h \ - $(intermediates)/page/JSCoordinates.h \ + $(intermediates)/page/JSCoordinates.h \ $(intermediates)/page/JSDOMSelection.h \ $(intermediates)/page/JSDOMWindow.h \ $(intermediates)/page/JSGeolocation.h \ @@ -553,7 +574,6 @@ GEN := \ $(intermediates)/svg/JSSVGColor.h \ $(intermediates)/svg/JSSVGComponentTransferFunctionElement.h \ $(intermediates)/svg/JSSVGCursorElement.h \ - $(intermediates)/svg/JSSVGDefinitionSrcElement.h \ $(intermediates)/svg/JSSVGDefsElement.h \ $(intermediates)/svg/JSSVGDescElement.h \ $(intermediates)/svg/JSSVGDocument.h \ @@ -702,7 +722,7 @@ GEN := \ $(intermediates)/xml/JSXMLHttpRequestUpload.h \ $(intermediates)/xml/JSXMLSerializer.h \ $(intermediates)/xml/JSXPathEvaluator.h \ - $(intermediates)/xml/JSXPathException.h \ + $(intermediates)/xml/JSXPathException.h \ $(intermediates)/xml/JSXPathExpression.h \ $(intermediates)/xml/JSXPathNSResolver.h \ $(intermediates)/xml/JSXPathResult.h \ diff --git a/WebCore/Android.mk b/WebCore/Android.mk index 156ef99..bb83f10 100644 --- a/WebCore/Android.mk +++ b/WebCore/Android.mk @@ -37,11 +37,10 @@ # editing/BackForwardListChromium.cpp \ # editing/SmartReplace*.cpp \ # history/BackForwardListChromium.cpp \ -# html/HTMLElementsAllInOne.cpp \ +# html/HTMLElementsAllInOne.cpp \ # loader/CachedXBLDocument.cpp \ # loader/CachedXSLStyleSheet.cpp \ # loader/FTP*.cpp \ -# loader/UserStyleSheetLoader.cpp \ # loader/icon/IconDatabaseNone.cpp \ # page/AXObjectCache.cpp \ # page/Accessibility*.cpp \ @@ -129,9 +128,30 @@ LOCAL_SRC_FILES := \ bindings/js/JSAudioConstructor.cpp \ bindings/js/JSCDATASectionCustom.cpp \ bindings/js/JSCSSRuleCustom.cpp \ + bindings/js/JSCSSRuleListCustom.cpp \ 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 \ @@ -143,6 +163,7 @@ LOCAL_SRC_FILES := \ bindings/js/JSCustomSQLTransactionErrorCallback.cpp \ bindings/js/JSCustomVoidCallback.cpp \ bindings/js/JSCustomXPathNSResolver.cpp \ + bindings/js/JSDesktopNotificationsCustom.cpp \ bindings/js/JSDOMApplicationCacheCustom.cpp \ bindings/js/JSDOMBinding.cpp \ bindings/js/JSDOMGlobalObject.cpp \ @@ -162,6 +183,7 @@ LOCAL_SRC_FILES := \ bindings/js/JSGeolocationCustom.cpp \ bindings/js/JSHTMLAllCollection.cpp \ bindings/js/JSHTMLAppletElementCustom.cpp \ + bindings/js/JSHTMLCanvasElementCustom.cpp \ bindings/js/JSHTMLCollectionCustom.cpp \ bindings/js/JSHTMLDataGridElementCustom.cpp \ bindings/js/JSHTMLDocumentCustom.cpp \ @@ -186,10 +208,10 @@ LOCAL_SRC_FILES := \ bindings/js/JSLocationCustom.cpp \ bindings/js/JSMessageChannelConstructor.cpp \ bindings/js/JSMessageChannelCustom.cpp \ + bindings/js/JSMessageEventCustom.cpp \ bindings/js/JSMessagePortCustom.cpp \ bindings/js/JSMimeTypeArrayCustom.cpp \ bindings/js/JSNamedNodeMapCustom.cpp \ - bindings/js/JSNamedNodesCollection.cpp \ bindings/js/JSNavigatorCustom.cpp \ bindings/js/JSNodeCustom.cpp \ bindings/js/JSNodeFilterCondition.cpp \ @@ -210,7 +232,6 @@ LOCAL_SRC_FILES := \ bindings/js/JSSVGPointListCustom.cpp \ bindings/js/JSSVGTransformListCustom.cpp \ bindings/js/JSSharedWorkerConstructor.cpp \ - bindings/js/JSSharedWorkerContextCustom.cpp \ bindings/js/JSSharedWorkerCustom.cpp \ bindings/js/JSStorageCustom.cpp \ bindings/js/JSStyleSheetCustom.cpp \ @@ -240,6 +261,7 @@ LOCAL_SRC_FILES := \ bindings/js/ScriptObject.cpp \ bindings/js/ScriptState.cpp \ bindings/js/ScriptValue.cpp \ + bindings/js/SerializedScriptValue.cpp \ bindings/js/WorkerScriptController.cpp \ \ bridge/IdentifierRep.cpp \ @@ -383,6 +405,7 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ dom/OptionElement.cpp \ dom/OptionGroupElement.cpp \ dom/OverflowEvent.cpp \ + dom/PageTransitionEvent.cpp \ dom/Position.cpp \ dom/PositionIterator.cpp \ dom/ProcessingInstruction.cpp \ @@ -477,6 +500,7 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ html/FileList.cpp \ html/FormDataList.cpp \ html/HTMLCollection.cpp \ + html/HTMLDataListElement.cpp \ html/HTMLDocument.cpp \ html/HTMLElementsAllInOne.cpp \ html/HTMLFormCollection.cpp \ @@ -493,11 +517,30 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ 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 \ @@ -526,7 +569,10 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ loader/NetscapePlugInStreamLoader.cpp \ loader/PlaceholderDocument.cpp \ loader/PluginDocument.cpp \ + loader/PolicyCallback.cpp \ + loader/PolicyChecker.cpp \ loader/ProgressTracker.cpp \ + loader/RedirectScheduler.cpp \ loader/Request.cpp \ loader/ResourceLoader.cpp \ loader/SubresourceLoader.cpp \ @@ -569,13 +615,16 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ page/MouseEventWithHitTestResults.cpp \ page/Navigator.cpp \ page/NavigatorBase.cpp \ + page/OriginAccessEntry.cpp \ page/Page.cpp \ page/PageGroup.cpp \ page/PageGroupLoadDeferrer.cpp \ + page/PluginHalter.cpp \ page/PrintContext.cpp \ page/Screen.cpp \ page/SecurityOrigin.cpp \ page/Settings.cpp \ + page/UserContentURLPattern.cpp \ page/WindowFeatures.cpp \ page/WorkerNavigator.cpp \ page/XSSAuditor.cpp \ @@ -661,6 +710,7 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ platform/graphics/GraphicsLayer.cpp \ platform/graphics/GraphicsTypes.cpp \ platform/graphics/Image.cpp \ + platform/graphics/ImageSource.cpp \ platform/graphics/IntRect.cpp \ platform/graphics/MediaPlayer.cpp \ platform/graphics/Path.cpp \ @@ -725,6 +775,7 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ \ platform/network/AuthenticationChallengeBase.cpp \ platform/network/Credential.cpp \ + platform/network/CredentialStorage.cpp \ platform/network/FormData.cpp \ platform/network/FormDataBuilder.cpp \ platform/network/HTTPHeaderMap.cpp \ @@ -735,6 +786,7 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ platform/network/ResourceHandle.cpp \ platform/network/ResourceRequestBase.cpp \ platform/network/ResourceResponseBase.cpp \ + platform/network/SocketStreamHandleBase.cpp \ \ platform/network/android/Cookie.cpp \ platform/network/android/ResourceHandleAndroid.cpp \ @@ -941,10 +993,13 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ storage/SQLResultSetRowList.cpp \ storage/SQLStatement.cpp \ storage/SQLTransaction.cpp \ + storage/SQLTransactionClient.cpp \ + storage/SQLTransactionCoordinator.cpp \ storage/Storage.cpp \ storage/StorageAreaImpl.cpp \ storage/StorageAreaSync.cpp \ storage/StorageEvent.cpp \ + storage/StorageEventDispatcher.cpp \ storage/StorageMap.cpp \ storage/StorageNamespace.cpp \ storage/StorageNamespaceImpl.cpp \ @@ -969,7 +1024,6 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ svg/SVGColor.cpp \ svg/SVGComponentTransferFunctionElement.cpp \ svg/SVGCursorElement.cpp \ - svg/SVGDefinitionSrcElement.cpp \ svg/SVGDefsElement.cpp \ svg/SVGDescElement.cpp \ svg/SVGDocument.cpp \ diff --git a/WebCore/Android.v8.mk b/WebCore/Android.v8.mk index 7973d06..e46d7e6 100644 --- a/WebCore/Android.v8.mk +++ b/WebCore/Android.v8.mk @@ -217,6 +217,7 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ dom/OptionElement.cpp \ dom/OptionGroupElement.cpp \ dom/OverflowEvent.cpp \ + dom/PageTransitionEvent.cpp \ dom/Position.cpp \ dom/PositionIterator.cpp \ dom/ProcessingInstruction.cpp \ @@ -308,6 +309,7 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ html/File.cpp \ html/FormDataList.cpp \ html/HTMLCollection.cpp \ + html/HTMLDataListElement.cpp \ html/HTMLDocument.cpp \ html/FileList.cpp \ html/HTMLElementsAllInOne.cpp \ @@ -325,11 +327,30 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ 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 \ @@ -355,7 +376,10 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ loader/NetscapePlugInStreamLoader.cpp \ loader/PlaceholderDocument.cpp \ loader/PluginDocument.cpp \ + loader/PolicyCallback.cpp \ + loader/PolicyChecker.cpp \ loader/ProgressTracker.cpp \ + loader/RedirectScheduler.cpp \ loader/Request.cpp \ loader/ResourceLoader.cpp \ loader/SubresourceLoader.cpp \ @@ -397,13 +421,16 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ page/MouseEventWithHitTestResults.cpp \ page/Navigator.cpp \ page/NavigatorBase.cpp \ + page/OriginAccessEntry.cpp \ page/Page.cpp \ page/PageGroup.cpp \ page/PageGroupLoadDeferrer.cpp \ + page/PluginHalter.cpp \ page/PrintContext.cpp \ page/Screen.cpp \ page/SecurityOrigin.cpp \ page/Settings.cpp \ + page/UserContentURLPattern.cpp \ page/WindowFeatures.cpp \ page/WorkerNavigator.cpp \ page/XSSAuditor.cpp \ @@ -491,6 +518,7 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ platform/graphics/GraphicsLayer.cpp \ platform/graphics/GraphicsTypes.cpp \ platform/graphics/Image.cpp \ + platform/graphics/ImageSource.cpp \ platform/graphics/IntRect.cpp \ platform/graphics/MediaPlayer.cpp \ platform/graphics/Path.cpp \ @@ -555,6 +583,7 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ \ platform/network/AuthenticationChallengeBase.cpp \ platform/network/Credential.cpp \ + platform/network/CredentialStorage.cpp \ platform/network/FormData.cpp \ platform/network/FormDataBuilder.cpp \ platform/network/HTTPHeaderMap.cpp \ @@ -565,6 +594,7 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ platform/network/ResourceHandle.cpp \ platform/network/ResourceRequestBase.cpp \ platform/network/ResourceResponseBase.cpp \ + platform/network/SocketStreamHandleBase.cpp \ \ platform/network/android/Cookie.cpp \ platform/network/android/ResourceHandleAndroid.cpp \ @@ -766,10 +796,13 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ storage/SQLResultSetRowList.cpp \ storage/SQLStatement.cpp \ storage/SQLTransaction.cpp \ + storage/SQLTransactionClient.cpp \ + storage/SQLTransactionCoordinator.cpp \ storage/Storage.cpp \ storage/StorageAreaImpl.cpp \ storage/StorageAreaSync.cpp \ storage/StorageEvent.cpp \ + storage/StorageEventDispatcher.cpp \ storage/StorageMap.cpp \ storage/StorageNamespace.cpp \ storage/StorageNamespaceImpl.cpp \ @@ -795,7 +828,6 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ svg/SVGColor.cpp \ svg/SVGComponentTransferFunctionElement.cpp \ svg/SVGCursorElement.cpp \ - svg/SVGDefinitionSrcElement.cpp \ svg/SVGDefsElement.cpp \ svg/SVGDescElement.cpp \ svg/SVGDocument.cpp \ diff --git a/WebCore/config.h b/WebCore/config.h index 888644b..3d3e274 100644 --- a/WebCore/config.h +++ b/WebCore/config.h @@ -128,6 +128,10 @@ #define ENABLE_TOUCH_EVENTS 1 #undef ENABLE_GEOLOCATION #define ENABLE_GEOLOCATION 1 +#undef ENABLE_INSPECTOR +#define ENABLE_INSPECTOR 0 +#undef ENABLE_EVENT_SOURCE +#define ENABLE_EVENT_SOURCE 0 #endif // PLATFORM(ANDROID) #ifdef __cplusplus |