Merge WebKit at r75993: Initial merge by git.

Change-Id: I602bbdc3974787a3b0450456a30a7868286921c3

1 files changed, 152 insertions, 94 deletions

diff --git a/Source/WebCore/GNUmakefile.am b/Source/WebCore/GNUmakefile.am
index 0841894..efbbb70 100644
--- a/Source/WebCore/GNUmakefile.am
+++ b/Source/WebCore/GNUmakefile.am
@@ -57,6 +57,7 @@ webcore_cppflags += \
 	-I$(srcdir)/Source/WebCore/plugins \
 	-I$(srcdir)/Source/WebCore/plugins/win \
 	-I$(srcdir)/Source/WebCore/rendering \
+	-I$(srcdir)/Source/WebCore/rendering/mathml \
 	-I$(srcdir)/Source/WebCore/rendering/style \
 	-I$(srcdir)/Source/WebCore/rendering/svg \
 	-I$(srcdir)/Source/WebCore/storage \
@@ -108,6 +109,7 @@ webcore_built_sources += \
 	DerivedSources/WebCore/HTMLEntityTable.cpp \
 	DerivedSources/WebCore/HTMLNames.cpp \
 	DerivedSources/WebCore/HTMLNames.h \
+	DerivedSources/WebCore/InjectedScriptSource.h \
 	DerivedSources/WebCore/InspectorBackendDispatcher.cpp \
 	DerivedSources/WebCore/InspectorBackendDispatcher.h \
 	DerivedSources/WebCore/InspectorFrontend.cpp \
@@ -235,6 +237,8 @@ webcore_built_sources += \
 	DerivedSources/WebCore/JSDOMStringMap.h \
 	DerivedSources/WebCore/JSDOMTokenList.cpp \
 	DerivedSources/WebCore/JSDOMTokenList.h \
+	DerivedSources/WebCore/JSDOMURL.cpp \
+	DerivedSources/WebCore/JSDOMURL.h \
 	DerivedSources/WebCore/JSDOMWindow.cpp \
 	DerivedSources/WebCore/JSDOMWindow.h \
 	DerivedSources/WebCore/JSElement.cpp \
@@ -1297,6 +1301,7 @@ webcore_sources += \
 	Source/WebCore/dom/TextEvent.cpp \
 	Source/WebCore/dom/TextEvent.h \
 	Source/WebCore/dom/Text.h \
+	Source/WebCore/dom/TouchList.h \
 	Source/WebCore/dom/TransformSource.h \
 	Source/WebCore/dom/TransformSourceLibxslt.cpp \
 	Source/WebCore/dom/Traversal.cpp \
@@ -1440,6 +1445,7 @@ webcore_sources += \
 	Source/WebCore/editing/visible_units.h \
 	Source/WebCore/editing/WrapContentsInDummySpanCommand.cpp \
 	Source/WebCore/editing/WrapContentsInDummySpanCommand.h \
+	Source/WebCore/editing/WritingDirection.h \
 	Source/WebCore/fileapi/AsyncFileWriter.h \
 	Source/WebCore/fileapi/AsyncFileWriterClient.h \
 	Source/WebCore/fileapi/BlobBuilder.cpp \
@@ -1561,6 +1567,7 @@ webcore_sources += \
 	Source/WebCore/html/canvas/CanvasRenderingContext.h \
 	Source/WebCore/html/canvas/CanvasStyle.cpp \
 	Source/WebCore/html/canvas/CanvasStyle.h \
+	Source/WebCore/html/canvas/CheckedInt.h \
 	Source/WebCore/html/canvas/DataView.cpp \
 	Source/WebCore/html/canvas/DataView.h \
 	Source/WebCore/html/canvas/Float32Array.cpp \
@@ -1571,8 +1578,10 @@ webcore_sources += \
 	Source/WebCore/html/canvas/Int32Array.h \
 	Source/WebCore/html/canvas/Int8Array.cpp \
 	Source/WebCore/html/canvas/Int8Array.h \
