Use upstreamed V8Index

BUG=14466
TEST=none


Review URL: http://codereview.chromium.org/126296

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19291 0039d316-1c4b-4281-b951-d872f2087c98

6 files changed, 5 insertions, 924 deletions

diff --git a/webkit/glue/devtools/debugger_agent_impl.cc b/webkit/glue/devtools/debugger_agent_impl.cc
index 4fb5f243..1a6b94c 100644
--- a/webkit/glue/devtools/debugger_agent_impl.cc
+++ b/webkit/glue/devtools/debugger_agent_impl.cc
@@ -16,8 +16,8 @@
 #include "grit/webkit_resources.h"
 #include "V8Binding.h"
 #include "V8DOMWindow.h"
+#include "V8Index.h"
 #include "v8_binding.h"
-#include "v8_index.h"
 #include "v8_proxy.h"
 #include "webkit/glue/devtools/debugger_agent_impl.h"
 #include "webkit/glue/devtools/debugger_agent_manager.h"
diff --git a/webkit/port/bindings/v8/v8_index.cpp b/webkit/port/bindings/v8/v8_index.cpp
deleted file mode 100644
index d00e491..0000000
--- a/webkit/port/bindings/v8/v8_index.cpp
+++ /dev/null
@@ -1,413 +0,0 @@
-// Copyright (c) 2008, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include "config.h"
-
-#include "v8_index.h"
-
-// TODO: Can we use a macro to include necessary headers by using
-// WRAPPER_TYPES?
-#include "V8Attr.h"
-#include "V8BarInfo.h"
-#include "V8CanvasRenderingContext2D.h"
-#include "V8CanvasGradient.h"
-#include "V8CanvasPattern.h"
-#include "V8CanvasPixelArray.h"
-#include "V8CDATASection.h"
-#include "V8CharacterData.h"
-#include "V8ClientRect.h"
-#include "V8ClientRectList.h"
-#include "V8Clipboard.h"
-#include "V8Comment.h"
-#include "V8Console.h"
-#include "V8Counter.h"
-#include "V8CSSStyleDeclaration.h"
-#include "V8CSSRule.h"
-#include "V8CSSStyleRule.h"
-#include "V8CSSCharsetRule.h"
-#include "V8CSSImportRule.h"
-#include "V8CSSMediaRule.h"
-#include "V8CSSFontFaceRule.h"
-#include "V8CSSPageRule.h"
-#include "V8CSSRuleList.h"
-#include "V8CSSPrimitiveValue.h"
-#include "V8CSSValue.h"
-#include "V8CSSValueList.h"
-#include "V8CSSStyleSheet.h"
-#include "V8CSSVariablesDeclaration.h"
-#include "V8CSSVariablesRule.h"
-#include "V8DataGridColumn.h"
-#include "V8DataGridColumnList.h"
-#include "V8Database.h"
-#include "V8Document.h"
-#include "V8DocumentFragment.h"
-#include "V8DocumentType.h"
-#include "V8Element.h"
-#include "V8Entity.h"
-#include "V8EntityReference.h"
-#include "V8File.h"
-#include "V8FileList.h"
-#include "V8History.h"
-#include "V8HTMLCanvasElement.h"
-#include "V8UndetectableHTMLCollection.h"
-#include "V8HTMLCollection.h"
-#include "V8HTMLDocument.h"
-#include "V8HTMLElement.h"
-#include "V8HTMLOptionsCollection.h"
-#include "V8HTMLAnchorElement.h"
-#include "V8HTMLAppletElement.h"
-#include "V8HTMLAreaElement.h"
-#include "V8HTMLBaseElement.h"
-#include "V8HTMLBaseFontElement.h"
-#include "V8HTMLBlockquoteElement.h"
-#include "V8HTMLBodyElement.h"
-#include "V8HTMLBRElement.h"
-#include "V8HTMLButtonElement.h"
-#include "V8HTMLCanvasElement.h"
-#include "V8HTMLModElement.h"
-#include "V8HTMLDataGridCellElement.h"
-#include "V8HTMLDataGridColElement.h"
-#include "V8HTMLDataGridElement.h"
-#include "V8HTMLDataGridRowElement.h"
-#include "V8HTMLDirectoryElement.h"
-#include "V8HTMLDivElement.h"
-#include "V8HTMLDListElement.h"
-#include "V8HTMLEmbedElement.h"
-#include "V8HTMLFieldSetElement.h"
-#include "V8HTMLFormElement.h"
-#include "V8HTMLFontElement.h"
-#include "V8HTMLFrameElement.h"
-#include "V8HTMLFrameSetElement.h"
-#include "V8HTMLHeadingElement.h"
-#include "V8HTMLHeadElement.h"
-#include "V8HTMLHRElement.h"
-#include "V8HTMLHtmlElement.h"
-#include "V8HTMLIFrameElement.h"
-#include "V8HTMLImageElement.h"
-#include "V8HTMLInputElement.h"
-#include "V8HTMLIsIndexElement.h"
-#include "V8HTMLLabelElement.h"
-#include "V8HTMLLegendElement.h"
-#include "V8HTMLLIElement.h"
-#include "V8HTMLLinkElement.h"
-#include "V8HTMLMapElement.h"
-#include "V8HTMLMarqueeElement.h"
-#include "V8HTMLMenuElement.h"
-#include "V8HTMLMetaElement.h"
-#include "V8HTMLObjectElement.h"
-#include "V8HTMLOListElement.h"
-#include "V8HTMLOptGroupElement.h"
-#include "V8HTMLOptionElement.h"
-#include "V8HTMLParagraphElement.h"
-#include "V8HTMLParamElement.h"
-#include "V8HTMLPreElement.h"
-#include "V8HTMLQuoteElement.h"
-#include "V8HTMLScriptElement.h"
-#include "V8HTMLSelectElement.h"
-#include "V8HTMLStyleElement.h"
-#include "V8HTMLTableCaptionElement.h"
-#include "V8HTMLTableColElement.h"
-#include "V8HTMLTableElement.h"
-#include "V8HTMLTableSectionElement.h"
-#include "V8HTMLTableCellElement.h"
-#include "V8HTMLTableRowElement.h"
-#include "V8HTMLTextAreaElement.h"
-#include "V8HTMLTitleElement.h"
-#include "V8HTMLUListElement.h"
-#include "V8ImageData.h"
-#include "V8InspectorController.h"
-#include "V8MediaList.h"
-#include "V8MessageChannel.h"
-#include "V8MessageEvent.h"
-#include "V8MessagePort.h"
-#include "V8NamedNodeMap.h"
-#include "V8Node.h"
-#include "V8NodeList.h"
-#include "V8NodeFilter.h"
-#include "V8Notation.h"
-#include "V8ProcessingInstruction.h"
-#include "V8ProgressEvent.h"
-#include "V8StyleSheet.h"
-#include "V8Text.h"
-#include "V8TextEvent.h"
-#include "V8DOMCoreException.h"
-#include "V8DOMParser.h"
-#include "V8DOMWindow.h"
-#include "V8Event.h"
-#include "V8EventException.h"
-#include "V8KeyboardEvent.h"
-#include "V8MouseEvent.h"
-#include "V8WebKitAnimationEvent.h"
-#include "V8WebKitCSSKeyframeRule.h"
-#include "V8WebKitCSSKeyframesRule.h"
-#include "V8WebKitCSSMatrix.h"
-#include "V8WebKitCSSTransformValue.h"
-#include "V8WebKitPoint.h"
-#include "V8WebKitTransitionEvent.h"
-#include "V8WheelEvent.h"
-#include "V8UIEvent.h"
-#include "V8MutationEvent.h"
-#include "V8OverflowEvent.h"
-#include "V8Location.h"
-#include "V8Screen.h"
-#include "V8DOMSelection.h"
-#include "V8Navigator.h"
-#include "V8MimeType.h"
-#include "V8MimeTypeArray.h"
-#include "V8Plugin.h"
-#include "V8PluginArray.h"
-#include "V8Range.h"
-#include "V8RangeException.h"
-#include "V8Rect.h"
-#include "V8SQLError.h"
-#include "V8SQLResultSet.h"
-#include "V8SQLResultSetRowList.h"
-#include "V8SQLTransaction.h"
-#include "V8NodeIterator.h"
-#include "V8TextMetrics.h"
-#include "V8TreeWalker.h"
-#include "V8StyleSheetList.h"
-#include "V8DOMImplementation.h"
-#include "V8XPathResult.h"
-#include "V8XPathException.h"
-#include "V8XPathExpression.h"
-#include "V8XPathNSResolver.h"
-#include "V8XMLHttpRequest.h"
-#include "V8XMLHttpRequestException.h"
-#include "V8XMLHttpRequestProgressEvent.h"
-#include "V8XMLHttpRequestUpload.h"
-#include "V8XMLSerializer.h"
-#include "V8XPathEvaluator.h"
-#include "V8XSLTProcessor.h"
-#include "V8RGBColor.h"
-
-#if ENABLE(DOM_STORAGE)
-#include "V8Storage.h"
-#include "V8StorageEvent.h"
-#endif
-
-#if ENABLE(SVG_ANIMATION)
-#include "V8SVGAnimateColorElement.h"
-#include "V8SVGAnimateElement.h"
-#include "V8SVGAnimateTransformElement.h"
-#include "V8SVGAnimationElement.h"
-#include "V8SVGSetElement.h"
-#endif
-
-#if ENABLE(SVG_FILTERS)
-#include "V8SVGComponentTransferFunctionElement.h"
-#include "V8SVGFEBlendElement.h"
-#include "V8SVGFEColorMatrixElement.h"
-#include "V8SVGFEComponentTransferElement.h"
-#include "V8SVGFECompositeElement.h"
-#include "V8SVGFEDiffuseLightingElement.h"
-#include "V8SVGFEDisplacementMapElement.h"
-#include "V8SVGFEDistantLightElement.h"
-#include "V8SVGFEFloodElement.h"
-#include "V8SVGFEFuncAElement.h"
-#include "V8SVGFEFuncBElement.h"
-#include "V8SVGFEFuncGElement.h"
-#include "V8SVGFEFuncRElement.h"
-#include "V8SVGFEGaussianBlurElement.h"
-#include "V8SVGFEImageElement.h"
-#include "V8SVGFEMergeElement.h"
-#include "V8SVGFEMergeNodeElement.h"
-#include "V8SVGFEOffsetElement.h"
-#include "V8SVGFEPointLightElement.h"
-#include "V8SVGFESpecularLightingElement.h"
-#include "V8SVGFESpotLightElement.h"
-#include "V8SVGFETileElement.h"
-#include "V8SVGFETurbulenceElement.h"
-#include "V8SVGFilterElement.h"
-#endif
-
-#if ENABLE(SVG_FONTS)
-#include "V8SVGDefinitionSrcElement.h"
-#include "V8SVGFontFaceElement.h"
-#include "V8SVGFontFaceFormatElement.h"
-#include "V8SVGFontFaceNameElement.h"
-#include "V8SVGFontFaceSrcElement.h"
-#include "V8SVGFontFaceUriElement.h"
-#endif
-
-#if ENABLE(SVG_FOREIGN_OBJECT)
-#include "V8SVGForeignObjectElement.h"
-#endif
-
-#if ENABLE(SVG_USE)
-#include "V8SVGUseElement.h"
-#endif
-
-#if ENABLE(SVG)
-#include "V8SVGAElement.h"
-#include "V8SVGAltGlyphElement.h"
-#include "V8SVGCircleElement.h"
-#include "V8SVGClipPathElement.h"
-#include "V8SVGCursorElement.h"
-#include "V8SVGDefsElement.h"
-#include "V8SVGDescElement.h"
-#include "V8SVGElement.h"
-#include "V8SVGEllipseElement.h"
-#include "V8SVGException.h"
-#include "V8SVGGElement.h"
-#include "V8SVGGlyphElement.h"
-#include "V8SVGGradientElement.h"
-#include "V8SVGImageElement.h"
-#include "V8SVGLinearGradientElement.h"
-#include "V8SVGLineElement.h"
-#include "V8SVGMarkerElement.h"
-#include "V8SVGMaskElement.h"
-#include "V8SVGMetadataElement.h"
-#include "V8SVGPathElement.h"
-#include "V8SVGPatternElement.h"
-#include "V8SVGPolygonElement.h"
-#include "V8SVGPolylineElement.h"
-#include "V8SVGRadialGradientElement.h"
-#include "V8SVGRectElement.h"
-#include "V8SVGScriptElement.h"
-#include "V8SVGStopElement.h"
-#include "V8SVGStyleElement.h"
-#include "V8SVGSVGElement.h"
-#include "V8SVGSwitchElement.h"
-#include "V8SVGSymbolElement.h"
-#include "V8SVGTextContentElement.h"
-#include "V8SVGTextElement.h"
-#include "V8SVGTextPathElement.h"
-#include "V8SVGTextPositioningElement.h"
-#include "V8SVGTitleElement.h"
-#include "V8SVGTRefElement.h"
-#include "V8SVGTSpanElement.h"
-#include "V8SVGViewElement.h"
-#include "V8SVGAngle.h"
-#include "V8SVGAnimatedAngle.h"
-#include "V8SVGAnimatedBoolean.h"
-#include "V8SVGAnimatedEnumeration.h"
-#include "V8SVGAnimatedInteger.h"
-#include "V8SVGAnimatedLength.h"
-#include "V8SVGAnimatedLengthList.h"
-#include "V8SVGAnimatedNumber.h"
-#include "V8SVGAnimatedNumberList.h"
-#include "V8SVGAnimatedPoints.h"
-#include "V8SVGAnimatedPreserveAspectRatio.h"
-#include "V8SVGAnimatedRect.h"
-#include "V8SVGAnimatedString.h"
-#include "V8SVGAnimatedTransformList.h"
-#include "V8SVGColor.h"
-#include "V8SVGDocument.h"
-#include "V8SVGElementInstance.h"
-#include "V8SVGElementInstanceList.h"
-#include "V8SVGLength.h"
-#include "V8SVGLengthList.h"
-#include "V8SVGMatrix.h"
-#include "V8SVGNumber.h"
-#include "V8SVGNumberList.h"
-#include "V8SVGPaint.h"
-#include "V8SVGPathSeg.h"
-#include "V8SVGPathSegArcAbs.h"
-#include "V8SVGPathSegArcRel.h"
-#include "V8SVGPathSegClosePath.h"
-#include "V8SVGPathSegCurvetoCubicAbs.h"
-#include "V8SVGPathSegCurvetoCubicRel.h"
-#include "V8SVGPathSegCurvetoCubicSmoothAbs.h"
-#include "V8SVGPathSegCurvetoCubicSmoothRel.h"
-#include "V8SVGPathSegCurvetoQuadraticAbs.h"
-#include "V8SVGPathSegCurvetoQuadraticRel.h"
-#include "V8SVGPathSegCurvetoQuadraticSmoothAbs.h"
-#include "V8SVGPathSegCurvetoQuadraticSmoothRel.h"
-#include "V8SVGPathSegLinetoAbs.h"
-#include "V8SVGPathSegLinetoHorizontalAbs.h"
-#include "V8SVGPathSegLinetoHorizontalRel.h"
-#include "V8SVGPathSegLinetoRel.h"
-#include "V8SVGPathSegLinetoVerticalAbs.h"
-#include "V8SVGPathSegLinetoVerticalRel.h"
-#include "V8SVGPathSegList.h"
-#include "V8SVGPathSegMovetoAbs.h"
-#include "V8SVGPathSegMovetoRel.h"
-#include "V8SVGPoint.h"
-#include "V8SVGPointList.h"
-#include "V8SVGPreserveAspectRatio.h"
-#include "V8SVGRect.h"
-#include "V8SVGRenderingIntent.h"
-#include "V8SVGStringList.h"
-#include "V8SVGTransform.h"
-#include "V8SVGTransformList.h"
-#include "V8SVGUnitTypes.h"
-#include "V8SVGURIReference.h"
-#include "V8SVGZoomEvent.h"
-#endif
-
-#if ENABLE(VIDEO)
-#include "V8HTMLAudioElement.h"
-#include "V8HTMLMediaElement.h"
-#include "V8HTMLSourceElement.h"
-#include "V8HTMLVideoElement.h"
-#include "V8MediaError.h"
-#include "V8TimeRanges.h"
-#endif
-
-#if ENABLE(WORKERS)
-#include "V8Worker.h"
-#include "V8WorkerContext.h"
-#include "V8WorkerLocation.h"
-#include "V8WorkerNavigator.h"
-#endif
-
-namespace WebCore {
-
-FunctionTemplateFactory V8ClassIndex::GetFactory(V8WrapperType type) {
-  switch (type) {
-#define MAKE_CASE(type, name)\
-    case V8ClassIndex::type: return V8##name::GetTemplate;
-    WRAPPER_TYPES(MAKE_CASE)
-#undef MAKE_CASE
-    default: return NULL;
-  }
-}
-
-
-#define MAKE_CACHE(type, name)\
-  static v8::Persistent<v8::FunctionTemplate> name##_cache_;
-  ALL_WRAPPER_TYPES(MAKE_CACHE)
-#undef MAKE_CACHE
-
-
-v8::Persistent<v8::FunctionTemplate>* V8ClassIndex::GetCache(
-    V8WrapperType type) {
-  switch (type) {
-#define MAKE_CASE(type, name)\
-    case V8ClassIndex::type: return &name##_cache_;
-    ALL_WRAPPER_TYPES(MAKE_CASE)
-#undef MAKE_CASE
-    default:
-      ASSERT(false);
-      return NULL;
-  }
-}
-
-}  // namespace WebCore
diff --git a/webkit/port/bindings/v8/v8_index.h b/webkit/port/bindings/v8/v8_index.h
deleted file mode 100644
index 9768d56..0000000
--- a/webkit/port/bindings/v8/v8_index.h
+++ /dev/null
@@ -1,506 +0,0 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef V8_INDEX_H__
-#define V8_INDEX_H__
-
-#include <v8.h>
-#include "PlatformString.h"  // for WebCore::String
-
-namespace WebCore {
-
-typedef v8::Persistent<v8::FunctionTemplate> (*FunctionTemplateFactory)();
-
-#if ENABLE(VIDEO)
-#define VIDEO_HTMLELEMENT_TYPES(V)                                      \
-  V(HTMLAUDIOELEMENT, HTMLAudioElement)                                 \
-  V(HTMLMEDIAELEMENT, HTMLMediaElement)                                 \
-  V(HTMLSOURCEELEMENT, HTMLSourceElement)                               \
-  V(HTMLVIDEOELEMENT, HTMLVideoElement)
-#define VIDEO_NONNODE_TYPES(V)                                          \
-  V(MEDIAERROR, MediaError)                                             \
-  V(TIMERANGES, TimeRanges)
-#else
-#define VIDEO_HTMLELEMENT_TYPES(V)
-#define VIDEO_NONNODE_TYPES(V)
-#endif
-
-#if ENABLE(WORKERS)
-#define WORKER_ACTIVE_OBJECT_WRAPPER_TYPES(V)                           \
-  V(WORKER, Worker)
-
-#define WORKER_NONNODE_WRAPPER_TYPES(V)                                 \
-  V(WORKERCONTEXT, WorkerContext)                                       \
-  V(WORKERLOCATION, WorkerLocation)                                     \
-  V(WORKERNAVIGATOR, WorkerNavigator)
-#else
-#define WORKER_ACTIVE_OBJECT_WRAPPER_TYPES(V)
-#define WORKER_NONNODE_WRAPPER_TYPES(V)
-#endif
-
-#define DOM_NODE_TYPES(V)                                               \
-  V(ATTR, Attr)                                                         \
-  V(CHARACTERDATA, CharacterData)                                       \
-  V(CDATASECTION, CDATASection)                                         \
-  V(COMMENT, Comment)                                                   \
-  V(DOCUMENT, Document)                                                 \
-  V(DATAGRIDCOLUMN, DataGridColumn)                                     \
-  V(DATAGRIDCOLUMNLIST, DataGridColumnList)                             \
-  V(DOCUMENTFRAGMENT, DocumentFragment)                                 \
-  V(DOCUMENTTYPE, DocumentType)                                         \
-  V(ELEMENT, Element)                                                   \
-  V(ENTITY, Entity)                                                     \
-  V(ENTITYREFERENCE, EntityReference)                                   \
-  V(HTMLDOCUMENT, HTMLDocument)                                         \
-  V(NODE, Node)                                                         \
-  V(NOTATION, Notation)                                                 \
-  V(PROCESSINGINSTRUCTION, ProcessingInstruction)                       \
-  V(TEXT, Text)                                                         \
-    \
-  V(HTMLANCHORELEMENT, HTMLAnchorElement)                               \
-  V(HTMLAPPLETELEMENT, HTMLAppletElement)                               \
-  V(HTMLAREAELEMENT, HTMLAreaElement)                                   \
-  V(HTMLBASEELEMENT, HTMLBaseElement)                                   \
-  V(HTMLBASEFONTELEMENT, HTMLBaseFontElement)                           \
-  V(HTMLBLOCKQUOTEELEMENT, HTMLBlockquoteElement)                       \
-  V(HTMLBODYELEMENT, HTMLBodyElement)                                   \
-  V(HTMLBRELEMENT, HTMLBRElement)                                       \
-  V(HTMLBUTTONELEMENT, HTMLButtonElement)                               \
-  V(HTMLCANVASELEMENT, HTMLCanvasElement)                               \
-  V(HTMLDATAGRIDCELLELEMENT, HTMLDataGridCellElement)                   \
-  V(HTMLDATAGRIDCOLELEMENT, HTMLDataGridColElement)                     \
-  V(HTMLDATAGRIDELEMENT, HTMLDataGridElement)                           \
-  V(HTMLDATAGRIDROWELEMENT, HTMLDataGridRowElement)                     \
-  V(HTMLDIRECTORYELEMENT, HTMLDirectoryElement)                         \
-  V(HTMLDIVELEMENT, HTMLDivElement)                                     \
-  V(HTMLDLISTELEMENT, HTMLDListElement)                                 \
-  V(HTMLEMBEDELEMENT, HTMLEmbedElement)                                 \
-  V(HTMLFIELDSETELEMENT, HTMLFieldSetElement)                           \
-  V(HTMLFONTELEMENT, HTMLFontElement)                                   \
-  V(HTMLFORMELEMENT, HTMLFormElement)                                   \
-  V(HTMLFRAMEELEMENT, HTMLFrameElement)                                 \
-  V(HTMLFRAMESETELEMENT, HTMLFrameSetElement)                           \
-  V(HTMLHEADINGELEMENT, HTMLHeadingElement)                             \
-  V(HTMLHEADELEMENT, HTMLHeadElement)                                   \
-  V(HTMLHRELEMENT, HTMLHRElement)                                       \
-  V(HTMLHTMLELEMENT, HTMLHtmlElement)                                   \
-  V(HTMLIFRAMEELEMENT, HTMLIFrameElement)                               \
-  V(HTMLIMAGEELEMENT, HTMLImageElement)                                 \
-  V(HTMLINPUTELEMENT, HTMLInputElement)                                 \
-  V(HTMLISINDEXELEMENT, HTMLIsIndexElement)                             \
-  V(HTMLLABELELEMENT, HTMLLabelElement)                                 \
-  V(HTMLLEGENDELEMENT, HTMLLegendElement)                               \
-  V(HTMLLIELEMENT, HTMLLIElement)                                       \
-  V(HTMLLINKELEMENT, HTMLLinkElement)                                   \
-  V(HTMLMAPELEMENT, HTMLMapElement)                                     \
-  V(HTMLMARQUEEELEMENT, HTMLMarqueeElement)                             \
-  V(HTMLMENUELEMENT, HTMLMenuElement)                                   \
-  V(HTMLMETAELEMENT, HTMLMetaElement)                                   \
-  V(HTMLMODELEMENT, HTMLModElement)                                     \
-  V(HTMLOBJECTELEMENT, HTMLObjectElement)                               \
-  V(HTMLOLISTELEMENT, HTMLOListElement)                                 \
-  V(HTMLOPTGROUPELEMENT, HTMLOptGroupElement)                           \
-  V(HTMLOPTIONELEMENT, HTMLOptionElement)                               \
-  V(HTMLPARAGRAPHELEMENT, HTMLParagraphElement)                         \
-  V(HTMLPARAMELEMENT, HTMLParamElement)                                 \
-  V(HTMLPREELEMENT, HTMLPreElement)                                     \
-  V(HTMLQUOTEELEMENT, HTMLQuoteElement)                                 \
-  V(HTMLSCRIPTELEMENT, HTMLScriptElement)                               \
-  V(HTMLSELECTELEMENT, HTMLSelectElement)                               \
-  V(HTMLSTYLEELEMENT, HTMLStyleElement)                                 \
-  V(HTMLTABLECAPTIONELEMENT, HTMLTableCaptionElement)                   \
-  V(HTMLTABLECOLELEMENT, HTMLTableColElement)                           \
-  V(HTMLTABLEELEMENT, HTMLTableElement)                                 \
-  V(HTMLTABLESECTIONELEMENT, HTMLTableSectionElement)                   \
-  V(HTMLTABLECELLELEMENT, HTMLTableCellElement)                         \
-  V(HTMLTABLEROWELEMENT, HTMLTableRowElement)                           \
-  V(HTMLTEXTAREAELEMENT, HTMLTextAreaElement)                           \
-  V(HTMLTITLEELEMENT, HTMLTitleElement)                                 \
-  V(HTMLULISTELEMENT, HTMLUListElement)                                 \
-  V(HTMLELEMENT, HTMLElement)                                           \
-  VIDEO_HTMLELEMENT_TYPES(V)
-
-#if ENABLE(SVG_ANIMATION)
-#define SVG_ANIMATION_ELEMENT_TYPES(V)                                  \
-  V(SVGANIMATECOLORELEMENT, SVGAnimateColorElement)                     \
-  V(SVGANIMATEELEMENT, SVGAnimateElement)                               \
-  V(SVGANIMATETRANSFORMELEMENT, SVGAnimateTransformElement)             \
-  V(SVGANIMATIONELEMENT, SVGAnimationElement)                           \
-  V(SVGSETELEMENT, SVGSetElement)
-#else
-#define SVG_ANIMATION_ELEMENT_TYPES(V)
-#endif
-
-#if ENABLE(SVG_FILTERS)
-#define SVG_FILTERS_ELEMENT_TYPES(V)                                     \
-  V(SVGCOMPONENTTRANSFERFUNCTIONELEMENT, SVGComponentTransferFunctionElement)\
-  V(SVGFEBLENDELEMENT, SVGFEBlendElement)                               \
-  V(SVGFECOLORMATRIXELEMENT, SVGFEColorMatrixElement)                   \
-  V(SVGFECOMPONENTTRANSFERELEMENT, SVGFEComponentTransferElement)       \
-  V(SVGFECOMPOSITEELEMENT, SVGFECompositeElement)                       \
-  V(SVGFEDIFFUSELIGHTINGELEMENT, SVGFEDiffuseLightingElement)           \
-  V(SVGFEDISPLACEMENTMAPELEMENT, SVGFEDisplacementMapElement)           \
-  V(SVGFEDISTANTLIGHTELEMENT, SVGFEDistantLightElement)                 \
-  V(SVGFEFLOODELEMENT, SVGFEFloodElement)                               \
-  V(SVGFEFUNCAELEMENT, SVGFEFuncAElement)                               \
-  V(SVGFEFUNCBELEMENT, SVGFEFuncBElement)                               \
-  V(SVGFEFUNCGELEMENT, SVGFEFuncGElement)                               \
-  V(SVGFEFUNCRELEMENT, SVGFEFuncRElement)                               \
-  V(SVGFEGAUSSIANBLURELEMENT, SVGFEGaussianBlurElement)                 \
-  V(SVGFEIMAGEELEMENT, SVGFEImageElement)                               \
-  V(SVGFEMERGEELEMENT, SVGFEMergeElement)                               \
-  V(SVGFEMERGENODEELEMENT, SVGFEMergeNodeElement)                       \
-  V(SVGFEOFFSETELEMENT, SVGFEOffsetElement)                             \
-  V(SVGFEPOINTLIGHTELEMENT, SVGFEPointLightElement)                     \
-  V(SVGFESPECULARLIGHTINGELEMENT, SVGFESpecularLightingElement)         \
-  V(SVGFESPOTLIGHTELEMENT, SVGFESpotLightElement)                       \
-  V(SVGFETILEELEMENT, SVGFETileElement)                                 \
-  V(SVGFETURBULENCEELEMENT, SVGFETurbulenceElement)                     \
-  V(SVGFILTERELEMENT, SVGFilterElement)
-#else
-#define SVG_FILTERS_ELEMENT_TYPES(V)
-#endif
-
-#if ENABLE(SVG_FONTS)
-#define SVG_FONTS_ELEMENT_TYPES(V)                                      \
-  V(SVGDEFINITIONSRCELEMENT, SVGDefinitionSrcElement)                   \
-  V(SVGFONTFACEELEMENT, SVGFontFaceElement)                             \
-  V(SVGFONTFACEFORMATELEMENT, SVGFontFaceFormatElement)                 \
-  V(SVGFONTFACENAMEELEMENT, SVGFontFaceNameElement)                     \
-  V(SVGFONTFACESRCELEMENT, SVGFontFaceSrcElement)                       \
-  V(SVGFONTFACEURIELEMENT, SVGFontFaceUriElement)
-#else
-#define SVG_FONTS_ELEMENT_TYPES(V)
-#endif
-
-#if ENABLE(SVG_FOREIGN_OBJECT)
-#define SVG_FOREIGN_OBJECT_ELEMENT_TYPES(V)                             \
-  V(SVGFOREIGNOBJECTELEMENT, SVGForeignObjectElement)
-#else
-#define SVG_FOREIGN_OBJECT_ELEMENT_TYPES(V)
-#endif
-
-#if ENABLE(SVG_USE)
-#define SVG_USE_ELEMENT_TYPES(V)                                        \
-  V(SVGUSEELEMENT, SVGUseElement)
-#else
-#define SVG_USE_ELEMENT_TYPES(V)
-#endif
-
-#if ENABLE(SVG)
-#define SVG_NODE_TYPES(V)                                               \
-  SVG_ANIMATION_ELEMENT_TYPES(V)                                        \
-  SVG_FILTERS_ELEMENT_TYPES(V)                                          \
-  SVG_FONTS_ELEMENT_TYPES(V)                                            \
-  SVG_FOREIGN_OBJECT_ELEMENT_TYPES(V)                                   \
-  SVG_USE_ELEMENT_TYPES(V)                                              \
-  V(SVGAELEMENT, SVGAElement)                                           \
-  V(SVGALTGLYPHELEMENT, SVGAltGlyphElement)                             \
-  V(SVGCIRCLEELEMENT, SVGCircleElement)                                 \
-  V(SVGCLIPPATHELEMENT, SVGClipPathElement)                             \
-  V(SVGCURSORELEMENT, SVGCursorElement)                                 \
-  V(SVGDEFSELEMENT, SVGDefsElement)                                     \
-  V(SVGDESCELEMENT, SVGDescElement)                                     \
-  V(SVGELLIPSEELEMENT, SVGEllipseElement)                               \
-  V(SVGGELEMENT, SVGGElement)                                           \
-  V(SVGGLYPHELEMENT, SVGGlyphElement)                                   \
-  V(SVGGRADIENTELEMENT, SVGGradientElement)                             \
-  V(SVGIMAGEELEMENT, SVGImageElement)                                   \
-  V(SVGLINEARGRADIENTELEMENT, SVGLinearGradientElement)                 \
-  V(SVGLINEELEMENT, SVGLineElement)                                     \
-  V(SVGMARKERELEMENT, SVGMarkerElement)                                 \
-  V(SVGMASKELEMENT, SVGMaskElement)                                     \
-  V(SVGMETADATAELEMENT, SVGMetadataElement)                             \
-  V(SVGPATHELEMENT, SVGPathElement)                                     \
-  V(SVGPATTERNELEMENT, SVGPatternElement)                               \
-  V(SVGPOLYGONELEMENT, SVGPolygonElement)                               \
-  V(SVGPOLYLINEELEMENT, SVGPolylineElement)                             \
-  V(SVGRADIALGRADIENTELEMENT, SVGRadialGradientElement)                 \
-  V(SVGRECTELEMENT, SVGRectElement)                                     \
-  V(SVGSCRIPTELEMENT, SVGScriptElement)                                 \
-  V(SVGSTOPELEMENT, SVGStopElement)                                     \
-  V(SVGSTYLEELEMENT, SVGStyleElement)                                   \
-  V(SVGSVGELEMENT, SVGSVGElement)                                       \
-  V(SVGSWITCHELEMENT, SVGSwitchElement)                                 \
-  V(SVGSYMBOLELEMENT, SVGSymbolElement)                                 \
-  V(SVGTEXTCONTENTELEMENT, SVGTextContentElement)                       \
-  V(SVGTEXTELEMENT, SVGTextElement)                                     \
-  V(SVGTEXTPATHELEMENT, SVGTextPathElement)                             \
-  V(SVGTEXTPOSITIONINGELEMENT, SVGTextPositioningElement)               \
-  V(SVGTITLEELEMENT, SVGTitleElement)                                   \
-  V(SVGTREFELEMENT, SVGTRefElement)                                     \
-  V(SVGTSPANELEMENT, SVGTSpanElement)                                   \
-  V(SVGVIEWELEMENT, SVGViewElement)                                     \
-  V(SVGELEMENT, SVGElement)                                             \
-    \
-  V(SVGDOCUMENT, SVGDocument)
-#endif  // SVG
-
-
-// ACTIVE_DOM_OBJECT_TYPES are DOM_OBJECT_TYPES that need special treatement
-// during GC.
-#define ACTIVE_DOM_OBJECT_TYPES(V)                                      \
-  V(MESSAGEPORT, MessagePort)                                           \
-  V(XMLHTTPREQUEST, XMLHttpRequest)                                     \
-  WORKER_ACTIVE_OBJECT_WRAPPER_TYPES(V)
-
-// NOTE: DOM_OBJECT_TYPES is split into two halves because
-//       Visual Studio's Intellinonsense crashes when macros get
-//       too large.  10-29-08
-// DOM_OBJECT_TYPES are non-node DOM types.
-#define DOM_OBJECT_TYPES_1(V)                                           \
-  V(BARINFO, BarInfo)                                                   \
-  V(CANVASGRADIENT, CanvasGradient)                                     \
-  V(CANVASPATTERN, CanvasPattern)                                       \
-  V(CANVASRENDERINGCONTEXT2D, CanvasRenderingContext2D)                 \
-  V(CLIENTRECT, ClientRect)                                             \
-  V(CLIENTRECTLIST, ClientRectList)                                     \
-  V(CLIPBOARD, Clipboard)                                               \
-  V(CONSOLE, Console)                                                   \
-  V(COUNTER, Counter)                                                   \
-  V(CSSCHARSETRULE, CSSCharsetRule)                                     \
-  V(CSSFONTFACERULE, CSSFontFaceRule)                                   \
-  V(CSSIMPORTRULE, CSSImportRule)                                       \
-  V(CSSMEDIARULE, CSSMediaRule)                                         \
-  V(CSSPAGERULE, CSSPageRule)                                           \
-  V(CSSPRIMITIVEVALUE, CSSPrimitiveValue)                               \
-  V(CSSRULE, CSSRule)                                                   \
-  V(CSSRULELIST, CSSRuleList)                                           \
-  V(CSSSTYLEDECLARATION, CSSStyleDeclaration)                           \
-  V(CSSSTYLERULE, CSSStyleRule)                                         \
-  V(CSSSTYLESHEET, CSSStyleSheet)                                       \
-  V(CSSVALUE, CSSValue)                                                 \
-  V(CSSVALUELIST, CSSValueList)                                         \
-  V(CSSVARIABLESDECLARATION, CSSVariablesDeclaration)                   \
-  V(CSSVARIABLESRULE, CSSVariablesRule)                                 \
-  V(DOMCOREEXCEPTION, DOMCoreException)                                 \
-  V(DOMIMPLEMENTATION, DOMImplementation)                               \
-  V(DOMPARSER, DOMParser)                                               \
-  V(DOMSELECTION, DOMSelection)                                         \
-  V(DOMWINDOW, DOMWindow)                                               \
-  V(EVENT, Event)                                                       \
-  V(EVENTEXCEPTION, EventException)                                     \
-  V(FILE, File)                                                         \
-  V(FILELIST, FileList)                                                 \
-  V(HISTORY, History)                                                   \
-  V(UNDETECTABLEHTMLCOLLECTION, UndetectableHTMLCollection)             \
-  V(HTMLCOLLECTION, HTMLCollection)                                     \
-  V(HTMLOPTIONSCOLLECTION, HTMLOptionsCollection)                       \
-  V(IMAGEDATA, ImageData)                                               \
-  V(CANVASPIXELARRAY, CanvasPixelArray)                                 \
-  V(INSPECTORCONTROLLER, InspectorController)                           \
-  V(KEYBOARDEVENT, KeyboardEvent)                                       \
-  V(LOCATION, Location)                                                 \
-  V(MEDIALIST, MediaList)
-
-#define DOM_OBJECT_TYPES_2(V)                                           \
-  V(MESSAGECHANNEL, MessageChannel)                                     \
-  V(MESSAGEEVENT, MessageEvent)                                         \
-  V(MIMETYPE, MimeType)                                                 \
-  V(MIMETYPEARRAY, MimeTypeArray)                                       \
-  V(MOUSEEVENT, MouseEvent)                                             \
-  V(MUTATIONEVENT, MutationEvent)                                       \
-  V(NAMEDNODEMAP, NamedNodeMap)                                         \
-  V(NAVIGATOR, Navigator)                                               \
-  V(NODEFILTER, NodeFilter)                                             \
-  V(NODEITERATOR, NodeIterator)                                         \
-  V(NODELIST, NodeList)                                                 \
-  V(OVERFLOWEVENT, OverflowEvent)                                       \
-  V(PLUGIN, Plugin)                                                     \
-  V(PLUGINARRAY, PluginArray)                                           \
-  V(PROGRESSEVENT, ProgressEvent)                                       \
-  V(RANGE, Range)                                                       \
-  V(RANGEEXCEPTION, RangeException)                                     \
-  V(RECT, Rect)                                                         \
-  V(RGBCOLOR, RGBColor)                                                 \
-  V(SCREEN, Screen)                                                     \
-  V(STYLESHEET, StyleSheet)                                             \
-  V(STYLESHEETLIST, StyleSheetList)                                     \
-  V(TEXTEVENT, TextEvent)                                               \
-  V(TEXTMETRICS, TextMetrics)                                           \
-  V(TREEWALKER, TreeWalker)                                             \
-  V(UIEVENT, UIEvent)                                                   \
-  V(WEBKITANIMATIONEVENT, WebKitAnimationEvent)                         \
-  V(WEBKITCSSKEYFRAMERULE, WebKitCSSKeyframeRule)                       \
-  V(WEBKITCSSKEYFRAMESRULE, WebKitCSSKeyframesRule)                     \
-  V(WEBKITCSSMATRIX, WebKitCSSMatrix)                                   \
-  V(WEBKITPOINT, WebKitPoint)                                           \
-  V(WEBKITCSSTRANSFORMVALUE, WebKitCSSTransformValue)                   \
-  V(WEBKITTRANSITIONEVENT, WebKitTransitionEvent)                       \
-  V(WHEELEVENT, WheelEvent)                                             \
-  V(XMLHTTPREQUESTUPLOAD, XMLHttpRequestUpload)                         \
-  V(XMLHTTPREQUESTEXCEPTION, XMLHttpRequestException)                   \
-  V(XMLHTTPREQUESTPROGRESSEVENT, XMLHttpRequestProgressEvent)           \
-  V(XMLSERIALIZER, XMLSerializer)                                       \
-  V(XPATHEVALUATOR, XPathEvaluator)                                     \
-  V(XPATHEXCEPTION, XPathException)                                     \
-  V(XPATHEXPRESSION, XPathExpression)                                   \
-  V(XPATHNSRESOLVER, XPathNSResolver)                                   \
-  V(XPATHRESULT, XPathResult)                                           \
-  V(XSLTPROCESSOR, XSLTProcessor)                                       \
-  ACTIVE_DOM_OBJECT_TYPES(V)                                            \
-  VIDEO_NONNODE_TYPES(V)                                                \
-  WORKER_NONNODE_WRAPPER_TYPES(V)
-
-#if ENABLE(DATABASE)
-#define DOM_OBJECT_DATABASE_TYPES(V)                                    \
-  V(DATABASE, Database)                                                 \
-  V(SQLERROR, SQLError)                                                 \
-  V(SQLRESULTSET, SQLResultSet)                                         \
-  V(SQLRESULTSETROWLIST, SQLResultSetRowList)                           \
-  V(SQLTRANSACTION, SQLTransaction)
-#else
-#define DOM_OBJECT_DATABASE_TYPES(V)
-#endif
-
-#if ENABLE(DOM_STORAGE)
-#define DOM_OBJECT_STORAGE_TYPES(V)                                     \
-  V(STORAGE, Storage)                                                   \
-  V(STORAGEEVENT, StorageEvent)
-#else
-#define DOM_OBJECT_STORAGE_TYPES(V)
-#endif
-
-#define DOM_OBJECT_TYPES(V)                                             \
-  DOM_OBJECT_TYPES_1(V)                                                 \
-  DOM_OBJECT_TYPES_2(V)                                                 \
-  DOM_OBJECT_DATABASE_TYPES(V)                                          \
-  DOM_OBJECT_STORAGE_TYPES(V)
-
-#if ENABLE(SVG)
-// SVG_OBJECT_TYPES are svg non-node, non-pod types.
-#define SVG_OBJECT_TYPES(V)                                             \
-  V(SVGANGLE, SVGAngle)                                                 \
-  V(SVGANIMATEDANGLE, SVGAnimatedAngle)                                 \
-  V(SVGANIMATEDBOOLEAN, SVGAnimatedBoolean)                             \
-  V(SVGANIMATEDENUMERATION, SVGAnimatedEnumeration)                     \
-  V(SVGANIMATEDINTEGER, SVGAnimatedInteger)                             \
-  V(SVGANIMATEDLENGTH, SVGAnimatedLength)                               \
-  V(SVGANIMATEDLENGTHLIST, SVGAnimatedLengthList)                       \
-  V(SVGANIMATEDNUMBER, SVGAnimatedNumber)                               \
-  V(SVGANIMATEDNUMBERLIST, SVGAnimatedNumberList)                       \
-  V(SVGANIMATEDPRESERVEASPECTRATIO, SVGAnimatedPreserveAspectRatio)     \
-  V(SVGANIMATEDRECT, SVGAnimatedRect)                                   \
-  V(SVGANIMATEDSTRING, SVGAnimatedString)                               \
-  V(SVGANIMATEDTRANSFORMLIST, SVGAnimatedTransformList)                 \
-  V(SVGCOLOR, SVGColor)                                                 \
-  V(SVGELEMENTINSTANCE, SVGElementInstance)                             \
-  V(SVGELEMENTINSTANCELIST, SVGElementInstanceList)                     \
-  V(SVGEXCEPTION, SVGException)                                         \
-  V(SVGLENGTHLIST, SVGLengthList)                                       \
-  V(SVGNUMBERLIST, SVGNumberList)                                       \
-  V(SVGPAINT, SVGPaint)                                                 \
-  V(SVGPATHSEG, SVGPathSeg)                                             \
-  V(SVGPATHSEGARCABS, SVGPathSegArcAbs)                                 \
-  V(SVGPATHSEGARCREL, SVGPathSegArcRel)                                 \
-  V(SVGPATHSEGCLOSEPATH, SVGPathSegClosePath)                           \
-  V(SVGPATHSEGCURVETOCUBICABS, SVGPathSegCurvetoCubicAbs)               \
-  V(SVGPATHSEGCURVETOCUBICREL, SVGPathSegCurvetoCubicRel)               \
-  V(SVGPATHSEGCURVETOCUBICSMOOTHABS, SVGPathSegCurvetoCubicSmoothAbs)   \
-  V(SVGPATHSEGCURVETOCUBICSMOOTHREL, SVGPathSegCurvetoCubicSmoothRel)   \
-  V(SVGPATHSEGCURVETOQUADRATICABS, SVGPathSegCurvetoQuadraticAbs)       \
-  V(SVGPATHSEGCURVETOQUADRATICREL, SVGPathSegCurvetoQuadraticRel)       \
-  V(SVGPATHSEGCURVETOQUADRATICSMOOTHABS, SVGPathSegCurvetoQuadraticSmoothAbs)\
-  V(SVGPATHSEGCURVETOQUADRATICSMOOTHREL, SVGPathSegCurvetoQuadraticSmoothRel)\
-  V(SVGPATHSEGLINETOABS, SVGPathSegLinetoAbs)                           \
-  V(SVGPATHSEGLINETOHORIZONTALABS, SVGPathSegLinetoHorizontalAbs)       \
-  V(SVGPATHSEGLINETOHORIZONTALREL, SVGPathSegLinetoHorizontalRel)       \
-  V(SVGPATHSEGLINETOREL, SVGPathSegLinetoRel)                           \
-  V(SVGPATHSEGLINETOVERTICALABS, SVGPathSegLinetoVerticalAbs)           \
-  V(SVGPATHSEGLINETOVERTICALREL, SVGPathSegLinetoVerticalRel)           \
-  V(SVGPATHSEGLIST, SVGPathSegList)                                     \
-  V(SVGPATHSEGMOVETOABS, SVGPathSegMovetoAbs)                           \
-  V(SVGPATHSEGMOVETOREL, SVGPathSegMovetoRel)                           \
-  V(SVGPOINTLIST, SVGPointList)                                         \
-  V(SVGPRESERVEASPECTRATIO, SVGPreserveAspectRatio)                     \
-  V(SVGRENDERINGINTENT, SVGRenderingIntent)                             \
-  V(SVGSTRINGLIST, SVGStringList)                                       \
-  V(SVGTRANSFORMLIST, SVGTransformList)                                 \
-  V(SVGUNITTYPES, SVGUnitTypes)                                         \
-  V(SVGZOOMEVENT, SVGZoomEvent)
-
-// SVG POD types should list all types whose IDL has PODType declaration.
-#define SVG_POD_TYPES(V)                                                \
-  V(SVGLENGTH, SVGLength)                                               \
-  V(SVGTRANSFORM, SVGTransform)                                         \
-  V(SVGMATRIX, SVGMatrix)                                               \
-  V(SVGNUMBER, SVGNumber)                                               \
-  V(SVGPOINT, SVGPoint)                                                 \
-  V(SVGRECT, SVGRect)
-
-// POD types can have different implementation names, see CodeGenerateV8.pm.
-#define SVG_POD_NATIVE_TYPES(V)                                         \
-  V(SVGLENGTH, SVGLength)                                               \
-  V(SVGTRANSFORM, SVGTransform)                                         \
-  V(SVGMATRIX, TransformationMatrix)                                    \
-  V(SVGNUMBER, float)                                                   \
-  V(SVGPOINT, FloatPoint)                                               \
-  V(SVGRECT, FloatRect)
-
-// Shouldn't generate code for these two types.
-#define SVG_NO_WRAPPER_TYPES(V)                                         \
-  V(SVGURIREFERENCE, SVGURIReference)                                   \
-  V(SVGANIMATEDPOINTS, SVGAnimatedPoints)
-
-// SVG_NONNODE_TYPES are SVG non-node object types, pod typs and
-// numerical types.
-#define SVG_NONNODE_TYPES(V)                                            \
-  SVG_OBJECT_TYPES(V)                                                   \
-  SVG_POD_TYPES(V)
-#endif  // SVG
-
-// EVENTTARGET, EVENTLISTENER, and NPOBJECT do not have V8 wrappers.
-#define DOM_NO_WRAPPER_TYPES(V)                                         \
-  V(EVENTTARGET, EventTarget)                                           \
-  V(EVENTLISTENER, EventListener)                                       \
-  V(NPOBJECT, NPObject)
-
-#if ENABLE(SVG)
-#define WRAPPER_TYPES(V)                                \
-    DOM_NODE_TYPES(V)                                   \
-    DOM_OBJECT_TYPES(V)                                 \
-    SVG_NODE_TYPES(V)                                   \
-    SVG_NONNODE_TYPES(V)
-#define NO_WRAPPER_TYPES(V)                             \
-    DOM_NO_WRAPPER_TYPES(V)                             \
-    SVG_NO_WRAPPER_TYPES(V)
-#else  // SVG
-#define WRAPPER_TYPES(V)                                \
-    DOM_NODE_TYPES(V)                                   \
-    DOM_OBJECT_TYPES(V)
-#define NO_WRAPPER_TYPES(V)                             \
-    DOM_NO_WRAPPER_TYPES(V)
-#endif  // SVG
-
-#define ALL_WRAPPER_TYPES(V)                            \
-  WRAPPER_TYPES(V)                                      \
-  NO_WRAPPER_TYPES(V)
-
-class V8ClassIndex {
- public:
-  // Type must start at non-negative numbers. See ToInt, FromInt.
-  enum V8WrapperType {
-    INVALID_CLASS_INDEX = 0,
-#define DEFINE_ENUM(name, type) name,
-    ALL_WRAPPER_TYPES(DEFINE_ENUM)
-#undef DEFINE_ENUM
-    CLASSINDEX_END,
-    WRAPPER_TYPE_COUNT = CLASSINDEX_END
-  };
-
-  static int ToInt(V8WrapperType type) { return static_cast<int>(type); }
-
-  static V8WrapperType FromInt(int v) {
-    ASSERT(INVALID_CLASS_INDEX <= v && v < CLASSINDEX_END);
-    return static_cast<V8WrapperType>(v);
-  }
-
-  static FunctionTemplateFactory GetFactory(V8WrapperType type);
-  // Returns a field to be used as cache for the template for the given type
-  static v8::Persistent<v8::FunctionTemplate>* GetCache(V8WrapperType type);
-};
-
-}
-
-#endif  // V8_INDEX_H__
diff --git a/webkit/port/bindings/v8/v8_proxy.cpp b/webkit/port/bindings/v8/v8_proxy.cpp
index f7ab5c2..d11ee18 100644
--- a/webkit/port/bindings/v8/v8_proxy.cpp
+++ b/webkit/port/bindings/v8/v8_proxy.cpp
@@ -36,7 +36,6 @@
 #include <v8-debug.h>
 
 #include "v8_proxy.h"
