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/V8Index.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/V8Index.cpp')
| -rw-r--r-- | WebCore/bindings/v8/V8Index.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/WebCore/bindings/v8/V8Index.cpp b/WebCore/bindings/v8/V8Index.cpp index 2cbd16d..89a9f71 100644 --- a/WebCore/bindings/v8/V8Index.cpp +++ b/WebCore/bindings/v8/V8Index.cpp @@ -34,6 +34,7 @@ #include "V8Attr.h" #include "V8BarInfo.h" #include "V8BeforeLoadEvent.h" +#include "V8CanvasActiveInfo.h" #include "V8CanvasRenderingContext.h" #include "V8CanvasRenderingContext2D.h" #include "V8CanvasGradient.h" @@ -355,7 +356,6 @@ #include "V8SVGTransform.h" #include "V8SVGTransformList.h" #include "V8SVGUnitTypes.h" -#include "V8SVGURIReference.h" #include "V8SVGZoomEvent.h" #endif @@ -389,6 +389,7 @@ #if ENABLE(SHARED_WORKERS) #include "V8SharedWorker.h" +#include "V8SharedWorkerContext.h" #endif #if ENABLE(3D_CANVAS) @@ -434,6 +435,7 @@ #include "V8InspectorBackend.h" #endif +<<<<<<< HEAD:WebCore/bindings/v8/V8Index.cpp #if PLATFORM(ANDROID) // TODO: Upstream these guards to webkit.org #if ENABLE(GEOLOCATION) @@ -452,6 +454,8 @@ #include "V8VoidCallback.h" #endif // PLATFORM(ANDROID) +======= +>>>>>>> webkit.org at r50258.:WebCore/bindings/v8/V8Index.cpp namespace WebCore { FunctionTemplateFactory V8ClassIndex::GetFactory(V8WrapperType type) |