+	Source/WebCore/html/canvas/IntegralTypedArrayBase.h \
 	Source/WebCore/html/canvas/OESTextureFloat.cpp \
 	Source/WebCore/html/canvas/OESTextureFloat.h \
+	Source/WebCore/html/canvas/TypedArrayBase.h \
 	Source/WebCore/html/canvas/WebKitLoseContext.cpp \
 	Source/WebCore/html/canvas/WebKitLoseContext.h \
 	Source/WebCore/html/canvas/Uint16Array.cpp \
@@ -1611,6 +1620,8 @@ webcore_sources += \
 	Source/WebCore/html/DOMDataGridDataSource.h \
 	Source/WebCore/html/DOMFormData.cpp \
 	Source/WebCore/html/DOMFormData.h \
+	Source/WebCore/html/DOMURL.cpp \
+	Source/WebCore/html/DOMURL.h \
 	Source/WebCore/html/EmailInputType.cpp \
 	Source/WebCore/html/EmailInputType.h \
 	Source/WebCore/html/FileInputType.cpp \
@@ -1935,10 +1946,14 @@ webcore_sources += \
 	Source/WebCore/inspector/InjectedScriptHost.h \
 	Source/WebCore/inspector/InspectorApplicationCacheAgent.cpp \
 	Source/WebCore/inspector/InspectorApplicationCacheAgent.h \
+	Source/WebCore/inspector/InspectorBrowserDebuggerAgent.cpp \
+	Source/WebCore/inspector/InspectorBrowserDebuggerAgent.h \
 	Source/WebCore/inspector/InspectorClient.cpp \
 	Source/WebCore/inspector/InspectorClient.h \
 	Source/WebCore/inspector/InspectorController.cpp \
 	Source/WebCore/inspector/InspectorController.h \
+	Source/WebCore/inspector/InspectorConsoleAgent.cpp \
+	Source/WebCore/inspector/InspectorConsoleAgent.h \
 	Source/WebCore/inspector/InspectorCSSAgent.cpp \
 	Source/WebCore/inspector/InspectorCSSAgent.h \
 	Source/WebCore/inspector/InspectorDatabaseAgent.cpp \
@@ -1966,6 +1981,8 @@ webcore_sources += \
 	Source/WebCore/inspector/InspectorProfilerAgent.h \
 	Source/WebCore/inspector/InspectorResourceAgent.cpp \
 	Source/WebCore/inspector/InspectorResourceAgent.h \
+	Source/WebCore/inspector/InspectorSettings.cpp \
+	Source/WebCore/inspector/InspectorSettings.h \
 	Source/WebCore/inspector/InspectorState.cpp \
 	Source/WebCore/inspector/InspectorState.h \
 	Source/WebCore/inspector/InspectorStyleSheet.cpp \
@@ -2094,7 +2111,6 @@ webcore_sources += \
 	Source/WebCore/loader/ResourceLoader.h \
 	Source/WebCore/loader/ResourceLoadNotifier.cpp \
 	Source/WebCore/loader/ResourceLoadNotifier.h \
-	Source/WebCore/loader/ResourceLoadPriority.h \
 	Source/WebCore/loader/ResourceLoadScheduler.cpp \
 	Source/WebCore/loader/ResourceLoadScheduler.h \
 	Source/WebCore/loader/SinkDocument.cpp \
@@ -2122,26 +2138,6 @@ webcore_sources += \
 	Source/WebCore/mathml/MathMLMathElement.h \
 	Source/WebCore/mathml/MathMLTextElement.cpp \
 	Source/WebCore/mathml/MathMLTextElement.h \