-#include "v8_index.h"
 #include "v8_binding.h"
 #include "V8Collection.h"
 #include "V8DOMWindow.h"
@@ -49,6 +48,7 @@
 #include "ScriptController.h"
 #include "V8CustomBinding.h"
 #include "V8DOMMap.h"
+#include "V8Index.h"
 #include "WorkerContextExecutionProxy.h"
 
 namespace WebCore {
diff --git a/webkit/port/bindings/v8/v8_proxy.h b/webkit/port/bindings/v8/v8_proxy.h
index 2353420..fbb74f3 100644
--- a/webkit/port/bindings/v8/v8_proxy.h
+++ b/webkit/port/bindings/v8/v8_proxy.h
@@ -6,7 +6,6 @@
 #define V8_PROXY_H__
 
 #include <v8.h>
-#include "v8_index.h"
 #include "v8_utility.h"
 #include "ChromiumBridge.h"
 #include "Node.h"
@@ -17,6 +16,7 @@
 #include "V8CustomBinding.h"
 #include "V8DOMMap.h"
 #include "V8EventListenerList.h"
+#include "V8Index.h"
 #include <wtf/Assertions.h>
 #include <wtf/PassRefPtr.h> // so generated bindings don't have to
 #include <wtf/Vector.h>
diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp
index dae7b42..737fa54 100644
--- a/webkit/webkit.gyp
+++ b/webkit/webkit.gyp
@@ -1120,6 +1120,8 @@
         '../third_party/WebKit/WebCore/bindings/v8/V8EventListenerList.h',
         '../third_party/WebKit/WebCore/bindings/v8/V8Helpers.cpp',
         '../third_party/WebKit/WebCore/bindings/v8/V8Helpers.h',
+        '../third_party/WebKit/WebCore/bindings/v8/V8Index.cpp',
+        '../third_party/WebKit/WebCore/bindings/v8/V8Index.h',
         '../third_party/WebKit/WebCore/bindings/v8/V8IsolatedWorld.cpp',
         '../third_party/WebKit/WebCore/bindings/v8/V8IsolatedWorld.h',
         '../third_party/WebKit/WebCore/bindings/v8/V8LazyEventListener.cpp',
@@ -1163,8 +1165,6 @@
         'port/bindings/v8/npruntime_priv.h',
         'port/bindings/v8/v8_binding.h',
         'port/bindings/v8/v8_binding.cpp',
-        'port/bindings/v8/v8_index.cpp',
-        'port/bindings/v8/v8_index.h',
         'port/bindings/v8/V8NPUtils.cpp',
         'port/bindings/v8/V8NPUtils.h',
         'port/bindings/v8/V8NPObject.cpp',