From b5e614dc4ea95814db4102ea6acf78d1d36949d6 Mon Sep 17 00:00:00 2001 From: Ben Murdoch Date: Thu, 13 Aug 2009 16:08:11 +0100 Subject: Fix some build errors. --- WebCore/Android.v8.derived.mk | 2 +- WebCore/Android.v8.mk | 13 ++++++------- WebCore/bindings/v8/DOMObjectsInclude.h | 6 +++--- WebCore/bindings/v8/V8Index.h | 8 ++++---- 4 files changed, 14 insertions(+), 15 deletions(-) (limited to 'WebCore') diff --git a/WebCore/Android.v8.derived.mk b/WebCore/Android.v8.derived.mk index 115dc38..4c68804 100644 --- a/WebCore/Android.v8.derived.mk +++ b/WebCore/Android.v8.derived.mk @@ -158,7 +158,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # user agent style sheets -style_sheets := $(LOCAL_PATH)/css/html4.css $(LOCAL_PATH)/css/quirks.css $(LOCAL_PATH)/css/view-source.css $(LOCAL_PATH)/css/mediaControls.css +style_sheets := $(LOCAL_PATH)/css/html.css $(LOCAL_PATH)/css/quirks.css $(LOCAL_PATH)/css/view-source.css $(LOCAL_PATH)/css/mediaControls.css ifeq ($(ENABLE_SVG), true) style_sheets := $(style_sheets) $(LOCAL_PATH)/css/svg.css endif diff --git a/WebCore/Android.v8.mk b/WebCore/Android.v8.mk index 2dca6a4..210a352 100644 --- a/WebCore/Android.v8.mk +++ b/WebCore/Android.v8.mk @@ -181,7 +181,6 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ dom/Comment.cpp \ dom/ContainerNode.cpp \ dom/DOMImplementation.cpp \ - dom/DOMStringList.cpp \ dom/Document.cpp \ dom/DocumentFragment.cpp \ dom/DocumentType.cpp \ @@ -227,7 +226,6 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ dom/SelectElement.cpp \ dom/SelectorNodeList.cpp \ dom/StaticNodeList.cpp \ - dom/StaticStringList.cpp \ dom/StyleElement.cpp \ dom/StyledElement.cpp \ dom/TagNodeList.cpp \ @@ -301,11 +299,6 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ history/HistoryItem.cpp \ history/PageCache.cpp \ \ - html/CanvasGradient.cpp \ - html/CanvasPattern.cpp \ - html/CanvasPixelArray.cpp \ - html/CanvasRenderingContext2D.cpp \ - html/CanvasStyle.cpp \ html/CollectionCache.cpp \ html/File.cpp \ html/FormDataList.cpp \ @@ -325,6 +318,12 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ html/PreloadScanner.cpp \ html/TimeRanges.cpp \ \ + html/canvas/CanvasGradient.cpp \ + html/canvas/CanvasPattern.cpp \ + html/canvas/CanvasPixelArray.cpp \ + html/canvas/CanvasRenderingContext2D.cpp \ + html/canvas/CanvasStyle.cpp \ + \ loader/Cache.cpp \ loader/CachedCSSStyleSheet.cpp \ loader/CachedFont.cpp \ diff --git a/WebCore/bindings/v8/DOMObjectsInclude.h b/WebCore/bindings/v8/DOMObjectsInclude.h index 9d21885..6f36f3b 100644 --- a/WebCore/bindings/v8/DOMObjectsInclude.h +++ b/WebCore/bindings/v8/DOMObjectsInclude.h @@ -125,13 +125,10 @@ #include "SQLResultSetRowList.h" #include "StyleSheet.h" #include "StyleSheetList.h" -#include "SVGColor.h" -#include "SVGPaint.h" #include "TextEvent.h" #include "TextMetrics.h" #include "TimeRanges.h" #include "TreeWalker.h" -#include "XSLTProcessor.h" #include "V8AbstractEventListener.h" #include "V8CustomEventListener.h" #include "V8DOMWindow.h" @@ -158,6 +155,7 @@ #include "XPathExpression.h" #include "XPathNSResolver.h" #include "XPathResult.h" +#include "XSLTProcessor.h" #if ENABLE(OFFLINE_WEB_APPLICATIONS) #include "DOMApplicationCache.h" @@ -184,6 +182,7 @@ #if ENABLE(SVG) #include "SVGAngle.h" #include "SVGAnimatedPoints.h" +#include "SVGColor.h" #include "SVGElement.h" #include "SVGElementInstance.h" #include "SVGElementInstanceList.h" @@ -191,6 +190,7 @@ #include "SVGLength.h" #include "SVGLengthList.h" #include "SVGNumberList.h" +#include "SVGPaint.h" #include "SVGPathSeg.h" #include "SVGPathSegArc.h" #include "SVGPathSegClosePath.h" diff --git a/WebCore/bindings/v8/V8Index.h b/WebCore/bindings/v8/V8Index.h index e298125..1df015f 100644 --- a/WebCore/bindings/v8/V8Index.h +++ b/WebCore/bindings/v8/V8Index.h @@ -432,7 +432,7 @@ typedef v8::Persistent (*FunctionTemplateFactory)(); V(COORDINATES, Coordinates) \ V(GEOLOCATION, Geolocation) \ V(GEOPOSITION, Geoposition) \ - V(POSITIONERROR, PositionError) \ + V(POSITIONERROR, PositionError) #else #define DOM_OBJECT_GEOLOCATION_TYPES(V) #endif @@ -441,9 +441,9 @@ typedef v8::Persistent (*FunctionTemplateFactory)(); #define DOM_OBJECT_TOUCH_EVENT_TYPES(V) \ V(TOUCHLIST, TouchList) \ V(TOUCHEVENT, TouchEvent) \ - V(TOUCH, Touch) \ + V(TOUCH, Touch) #else -#define DOM_OBJECT_TOUCH_EVENT_TYPES(V) \ +#define DOM_OBJECT_TOUCH_EVENT_TYPES(V) #endif #if PLATFORM(CHROMIUM) @@ -453,7 +453,7 @@ typedef v8::Persistent (*FunctionTemplateFactory)(); DOM_OBJECT_DATABASE_TYPES(V) \ DOM_OBJECT_STORAGE_TYPES(V) \ DOM_OBJECT_WORKERS_TYPES(V) -#elif PALTFORM(ANDROID) +#elif PLATFORM(ANDROID) #define DOM_OBJECT_TYPES(V) \ DOM_OBJECT_TYPES_1(V) \ DOM_OBJECT_TYPES_2(V) \ -- cgit v1.1