-	Source/WebCore/mathml/RenderMathMLBlock.cpp \
-	Source/WebCore/mathml/RenderMathMLBlock.h \
-	Source/WebCore/mathml/RenderMathMLFenced.cpp \
-	Source/WebCore/mathml/RenderMathMLFenced.h \
-	Source/WebCore/mathml/RenderMathMLFraction.cpp \
-	Source/WebCore/mathml/RenderMathMLFraction.h \
-	Source/WebCore/mathml/RenderMathMLMath.cpp \
-	Source/WebCore/mathml/RenderMathMLMath.h \
-	Source/WebCore/mathml/RenderMathMLOperator.cpp \
-	Source/WebCore/mathml/RenderMathMLOperator.h \
-	Source/WebCore/mathml/RenderMathMLRoot.cpp \
-	Source/WebCore/mathml/RenderMathMLRoot.h \
-	Source/WebCore/mathml/RenderMathMLRow.cpp \
-	Source/WebCore/mathml/RenderMathMLRow.h \
-	Source/WebCore/mathml/RenderMathMLSquareRoot.cpp \
-	Source/WebCore/mathml/RenderMathMLSquareRoot.h \
-	Source/WebCore/mathml/RenderMathMLSubSup.cpp \
-	Source/WebCore/mathml/RenderMathMLSubSup.h \
-	Source/WebCore/mathml/RenderMathMLUnderOver.cpp \
-	Source/WebCore/mathml/RenderMathMLUnderOver.h \
 	Source/WebCore/notifications/NotificationCenter.cpp \
 	Source/WebCore/notifications/NotificationCenter.h \
 	Source/WebCore/notifications/NotificationContents.h \
@@ -2288,6 +2284,8 @@ webcore_sources += \
 	Source/WebCore/platform/Arena.cpp \
 	Source/WebCore/platform/Arena.h \
 	Source/WebCore/platform/AsyncFileStream.h \
+	Source/WebCore/platform/AsyncFileSystem.cpp \
+	Source/WebCore/platform/AsyncFileSystem.h \
 	Source/WebCore/platform/AutodrainedPool.h \
 	Source/WebCore/platform/ContentType.cpp \
 	Source/WebCore/platform/ContentType.h \
@@ -2437,8 +2435,6 @@ webcore_sources += \
 	Source/WebCore/platform/graphics/PathTraversalState.h \
 	Source/WebCore/platform/graphics/Pattern.cpp \
 	Source/WebCore/platform/graphics/Pattern.h \
-	Source/WebCore/platform/graphics/Pen.cpp \
-	Source/WebCore/platform/graphics/Pen.h \
 	Source/WebCore/platform/graphics/SegmentedFontData.cpp \
 	Source/WebCore/platform/graphics/SegmentedFontData.h \
 	Source/WebCore/platform/graphics/SimpleFontData.cpp \
@@ -2540,6 +2536,7 @@ webcore_sources += \
 	Source/WebCore/platform/network/ResourceHandle.h \
 	Source/WebCore/platform/network/ResourceHandleInternal.h \
 	Source/WebCore/platform/network/ResourceLoadInfo.h \
+	Source/WebCore/platform/network/ResourceLoadPriority.h \
 	Source/WebCore/platform/network/ResourceLoadTiming.h \
 	Source/WebCore/platform/network/ResourceRequestBase.cpp \
 	Source/WebCore/platform/network/ResourceRequestBase.h \
@@ -2742,8 +2739,6 @@ webcore_sources += \
 	Source/WebCore/rendering/RenderFileUploadControl.h \
 	Source/WebCore/rendering/RenderFlexibleBox.cpp \
 	Source/WebCore/rendering/RenderFlexibleBox.h \
-	Source/WebCore/rendering/RenderForeignObject.cpp \
-	Source/WebCore/rendering/RenderForeignObject.h \
 	Source/WebCore/rendering/RenderFrameBase.cpp \
 	Source/WebCore/rendering/RenderFrameBase.h \
 	Source/WebCore/rendering/RenderFrame.cpp \
@@ -2817,50 +2812,6 @@ webcore_sources += \
 	Source/WebCore/rendering/RenderSlider.h \
 	Source/WebCore/rendering/RenderSummary.cpp \
 	Source/WebCore/rendering/RenderSummary.h \
