From cac0f67c402d107cdb10971b95719e2ff9c7c76b Mon Sep 17 00:00:00 2001 From: Steve Block Date: Thu, 5 Nov 2009 09:23:40 +0000 Subject: Merge webkit.org at r50258 : Initial merge by git. Change-Id: I1a9e1dc4ed654b69174ad52a4f031a07240f37b0 --- WebCore/bindings/v8/DerivedSourcesAllInOne.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'WebCore/bindings/v8/DerivedSourcesAllInOne.cpp') diff --git a/WebCore/bindings/v8/DerivedSourcesAllInOne.cpp b/WebCore/bindings/v8/DerivedSourcesAllInOne.cpp index 98832f3..4aeee0c 100644 --- a/WebCore/bindings/v8/DerivedSourcesAllInOne.cpp +++ b/WebCore/bindings/v8/DerivedSourcesAllInOne.cpp @@ -34,6 +34,7 @@ #include "bindings/V8Attr.cpp" #include "bindings/V8BarInfo.cpp" #include "bindings/V8BeforeLoadEvent.cpp" +#include "bindings/V8CanvasActiveInfo.cpp" #include "bindings/V8CanvasArray.cpp" #include "bindings/V8CanvasArrayBuffer.cpp" #include "bindings/V8CanvasBuffer.cpp" @@ -253,6 +254,10 @@ #if ENABLE(SHARED_WORKERS) #include "bindings/V8SharedWorker.cpp" +<<<<<<< HEAD:WebCore/bindings/v8/DerivedSourcesAllInOne.cpp +======= +#include "bindings/V8SharedWorkerContext.cpp" +>>>>>>> webkit.org at r50258.:WebCore/bindings/v8/DerivedSourcesAllInOne.cpp #endif #if ENABLE(SVG) @@ -361,7 +366,6 @@ #include "bindings/V8SVGTRefElement.cpp" #include "bindings/V8SVGTSpanElement.cpp" #include "bindings/V8SVGUnitTypes.cpp" -#include "bindings/V8SVGURIReference.cpp" #include "bindings/V8SVGUseElement.cpp" #include "bindings/V8SVGViewElement.cpp" #include "bindings/V8SVGZoomEvent.cpp" @@ -382,6 +386,7 @@ #if ENABLE(INSPECTOR) #include "bindings/V8InspectorBackend.cpp" #endif +<<<<<<< HEAD:WebCore/bindings/v8/DerivedSourcesAllInOne.cpp #if PLATFORM(ANDROID) // TODO: Upstream NOTIFICATIONS guard. @@ -390,3 +395,5 @@ #include "bindings/V8NotificationCenter.cpp" #endif #endif +======= +>>>>>>> webkit.org at r50258.:WebCore/bindings/v8/DerivedSourcesAllInOne.cpp -- cgit v1.1