diff options
| author | Steve Block <steveblock@google.com> | 2009-11-05 09:23:40 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2009-11-10 22:41:12 +0000 |
| commit | cac0f67c402d107cdb10971b95719e2ff9c7c76b (patch) | |
| tree | d182c7f87211c6f201a5f038e332336493ebdbe7 /WebCore/bindings/v8/DerivedSourcesAllInOne.cpp | |
| parent | 4b2ef0f288e7c6c4602f621b7a0e9feed304b70e (diff) | |
| download | external_webkit-cac0f67c402d107cdb10971b95719e2ff9c7c76b.zip external_webkit-cac0f67c402d107cdb10971b95719e2ff9c7c76b.tar.gz external_webkit-cac0f67c402d107cdb10971b95719e2ff9c7c76b.tar.bz2 | |
Merge webkit.org at r50258 : Initial merge by git.
Change-Id: I1a9e1dc4ed654b69174ad52a4f031a07240f37b0
Diffstat (limited to 'WebCore/bindings/v8/DerivedSourcesAllInOne.cpp')
| -rw-r--r-- | WebCore/bindings/v8/DerivedSourcesAllInOne.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
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 |