-	Source/WebCore/rendering/RenderSVGBlock.cpp \
-	Source/WebCore/rendering/RenderSVGBlock.h \
-	Source/WebCore/rendering/RenderSVGContainer.cpp \
-	Source/WebCore/rendering/RenderSVGContainer.h \
-	Source/WebCore/rendering/RenderSVGGradientStop.cpp \
-	Source/WebCore/rendering/RenderSVGGradientStop.h \
-	Source/WebCore/rendering/RenderSVGHiddenContainer.cpp \
-	Source/WebCore/rendering/RenderSVGHiddenContainer.h \
-	Source/WebCore/rendering/RenderSVGImage.cpp \
-	Source/WebCore/rendering/RenderSVGImage.h \
-	Source/WebCore/rendering/RenderSVGModelObject.cpp \
-	Source/WebCore/rendering/RenderSVGModelObject.h \
-	Source/WebCore/rendering/RenderSVGResourceClipper.cpp \
-	Source/WebCore/rendering/RenderSVGResourceClipper.h \
-	Source/WebCore/rendering/RenderSVGResourceContainer.cpp \
-	Source/WebCore/rendering/RenderSVGResourceContainer.h \
-	Source/WebCore/rendering/RenderSVGResource.cpp \
-	Source/WebCore/rendering/RenderSVGResourceFilter.cpp \
-	Source/WebCore/rendering/RenderSVGResourceFilter.h \
-	Source/WebCore/rendering/RenderSVGResourceFilterPrimitive.cpp \
-	Source/WebCore/rendering/RenderSVGResourceFilterPrimitive.h \
-	Source/WebCore/rendering/RenderSVGResourceGradient.cpp \
-	Source/WebCore/rendering/RenderSVGResourceGradient.h \
-	Source/WebCore/rendering/RenderSVGResource.h \
-	Source/WebCore/rendering/RenderSVGResourceLinearGradient.cpp \
-	Source/WebCore/rendering/RenderSVGResourceLinearGradient.h \
-	Source/WebCore/rendering/RenderSVGResourceMarker.cpp \
-	Source/WebCore/rendering/RenderSVGResourceMarker.h \
-	Source/WebCore/rendering/RenderSVGResourceMasker.cpp \
-	Source/WebCore/rendering/RenderSVGResourceMasker.h \
-	Source/WebCore/rendering/RenderSVGResourcePattern.cpp \
-	Source/WebCore/rendering/RenderSVGResourcePattern.h \
-	Source/WebCore/rendering/RenderSVGResourceRadialGradient.cpp \
-	Source/WebCore/rendering/RenderSVGResourceRadialGradient.h \
-	Source/WebCore/rendering/RenderSVGResourceSolidColor.cpp \
-	Source/WebCore/rendering/RenderSVGResourceSolidColor.h \
-	Source/WebCore/rendering/RenderSVGRoot.cpp \
-	Source/WebCore/rendering/RenderSVGRoot.h \
-	Source/WebCore/rendering/RenderSVGShadowTreeRootContainer.cpp \
-	Source/WebCore/rendering/RenderSVGShadowTreeRootContainer.h \
-	Source/WebCore/rendering/RenderSVGTransformableContainer.cpp \
-	Source/WebCore/rendering/RenderSVGTransformableContainer.h \
-	Source/WebCore/rendering/RenderSVGViewportContainer.cpp \
-	Source/WebCore/rendering/RenderSVGViewportContainer.h \
 	Source/WebCore/rendering/RenderTableCell.cpp \
 	Source/WebCore/rendering/RenderTableCell.h \
 	Source/WebCore/rendering/RenderTableCol.cpp \
@@ -2901,6 +2852,26 @@ webcore_sources += \
 	Source/WebCore/rendering/ShadowElement.cpp \
 	Source/WebCore/rendering/ShadowElement.h \
 	Source/WebCore/rendering/VerticalPositionCache.h \
+	Source/WebCore/rendering/mathml/RenderMathMLBlock.cpp \
+	Source/WebCore/rendering/mathml/RenderMathMLBlock.h \
+	Source/WebCore/rendering/mathml/RenderMathMLFenced.cpp \
+	Source/WebCore/rendering/mathml/RenderMathMLFenced.h \
+	Source/WebCore/rendering/mathml/RenderMathMLFraction.cpp \
+	Source/WebCore/rendering/mathml/RenderMathMLFraction.h \
+	Source/WebCore/rendering/mathml/RenderMathMLMath.cpp \
+	Source/WebCore/rendering/mathml/RenderMathMLMath.h \
+	Source/WebCore/rendering/mathml/RenderMathMLOperator.cpp \
+	Source/WebCore/rendering/mathml/RenderMathMLOperator.h \
+	Source/WebCore/rendering/mathml/RenderMathMLRoot.cpp \
+	Source/WebCore/rendering/mathml/RenderMathMLRoot.h \
+	Source/WebCore/rendering/mathml/RenderMathMLRow.cpp \
+	Source/WebCore/rendering/mathml/RenderMathMLRow.h \
+	Source/WebCore/rendering/mathml/RenderMathMLSquareRoot.cpp \
+	Source/WebCore/rendering/mathml/RenderMathMLSquareRoot.h \
+	Source/WebCore/rendering/mathml/RenderMathMLSubSup.cpp \
+	Source/WebCore/rendering/mathml/RenderMathMLSubSup.h \
+	Source/WebCore/rendering/mathml/RenderMathMLUnderOver.cpp \
+	Source/WebCore/rendering/mathml/RenderMathMLUnderOver.h \
 	Source/WebCore/rendering/style/BorderData.h \
 	Source/WebCore/rendering/style/BorderValue.h \
 	Source/WebCore/rendering/style/CollapsedBorderValue.h \
@@ -2959,41 +2930,87 @@ webcore_sources += \
 	Source/WebCore/rendering/style/SVGRenderStyleDefs.cpp \
 	Source/WebCore/rendering/style/SVGRenderStyleDefs.h \
 	Source/WebCore/rendering/style/SVGRenderStyle.h \
-	Source/WebCore/rendering/SVGImageBufferTools.cpp \
-	Source/WebCore/rendering/SVGImageBufferTools.h \
-	Source/WebCore/rendering/SVGMarkerData.h \
-	Source/WebCore/rendering/SVGMarkerLayoutInfo.cpp \
-	Source/WebCore/rendering/SVGMarkerLayoutInfo.h \
-	Source/WebCore/rendering/SVGRenderSupport.cpp \
-	Source/WebCore/rendering/SVGRenderSupport.h \
-	Source/WebCore/rendering/SVGRenderTreeAsText.cpp \
-	Source/WebCore/rendering/SVGRenderTreeAsText.h \
-	Source/WebCore/rendering/SVGResourcesCache.cpp \
-	Source/WebCore/rendering/SVGResourcesCache.h \
-	Source/WebCore/rendering/SVGResources.cpp \
-	Source/WebCore/rendering/SVGResourcesCycleSolver.cpp \
-	Source/WebCore/rendering/SVGResourcesCycleSolver.h \
-	Source/WebCore/rendering/SVGResources.h \
-	Source/WebCore/rendering/SVGShadowTreeElements.cpp \
-	Source/WebCore/rendering/SVGShadowTreeElements.h \
+	Source/WebCore/rendering/svg/RenderSVGBlock.cpp \
+	Source/WebCore/rendering/svg/RenderSVGBlock.h \
+	Source/WebCore/rendering/svg/RenderSVGContainer.cpp \
+	Source/WebCore/rendering/svg/RenderSVGContainer.h \
+	Source/WebCore/rendering/svg/RenderSVGForeignObject.cpp \
+	Source/WebCore/rendering/svg/RenderSVGForeignObject.h \
+	Source/WebCore/rendering/svg/RenderSVGGradientStop.cpp \
+	Source/WebCore/rendering/svg/RenderSVGGradientStop.h \
+	Source/WebCore/rendering/svg/RenderSVGHiddenContainer.cpp \
+	Source/WebCore/rendering/svg/RenderSVGHiddenContainer.h \
+	Source/WebCore/rendering/svg/RenderSVGImage.cpp \
+	Source/WebCore/rendering/svg/RenderSVGImage.h \
 	Source/WebCore/rendering/svg/RenderSVGInline.cpp \
 	Source/WebCore/rendering/svg/RenderSVGInline.h \
 	Source/WebCore/rendering/svg/RenderSVGInlineText.cpp \
 	Source/WebCore/rendering/svg/RenderSVGInlineText.h \
+	Source/WebCore/rendering/svg/RenderSVGModelObject.cpp \
+	Source/WebCore/rendering/svg/RenderSVGModelObject.h \
 	Source/WebCore/rendering/svg/RenderSVGPath.cpp \
 	Source/WebCore/rendering/svg/RenderSVGPath.h \
+	Source/WebCore/rendering/svg/RenderSVGResourceClipper.cpp \
+	Source/WebCore/rendering/svg/RenderSVGResourceClipper.h \
+	Source/WebCore/rendering/svg/RenderSVGResourceContainer.cpp \
+	Source/WebCore/rendering/svg/RenderSVGResourceContainer.h \
+	Source/WebCore/rendering/svg/RenderSVGResource.cpp \
+	Source/WebCore/rendering/svg/RenderSVGResourceFilter.cpp \
+	Source/WebCore/rendering/svg/RenderSVGResourceFilter.h \
+	Source/WebCore/rendering/svg/RenderSVGResourceFilterPrimitive.cpp \
+	Source/WebCore/rendering/svg/RenderSVGResourceFilterPrimitive.h \
+	Source/WebCore/rendering/svg/RenderSVGResourceGradient.cpp \
+	Source/WebCore/rendering/svg/RenderSVGResourceGradient.h \
+	Source/WebCore/rendering/svg/RenderSVGResource.h \
+	Source/WebCore/rendering/svg/RenderSVGResourceLinearGradient.cpp \
+	Source/WebCore/rendering/svg/RenderSVGResourceLinearGradient.h \
+	Source/WebCore/rendering/svg/RenderSVGResourceMarker.cpp \
+	Source/WebCore/rendering/svg/RenderSVGResourceMarker.h \
+	Source/WebCore/rendering/svg/RenderSVGResourceMasker.cpp \
+	Source/WebCore/rendering/svg/RenderSVGResourceMasker.h \
+	Source/WebCore/rendering/svg/RenderSVGResourcePattern.cpp \
+	Source/WebCore/rendering/svg/RenderSVGResourcePattern.h \
+	Source/WebCore/rendering/svg/RenderSVGResourceRadialGradient.cpp \
+	Source/WebCore/rendering/svg/RenderSVGResourceRadialGradient.h \
+	Source/WebCore/rendering/svg/RenderSVGResourceSolidColor.cpp \
+	Source/WebCore/rendering/svg/RenderSVGResourceSolidColor.h \
+	Source/WebCore/rendering/svg/RenderSVGRoot.cpp \
+	Source/WebCore/rendering/svg/RenderSVGRoot.h \
+	Source/WebCore/rendering/svg/RenderSVGShadowTreeRootContainer.cpp \
+	Source/WebCore/rendering/svg/RenderSVGShadowTreeRootContainer.h \
 	Source/WebCore/rendering/svg/RenderSVGTSpan.cpp \
 	Source/WebCore/rendering/svg/RenderSVGTSpan.h \
 	Source/WebCore/rendering/svg/RenderSVGText.cpp \
 	Source/WebCore/rendering/svg/RenderSVGText.h \
 	Source/WebCore/rendering/svg/RenderSVGTextPath.cpp \
 	Source/WebCore/rendering/svg/RenderSVGTextPath.h \
+	Source/WebCore/rendering/svg/RenderSVGTransformableContainer.cpp \
+	Source/WebCore/rendering/svg/RenderSVGTransformableContainer.h \
+	Source/WebCore/rendering/svg/RenderSVGViewportContainer.cpp \
+	Source/WebCore/rendering/svg/RenderSVGViewportContainer.h \
+	Source/WebCore/rendering/svg/SVGImageBufferTools.cpp \
+	Source/WebCore/rendering/svg/SVGImageBufferTools.h \
 	Source/WebCore/rendering/svg/SVGInlineFlowBox.cpp \
 	Source/WebCore/rendering/svg/SVGInlineFlowBox.h \
 	Source/WebCore/rendering/svg/SVGInlineTextBox.cpp \
 	Source/WebCore/rendering/svg/SVGInlineTextBox.h \
+	Source/WebCore/rendering/svg/SVGMarkerData.h \
+	Source/WebCore/rendering/svg/SVGMarkerLayoutInfo.cpp \
+	Source/WebCore/rendering/svg/SVGMarkerLayoutInfo.h \
+	Source/WebCore/rendering/svg/SVGRenderSupport.cpp \
+	Source/WebCore/rendering/svg/SVGRenderSupport.h \
+	Source/WebCore/rendering/svg/SVGRenderTreeAsText.cpp \
+	Source/WebCore/rendering/svg/SVGRenderTreeAsText.h \
+	Source/WebCore/rendering/svg/SVGResourcesCache.cpp \
+	Source/WebCore/rendering/svg/SVGResourcesCache.h \
+	Source/WebCore/rendering/svg/SVGResources.cpp \
+	Source/WebCore/rendering/svg/SVGResourcesCycleSolver.cpp \
+	Source/WebCore/rendering/svg/SVGResourcesCycleSolver.h \
+	Source/WebCore/rendering/svg/SVGResources.h \
 	Source/WebCore/rendering/svg/SVGRootInlineBox.cpp \
 	Source/WebCore/rendering/svg/SVGRootInlineBox.h \
+	Source/WebCore/rendering/svg/SVGShadowTreeElements.cpp \
+	Source/WebCore/rendering/svg/SVGShadowTreeElements.h \
 	Source/WebCore/rendering/svg/SVGTextChunk.cpp \
 	Source/WebCore/rendering/svg/SVGTextChunk.h \
 	Source/WebCore/rendering/svg/SVGTextChunkBuilder.cpp \
@@ -3696,7 +3713,6 @@ webcoregtk_sources += \
 	Source/WebCore/platform/gtk/GRefPtrGtk.cpp \
 	Source/WebCore/platform/gtk/GRefPtrGtk.h \
 	Source/WebCore/platform/gtk/gtk2drawing.c \
-	Source/WebCore/platform/gtk/gtk3drawing.c \
 	Source/WebCore/platform/gtk/gtkdrawing.h \
 	Source/WebCore/platform/gtk/GtkPluginWidget.cpp \
 	Source/WebCore/platform/gtk/GtkPluginWidget.h \
@@ -3734,8 +3750,7 @@ webcoregtk_sources += \
 	Source/WebCore/platform/gtk/TemporaryLinkStubs.cpp \
 	Source/WebCore/platform/gtk/WheelEventGtk.cpp \
 	Source/WebCore/platform/gtk/WidgetGtk.cpp \
-	Source/WebCore/platform/gtk/WidgetRenderingContextGtk2.cpp \
-	Source/WebCore/platform/gtk/WidgetRenderingContextGtk3.cpp \
+	Source/WebCore/platform/gtk/WidgetRenderingContext.cpp \
 	Source/WebCore/platform/gtk/WidgetRenderingContext.h \
 	Source/WebCore/platform/image-decoders/bmp/BMPImageDecoder.cpp \
 	Source/WebCore/platform/image-decoders/bmp/BMPImageDecoder.h \
@@ -3890,10 +3905,10 @@ FEATURE_DEFINES += ENABLE_DATAGRID=0
 webcore_cppflags += -DENABLE_DATAGRID=0
 
 # ----
-# HTML Meter Element - disable for now.
+# HTML Meter Element
 # ----
-FEATURE_DEFINES += ENABLE_METER_TAG=0
-webcore_cppflags += -DENABLE_METER_TAG=0
+FEATURE_DEFINES += ENABLE_METER_TAG=1
+webcore_cppflags += -DENABLE_METER_TAG=1
 
 # ----
 # HTML Progress Element
@@ -4070,8 +4085,6 @@ webcore_built_sources += \
 	DerivedSources/WebCore/JSFileEntry.h \
 	DerivedSources/WebCore/JSFileEntrySync.cpp \
 	DerivedSources/WebCore/JSFileEntrySync.h \
-	DerivedSources/WebCore/JSFileException.cpp \
-	DerivedSources/WebCore/JSFileException.h \
 	DerivedSources/WebCore/JSFileSystemCallback.cpp \
 	DerivedSources/WebCore/JSFileSystemCallback.h \
 	DerivedSources/WebCore/JSFileWriter.cpp \
@@ -4782,6 +4795,8 @@ DerivedSources/WebCore/InspectorFrontend.h: DerivedSources/WebCore/InspectorFron
 DerivedSources/WebCore/InspectorFrontend.cpp: DerivedSources/WebCore/InspectorBackendStub.js
 DerivedSources/WebCore/InspectorBackendStub.js: DerivedSources/WebCore/InspectorBackendDispatcher.h
 DerivedSources/WebCore/InspectorBackendDispatcher.h: DerivedSources/WebCore/InspectorBackendDispatcher.cpp
+DerivedSources/WebCore/InjectedScriptSource.h: $(WebCore)/inspector/InjectedScriptSource.js
+	perl $(WebCore)/inspector/xxd.pl InjectedScriptSource_js $(WebCore)/inspector/InjectedScriptSource.js $(GENSOURCES_WEBCORE)/InjectedScriptSource.h
 
 IDL_PATH := \
     $(WebCore)/bindings/js \
@@ -4812,6 +4827,49 @@ DerivedSources/WebCore/JS%.cpp: DerivedSources/WebCore/JS%.h;
 DerivedSources/WebCore/JS%.h: %.idl $(SCRIPTS_BINDINGS) $(WebCore)/bindings/scripts/CodeGeneratorJS.pm
 	$(AM_V_GEN)$(PERL) -I$(WebCore)/bindings/scripts $(WebCore)/bindings/scripts/generate-bindings.pl $(IDL_PATH:%=--include "%") --outputDir "$(GENSOURCES_WEBCORE)" --defines "LANGUAGE_JAVASCRIPT=1 $(FEATURE_DEFINES)" --generator JS $<
 
+noinst_LTLIBRARIES += \
+	libWebCore.la
+
+nodist_EXTRA_libWebCore_la_SOURCES = \
+	$(webcore_built_nosources)
+
+nodist_libWebCore_la_SOURCES = \
+	$(webcore_built_sources)
+
+libWebCore_la_SOURCES = \
+	$(webcore_sources)
+
+libWebCore_la_CXXFLAGS = \
+	$(SYMBOL_VISIBILITY_INLINES) \
+	$(global_cxxflags)
+
+libWebCore_la_CFLAGS = \
+	$(SYMBOL_VISIBILITY) \
+	$(global_cflags)
+
+libWebCore_la_CPPFLAGS = \
+	-DBUILDING_WEBKIT \
+	$(global_cppflags) \
+	$(webcore_cppflags) \
+	$(webcoregtk_cppflags) \
+	$(javascriptcore_cppflags) \
+	-fno-strict-aliasing \
+	$(HILDON_CPPFLAGS) \
+	$(COVERAGE_CFLAGS) \
+	$(ENCHANT_CFLAGS) \
+	$(GAIL_CFLAGS) \
+	$(GEOCLUE_CFLAGS) \
+	$(GLIB_CFLAGS) \
+	$(GSTREAMER_CFLAGS) \
+	$(GTK_CFLAGS) \
+	$(HILDON_CFLAGS) \
+	$(LIBSOUP_CFLAGS) \
+	$(LIBXML_CFLAGS) \
+	$(LIBXSLT_CFLAGS) \
+	$(SQLITE3_CFLAGS) \
+	$(UNICODE_CFLAGS) \
+	$(XT_CFLAGS)
+
 EXTRA_DIST += \
 	$(shell ls $(srcdir)/Source/WebCore/css/*.idl) \
 	$(shell ls $(srcdir)/Source/WebCore/dom/*.idl) \