Merge webkit.org at r54127 : Resolve conflicts in V8 touch events bindings.

The V8 touch event bindings weren't upstreamed, but this code has now all been deleted in favour of auto-generation.
See http://trac.webkit.org/changeset/52663 for the change that removes the indexed getters used for touch events

Change-Id: Ie59c504d7efcb408c18f76d085db63bc1c4a96c4

4 files changed, 0 insertions, 803 deletions

diff --git a/WebCore/Android.v8bindings.mk b/WebCore/Android.v8bindings.mk
index 0bfe1d7..a388c46 100644
--- a/WebCore/Android.v8bindings.mk
+++ b/WebCore/Android.v8bindings.mk
@@ -162,7 +162,6 @@ LOCAL_SRC_FILES += \
 	bindings/v8/custom/V8SharedWorkerCustom.cpp \
 	bindings/v8/custom/V8StorageCustom.cpp \
 	bindings/v8/custom/V8StyleSheetListCustom.cpp \
-	bindings/v8/custom/V8TouchListCustom.cpp \
 	bindings/v8/custom/V8TreeWalkerCustom.cpp \
 	bindings/v8/custom/V8WebKitCSSMatrixConstructor.cpp \
 	bindings/v8/custom/V8WebKitPointConstructor.cpp \
diff --git a/WebCore/bindings/v8/V8DOMWrapper.cpp b/WebCore/bindings/v8/V8DOMWrapper.cpp
index da50af6..01ae6ae 100644
--- a/WebCore/bindings/v8/V8DOMWrapper.cpp
+++ b/WebCore/bindings/v8/V8DOMWrapper.cpp
@@ -257,368 +257,6 @@ v8::Persistent<v8::FunctionTemplate> V8DOMWrapper::getTemplate(V8ClassIndex::V8W
     // Not in the cache.
     FunctionTemplateFactory factory = V8ClassIndex::GetFactory(type);
     v8::Persistent<v8::FunctionTemplate> descriptor = factory();
-<<<<<<< HEAD
-    // DOM constructors are functions and should print themselves as such.
-    // However, we will later replace their prototypes with Object
-    // prototypes so we need to explicitly override toString on the
-    // instance itself. If we later make DOM constructors full objects
-    // we can give them class names instead and Object.prototype.toString
-    // will work so we can remove this code.
-    DEFINE_STATIC_LOCAL(v8::Persistent<v8::FunctionTemplate>, toStringTemplate, ());
-    if (toStringTemplate.IsEmpty())
-        toStringTemplate = v8::Persistent<v8::FunctionTemplate>::New(v8::FunctionTemplate::New(ConstructorToString));
-    descriptor->Set(GetToStringName(), toStringTemplate);
-    switch (type) {
-    case V8ClassIndex::CSSSTYLEDECLARATION:
-        // The named property handler for style declarations has a
-        // setter. Therefore, the interceptor has to be on the object
-        // itself and not on the prototype object.
-        descriptor->InstanceTemplate()->SetNamedPropertyHandler( USE_NAMED_PROPERTY_GETTER(CSSStyleDeclaration), USE_NAMED_PROPERTY_SETTER(CSSStyleDeclaration));
-        setCollectionStringIndexedGetter<CSSStyleDeclaration>(descriptor);
-        break;
-    case V8ClassIndex::CSSRULELIST:
-        setCollectionIndexedGetter<CSSRuleList, CSSRule>(descriptor,  V8ClassIndex::CSSRULE);
-        break;
-    case V8ClassIndex::CSSVALUELIST:
-        setCollectionIndexedGetter<CSSValueList, CSSValue>(descriptor, V8ClassIndex::CSSVALUE);
-        break;
-    case V8ClassIndex::CSSVARIABLESDECLARATION:
-        setCollectionStringIndexedGetter<CSSVariablesDeclaration>(descriptor);
-        break;
-    case V8ClassIndex::WEBKITCSSTRANSFORMVALUE:
-        setCollectionIndexedGetter<WebKitCSSTransformValue, CSSValue>(descriptor, V8ClassIndex::CSSVALUE);
-        break;
-    case V8ClassIndex::HTMLALLCOLLECTION:
-        descriptor->InstanceTemplate()->MarkAsUndetectable(); // fall through
-    case V8ClassIndex::HTMLCOLLECTION:
-        descriptor->InstanceTemplate()->SetNamedPropertyHandler(USE_NAMED_PROPERTY_GETTER(HTMLCollection));
-        descriptor->InstanceTemplate()->SetCallAsFunctionHandler(USE_CALLBACK(HTMLCollectionCallAsFunction));
-        setCollectionIndexedGetter<HTMLCollection, Node>(descriptor, V8ClassIndex::NODE);
-        break;
-    case V8ClassIndex::HTMLOPTIONSCOLLECTION:
-        descriptor->InstanceTemplate()->SetNamedPropertyHandler(USE_NAMED_PROPERTY_GETTER(HTMLCollection));
-        descriptor->InstanceTemplate()->SetIndexedPropertyHandler(USE_INDEXED_PROPERTY_GETTER(HTMLOptionsCollection), USE_INDEXED_PROPERTY_SETTER(HTMLOptionsCollection));
-        descriptor->InstanceTemplate()->SetCallAsFunctionHandler(USE_CALLBACK(HTMLCollectionCallAsFunction));
-        break;
-    case V8ClassIndex::HTMLSELECTELEMENT:
-        descriptor->InstanceTemplate()->SetNamedPropertyHandler(USE_NAMED_PROPERTY_GETTER(HTMLSelectElementCollection));
-        descriptor->InstanceTemplate()->SetIndexedPropertyHandler(nodeCollectionIndexedPropertyGetter<HTMLSelectElement>, USE_INDEXED_PROPERTY_SETTER(HTMLSelectElementCollection),
-            0, 0, nodeCollectionIndexedPropertyEnumerator<HTMLSelectElement>, v8::Integer::New(V8ClassIndex::NODE));
-        break;
-    case V8ClassIndex::HTMLDOCUMENT: {
-        descriptor->InstanceTemplate()->SetNamedPropertyHandler(USE_NAMED_PROPERTY_GETTER(HTMLDocument), 0, 0, USE_NAMED_PROPERTY_DELETER(HTMLDocument));
-
-        // We add an extra internal field to all Document wrappers for
-        // storing a per document DOMImplementation wrapper.
-        //
-        // Additionally, we add two extra internal fields for
-        // HTMLDocuments to implement temporary shadowing of
-        // document.all. One field holds an object that is used as a
-        // marker. The other field holds the marker object if
-        // document.all is not shadowed and some other value if
-        // document.all is shadowed.
-        v8::Local<v8::ObjectTemplate> instanceTemplate = descriptor->InstanceTemplate();
-        ASSERT(instanceTemplate->InternalFieldCount() == V8Custom::kNodeMinimumInternalFieldCount);
-        instanceTemplate->SetInternalFieldCount(V8Custom::kHTMLDocumentInternalFieldCount);
-        break;
-    }
-#if ENABLE(SVG)
-    case V8ClassIndex::SVGDOCUMENT:  // fall through
-#endif
-    case V8ClassIndex::DOCUMENT: {
-        // We add an extra internal field to all Document wrappers for
-        // storing a per document DOMImplementation wrapper.
-        v8::Local<v8::ObjectTemplate> instanceTemplate = descriptor->InstanceTemplate();
-        ASSERT(instanceTemplate->InternalFieldCount() == V8Custom::kNodeMinimumInternalFieldCount);
-        instanceTemplate->SetInternalFieldCount( V8Custom::kDocumentMinimumInternalFieldCount);
-        break;
-    }
-    case V8ClassIndex::HTMLAPPLETELEMENT:  // fall through
-    case V8ClassIndex::HTMLEMBEDELEMENT:  // fall through
-    case V8ClassIndex::HTMLOBJECTELEMENT:
-        // HTMLAppletElement, HTMLEmbedElement and HTMLObjectElement are
-        // inherited from HTMLPlugInElement, and they share the same property
-        // handling code.
-        descriptor->InstanceTemplate()->SetNamedPropertyHandler(USE_NAMED_PROPERTY_GETTER(HTMLPlugInElement), USE_NAMED_PROPERTY_SETTER(HTMLPlugInElement));
-        descriptor->InstanceTemplate()->SetIndexedPropertyHandler(USE_INDEXED_PROPERTY_GETTER(HTMLPlugInElement), USE_INDEXED_PROPERTY_SETTER(HTMLPlugInElement));
-        descriptor->InstanceTemplate()->SetCallAsFunctionHandler(USE_CALLBACK(HTMLPlugInElement));
-        break;
-    case V8ClassIndex::HTMLFRAMESETELEMENT:
-        descriptor->InstanceTemplate()->SetNamedPropertyHandler(USE_NAMED_PROPERTY_GETTER(HTMLFrameSetElement));
-        break;
-    case V8ClassIndex::HTMLFORMELEMENT:
-        descriptor->InstanceTemplate()->SetNamedPropertyHandler(USE_NAMED_PROPERTY_GETTER(HTMLFormElement));
-        descriptor->InstanceTemplate()->SetIndexedPropertyHandler(USE_INDEXED_PROPERTY_GETTER(HTMLFormElement), 0, 0, 0, nodeCollectionIndexedPropertyEnumerator<HTMLFormElement>, v8::Integer::New(V8ClassIndex::NODE));
-        break;
-    case V8ClassIndex::STYLESHEET:  // fall through
-    case V8ClassIndex::CSSSTYLESHEET: {
-        // We add an extra internal field to hold a reference to
-        // the owner node.
-        v8::Local<v8::ObjectTemplate> instanceTemplate = descriptor->InstanceTemplate();
-        ASSERT(instanceTemplate->InternalFieldCount() == V8Custom::kDefaultWrapperInternalFieldCount);
-        instanceTemplate->SetInternalFieldCount(V8Custom::kStyleSheetInternalFieldCount);
-        break;
-    }
-    case V8ClassIndex::MEDIALIST:
-        setCollectionStringOrNullIndexedGetter<MediaList>(descriptor);
-        break;
-    case V8ClassIndex::MIMETYPEARRAY:
-        setCollectionIndexedAndNamedGetters<MimeTypeArray, MimeType>(descriptor, V8ClassIndex::MIMETYPE);
-        break;
-    case V8ClassIndex::NAMEDNODEMAP: {
-        // We add an extra internal field to hold a reference to the owner node.
-        v8::Local<v8::ObjectTemplate> instanceTemplate = descriptor->InstanceTemplate();
-        ASSERT(instanceTemplate->InternalFieldCount() == V8Custom::kDefaultWrapperInternalFieldCount);
-        instanceTemplate->SetInternalFieldCount(V8Custom::kNamedNodeMapInternalFieldCount);
-        instanceTemplate->SetNamedPropertyHandler(USE_NAMED_PROPERTY_GETTER(NamedNodeMap));
-        instanceTemplate->SetIndexedPropertyHandler(USE_INDEXED_PROPERTY_GETTER(NamedNodeMap), 0, 0, 0, collectionIndexedPropertyEnumerator<NamedNodeMap>, v8::Integer::New(V8ClassIndex::NODE));
-        break;
-    }
-#if ENABLE(DOM_STORAGE)
-    case V8ClassIndex::STORAGE:
-        descriptor->InstanceTemplate()->SetNamedPropertyHandler(USE_NAMED_PROPERTY_GETTER(Storage), USE_NAMED_PROPERTY_SETTER(Storage), 0, USE_NAMED_PROPERTY_DELETER(Storage), V8Custom::v8StorageNamedPropertyEnumerator);
-        descriptor->InstanceTemplate()->SetIndexedPropertyHandler(USE_INDEXED_PROPERTY_GETTER(Storage), USE_INDEXED_PROPERTY_SETTER(Storage), 0, USE_INDEXED_PROPERTY_DELETER(Storage));
-        break;
-#endif
-    case V8ClassIndex::NODELIST:
-        setCollectionIndexedGetter<NodeList, Node>(descriptor, V8ClassIndex::NODE);
-        descriptor->InstanceTemplate()->SetNamedPropertyHandler(USE_NAMED_PROPERTY_GETTER(NodeList));
-        break;
-    case V8ClassIndex::PLUGIN:
-        setCollectionIndexedAndNamedGetters<Plugin, MimeType>(descriptor, V8ClassIndex::MIMETYPE);
-        break;
-    case V8ClassIndex::PLUGINARRAY:
-        setCollectionIndexedAndNamedGetters<PluginArray, Plugin>(descriptor, V8ClassIndex::PLUGIN);
-        break;
-    case V8ClassIndex::STYLESHEETLIST:
-        descriptor->InstanceTemplate()->SetNamedPropertyHandler(USE_NAMED_PROPERTY_GETTER(StyleSheetList));
-        setCollectionIndexedGetter<StyleSheetList, StyleSheet>(descriptor, V8ClassIndex::STYLESHEET);
-        break;
-    case V8ClassIndex::DOMWINDOW: {
-        v8::Local<v8::Signature> defaultSignature = v8::Signature::New(descriptor);
-
-        descriptor->PrototypeTemplate()->SetNamedPropertyHandler(USE_NAMED_PROPERTY_GETTER(DOMWindow));
-        descriptor->PrototypeTemplate()->SetIndexedPropertyHandler(USE_INDEXED_PROPERTY_GETTER(DOMWindow));
-        descriptor->PrototypeTemplate()->SetInternalFieldCount(V8Custom::kDOMWindowInternalFieldCount);
-
-        descriptor->SetHiddenPrototype(true);
-
-        // Reserve spaces for references to location, history and
-        // navigator objects.
-        v8::Local<v8::ObjectTemplate> instanceTemplate = descriptor->InstanceTemplate();
-        instanceTemplate->SetInternalFieldCount(V8Custom::kDOMWindowInternalFieldCount);
-
-        // Set access check callbacks, but turned off initially.
-        // When a context is detached from a frame, turn on the access check.
-        // Turning on checks also invalidates inline caches of the object.
-        instanceTemplate->SetAccessCheckCallbacks(V8Custom::v8DOMWindowNamedSecurityCheck, V8Custom::v8DOMWindowIndexedSecurityCheck, v8::Integer::New(V8ClassIndex::DOMWINDOW), false);
-        break;
-    }
-    case V8ClassIndex::LOCATION: {
-        // For security reasons, these functions are on the instance
-        // instead of on the prototype object to insure that they cannot
-        // be overwritten.
-        v8::Local<v8::ObjectTemplate> instance = descriptor->InstanceTemplate();
-        instance->SetAccessor(v8::String::New("reload"), V8Custom::v8LocationReloadAccessorGetter, 0, v8::Handle<v8::Value>(), v8::ALL_CAN_READ, static_cast<v8::PropertyAttribute>(v8::DontDelete | v8::ReadOnly));
-        instance->SetAccessor(v8::String::New("replace"), V8Custom::v8LocationReplaceAccessorGetter, 0, v8::Handle<v8::Value>(), v8::ALL_CAN_READ, static_cast<v8::PropertyAttribute>(v8::DontDelete | v8::ReadOnly));
-        instance->SetAccessor(v8::String::New("assign"), V8Custom::v8LocationAssignAccessorGetter, 0, v8::Handle<v8::Value>(), v8::ALL_CAN_READ, static_cast<v8::PropertyAttribute>(v8::DontDelete | v8::ReadOnly));
-        break;
-    }
-    case V8ClassIndex::HISTORY:
-        break;
-
-    case V8ClassIndex::MESSAGECHANNEL: {
-        // Reserve two more internal fields for referencing the port1
-        // and port2 wrappers. This ensures that the port wrappers are
-        // kept alive when the channel wrapper is.
-        descriptor->SetCallHandler(USE_CALLBACK(MessageChannelConstructor));
-        v8::Local<v8::ObjectTemplate> instanceTemplate = descriptor->InstanceTemplate();
-        instanceTemplate->SetInternalFieldCount(V8Custom::kMessageChannelInternalFieldCount);
-        break;
-    }
-
-    case V8ClassIndex::MESSAGEPORT: {
-        // Reserve one more internal field for keeping event listeners.
-        v8::Local<v8::ObjectTemplate> instanceTemplate = descriptor->InstanceTemplate();
-        instanceTemplate->SetInternalFieldCount(V8Custom::kMessagePortInternalFieldCount);
-        break;
-    }
-
-#if ENABLE(NOTIFICATIONS)
-    case V8ClassIndex::NOTIFICATION: {
-        // Reserve one more internal field for keeping event listeners.
-        v8::Local<v8::ObjectTemplate> instanceTemplate = descriptor->InstanceTemplate();
-        instanceTemplate->SetInternalFieldCount(V8Custom::kNotificationInternalFieldCount);
-        break;
-    }
-#endif // NOTIFICATIONS
-
-#if ENABLE(SVG)
-    case V8ClassIndex::SVGELEMENTINSTANCE: {
-        // Reserve one more internal field for keeping event listeners.
-        v8::Local<v8::ObjectTemplate> instanceTemplate = descriptor->InstanceTemplate();
-        instanceTemplate->SetInternalFieldCount(V8Custom::kSVGElementInstanceInternalFieldCount);
-        break;
-    }
-#endif
-
-#if ENABLE(WORKERS)
-    case V8ClassIndex::ABSTRACTWORKER: {
-        // Reserve one more internal field for keeping event listeners.
-        v8::Local<v8::ObjectTemplate> instanceTemplate = descriptor->InstanceTemplate();
-        instanceTemplate->SetInternalFieldCount(V8Custom::kAbstractWorkerInternalFieldCount);
-        break;
-    }
-
-    case V8ClassIndex::DEDICATEDWORKERCONTEXT: {
-        // Reserve internal fields for keeping event listeners.
-        v8::Local<v8::ObjectTemplate> instanceTemplate = descriptor->InstanceTemplate();
-        ASSERT(instanceTemplate->InternalFieldCount() == V8Custom::kDefaultWrapperInternalFieldCount);
-        instanceTemplate->SetInternalFieldCount(V8Custom::kDedicatedWorkerContextInternalFieldCount);
-        break;
-    }
-
-    case V8ClassIndex::WORKER: {
-        // Reserve one more internal field for keeping event listeners.
-        v8::Local<v8::ObjectTemplate> instanceTemplate = descriptor->InstanceTemplate();
-        instanceTemplate->SetInternalFieldCount(V8Custom::kWorkerInternalFieldCount);
-        descriptor->SetCallHandler(USE_CALLBACK(WorkerConstructor));
-        break;
-    }
-
-    case V8ClassIndex::WORKERCONTEXT: {
-        // Reserve one more internal field for keeping event listeners.
-        v8::Local<v8::ObjectTemplate> instanceTemplate = descriptor->InstanceTemplate();
-        ASSERT(instanceTemplate->InternalFieldCount() == V8Custom::kDefaultWrapperInternalFieldCount);
-        instanceTemplate->SetInternalFieldCount(V8Custom::kWorkerContextMinimumInternalFieldCount);
-        break;
-    }
-
-#endif // WORKERS
-
-#if ENABLE(SHARED_WORKERS)
-    case V8ClassIndex::SHAREDWORKER: {
-        // Reserve one more internal field for keeping event listeners.
-        v8::Local<v8::ObjectTemplate> instanceTemplate = descriptor->InstanceTemplate();
-        instanceTemplate->SetInternalFieldCount(V8Custom::kSharedWorkerInternalFieldCount);
-        descriptor->SetCallHandler(USE_CALLBACK(SharedWorkerConstructor));
-        break;
-    }
-
-    case V8ClassIndex::SHAREDWORKERCONTEXT: {
-        // Reserve internal fields for keeping event listeners.
-        v8::Local<v8::ObjectTemplate> instanceTemplate = descriptor->InstanceTemplate();
-        ASSERT(instanceTemplate->InternalFieldCount() == V8Custom::kDefaultWrapperInternalFieldCount);
-        instanceTemplate->SetInternalFieldCount(V8Custom::kSharedWorkerContextInternalFieldCount);
-        break;
-    }
-#endif // SHARED_WORKERS
-
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
-    case V8ClassIndex::DOMAPPLICATIONCACHE: {
-        // Reserve one more internal field for keeping event listeners.
-        v8::Local<v8::ObjectTemplate> instanceTemplate = descriptor->InstanceTemplate();
-        instanceTemplate->SetInternalFieldCount(V8Custom::kDOMApplicationCacheFieldCount);
-        break;
-    }
-#endif
-
-#if ENABLE(3D_CANVAS)
-    // The following objects are created from JavaScript.
-    case V8ClassIndex::WEBGLARRAYBUFFER:
-        descriptor->SetCallHandler(USE_CALLBACK(WebGLArrayBufferConstructor));
-        break;
-    case V8ClassIndex::WEBGLBYTEARRAY:
-        descriptor->SetCallHandler(USE_CALLBACK(WebGLByteArrayConstructor));
-        break;
-    case V8ClassIndex::WEBGLFLOATARRAY:
-        descriptor->SetCallHandler(USE_CALLBACK(WebGLFloatArrayConstructor));
-        break;
-    case V8ClassIndex::WEBGLINTARRAY:
-        descriptor->SetCallHandler(USE_CALLBACK(WebGLIntArrayConstructor));
-        break;
-    case V8ClassIndex::WEBGLSHORTARRAY:
-        descriptor->SetCallHandler(USE_CALLBACK(WebGLShortArrayConstructor));
-        break;
-    case V8ClassIndex::WEBGLUNSIGNEDBYTEARRAY:
-        descriptor->SetCallHandler(USE_CALLBACK(WebGLUnsignedByteArrayConstructor));
-        break;
-    case V8ClassIndex::WEBGLUNSIGNEDINTARRAY:
-        descriptor->SetCallHandler(USE_CALLBACK(WebGLUnsignedIntArrayConstructor));
-        break;
-    case V8ClassIndex::WEBGLUNSIGNEDSHORTARRAY:
-        descriptor->SetCallHandler(USE_CALLBACK(WebGLUnsignedShortArrayConstructor));
-        break;
-#endif
-    case V8ClassIndex::DOMPARSER:
-        descriptor->SetCallHandler(USE_CALLBACK(DOMParserConstructor));
-        break;
-    case V8ClassIndex::WEBKITCSSMATRIX:
-        descriptor->SetCallHandler(USE_CALLBACK(WebKitCSSMatrixConstructor));
-        break;
-    case V8ClassIndex::WEBKITPOINT:
-        descriptor->SetCallHandler(USE_CALLBACK(WebKitPointConstructor));
-        break;
-#if ENABLE(WEB_SOCKETS)
-    case V8ClassIndex::WEBSOCKET: {
-        // Reserve one more internal field for keeping event listeners.
-        v8::Local<v8::ObjectTemplate> instanceTemplate = descriptor->InstanceTemplate();
-        instanceTemplate->SetInternalFieldCount(V8Custom::kWebSocketInternalFieldCount);
-        descriptor->SetCallHandler(USE_CALLBACK(WebSocketConstructor));
-        break;
-    }
-#endif
-    case V8ClassIndex::XMLSERIALIZER:
-        descriptor->SetCallHandler(USE_CALLBACK(XMLSerializerConstructor));
-        break;
-    case V8ClassIndex::XMLHTTPREQUEST: {
-        // Reserve one more internal field for keeping event listeners.
-        v8::Local<v8::ObjectTemplate> instanceTemplate = descriptor->InstanceTemplate();
-        instanceTemplate->SetInternalFieldCount(V8Custom::kXMLHttpRequestInternalFieldCount);
-        descriptor->SetCallHandler(USE_CALLBACK(XMLHttpRequestConstructor));
-        break;
-    }
-    case V8ClassIndex::XMLHTTPREQUESTUPLOAD: {
-        // Reserve one more internal field for keeping event listeners.
-        v8::Local<v8::ObjectTemplate> instanceTemplate = descriptor->InstanceTemplate();
-        instanceTemplate->SetInternalFieldCount(V8Custom::kXMLHttpRequestInternalFieldCount);
-        break;
-    }
-#if ENABLE(XPATH)
-    case V8ClassIndex::XPATHEVALUATOR:
-        descriptor->SetCallHandler(USE_CALLBACK(XPathEvaluatorConstructor));
-        break;
-#endif
-#if ENABLE(XSLT)
-    case V8ClassIndex::XSLTPROCESSOR:
-        descriptor->SetCallHandler(USE_CALLBACK(XSLTProcessorConstructor));
-        break;
-#endif
-// ANDROID: Upstream TOUCH_EVENTS.
-#if ENABLE(TOUCH_EVENTS)
-    case V8ClassIndex::TOUCHLIST: {
-        v8::Local<v8::ObjectTemplate> instanceTemplate = descriptor->InstanceTemplate();
-        instanceTemplate->SetIndexedPropertyHandler(USE_INDEXED_PROPERTY_GETTER(TouchList));
-      break;
-    }
-#endif
-    case V8ClassIndex::CLIENTRECTLIST:
-        descriptor->InstanceTemplate()->SetIndexedPropertyHandler(USE_INDEXED_PROPERTY_GETTER(ClientRectList));
-        break;
-    case V8ClassIndex::FILELIST:
-        descriptor->InstanceTemplate()->SetIndexedPropertyHandler(USE_INDEXED_PROPERTY_GETTER(FileList));
-        break;
-#if ENABLE(DATAGRID)
-    case V8ClassIndex::DATAGRIDCOLUMNLIST:
-        descriptor->InstanceTemplate()->SetIndexedPropertyHandler(USE_INDEXED_PROPERTY_GETTER(DataGridColumnList));
-        descriptor->InstanceTemplate()->SetNamedPropertyHandler(USE_NAMED_PROPERTY_GETTER(DataGridColumnList));
-        break;
-#endif
-    default:
-        break;
-    }
-=======
->>>>>>> webkit.org at r54127
 
     *cacheCell = descriptor;
     return descriptor;
diff --git a/WebCore/bindings/v8/custom/V8CustomBinding.h b/WebCore/bindings/v8/custom/V8CustomBinding.h
index 25f4507..0c96cb1 100644
--- a/WebCore/bindings/v8/custom/V8CustomBinding.h
+++ b/WebCore/bindings/v8/custom/V8CustomBinding.h
@@ -43,387 +43,6 @@ namespace WebCore {
         DECLARE_CALLBACK(HTMLAudioElementConstructor);
         DECLARE_CALLBACK(HTMLImageElementConstructor);
         DECLARE_CALLBACK(HTMLOptionElementConstructor);
-<<<<<<< HEAD
-        DECLARE_CALLBACK(MessageChannelConstructor);
-        DECLARE_CALLBACK(WebKitCSSMatrixConstructor);
-        DECLARE_CALLBACK(WebKitPointConstructor);
-        DECLARE_CALLBACK(XMLHttpRequestConstructor);
-        DECLARE_CALLBACK(XMLSerializerConstructor);
-        DECLARE_CALLBACK(XPathEvaluatorConstructor);
-        DECLARE_CALLBACK(XSLTProcessorConstructor);
-
-        DECLARE_CALLBACK(XSLTProcessorImportStylesheet);
-        DECLARE_CALLBACK(XSLTProcessorTransformToFragment);
-        DECLARE_CALLBACK(XSLTProcessorTransformToDocument);
-        DECLARE_CALLBACK(XSLTProcessorSetParameter);
-        DECLARE_CALLBACK(XSLTProcessorGetParameter);
-        DECLARE_CALLBACK(XSLTProcessorRemoveParameter);
-
-        DECLARE_CALLBACK(CSSPrimitiveValueGetRGBColorValue);
-
-        DECLARE_CALLBACK(CanvasRenderingContext2DSetStrokeColor);
-        DECLARE_CALLBACK(CanvasRenderingContext2DSetFillColor);
-        DECLARE_CALLBACK(CanvasRenderingContext2DStrokeRect);
-        DECLARE_CALLBACK(CanvasRenderingContext2DSetShadow);
-        DECLARE_CALLBACK(CanvasRenderingContext2DDrawImage);
-        DECLARE_CALLBACK(CanvasRenderingContext2DDrawImageFromRect);
-        DECLARE_CALLBACK(CanvasRenderingContext2DCreatePattern);
-        DECLARE_CALLBACK(CanvasRenderingContext2DFillText);
-        DECLARE_CALLBACK(CanvasRenderingContext2DStrokeText);
-        DECLARE_CALLBACK(CanvasRenderingContext2DPutImageData);
-
-#if ENABLE(3D_CANVAS)
-        DECLARE_CALLBACK(WebGLRenderingContextBufferData);
-        DECLARE_CALLBACK(WebGLRenderingContextBufferSubData);
-        DECLARE_CALLBACK(WebGLRenderingContextGetBufferParameter);
-        DECLARE_CALLBACK(WebGLRenderingContextGetFramebufferAttachmentParameter);
-        DECLARE_CALLBACK(WebGLRenderingContextGetParameter);
-        DECLARE_CALLBACK(WebGLRenderingContextGetProgramParameter);
-        DECLARE_CALLBACK(WebGLRenderingContextGetRenderbufferParameter);
-        DECLARE_CALLBACK(WebGLRenderingContextGetShaderParameter);
-        DECLARE_CALLBACK(WebGLRenderingContextGetTexParameter);
-        DECLARE_CALLBACK(WebGLRenderingContextGetUniform);
-        DECLARE_CALLBACK(WebGLRenderingContextGetVertexAttrib);
-        DECLARE_CALLBACK(WebGLRenderingContextTexImage2D);
-        DECLARE_CALLBACK(WebGLRenderingContextTexSubImage2D);
-        DECLARE_CALLBACK(WebGLRenderingContextUniform1fv);
-        DECLARE_CALLBACK(WebGLRenderingContextUniform1iv);
-        DECLARE_CALLBACK(WebGLRenderingContextUniform2fv);
-        DECLARE_CALLBACK(WebGLRenderingContextUniform2iv);
-        DECLARE_CALLBACK(WebGLRenderingContextUniform3fv);
-        DECLARE_CALLBACK(WebGLRenderingContextUniform3iv);
-        DECLARE_CALLBACK(WebGLRenderingContextUniform4fv);
-        DECLARE_CALLBACK(WebGLRenderingContextUniform4iv);
-        DECLARE_CALLBACK(WebGLRenderingContextUniformMatrix2fv);
-        DECLARE_CALLBACK(WebGLRenderingContextUniformMatrix3fv);
-        DECLARE_CALLBACK(WebGLRenderingContextUniformMatrix4fv);
-        DECLARE_CALLBACK(WebGLRenderingContextVertexAttrib1fv);
-        DECLARE_CALLBACK(WebGLRenderingContextVertexAttrib2fv);
-        DECLARE_CALLBACK(WebGLRenderingContextVertexAttrib3fv);
-        DECLARE_CALLBACK(WebGLRenderingContextVertexAttrib4fv);
-
-        DECLARE_CALLBACK(WebGLArrayBufferConstructor);
-        DECLARE_CALLBACK(WebGLByteArrayConstructor);
-        DECLARE_CALLBACK(WebGLFloatArrayConstructor);
-        DECLARE_CALLBACK(WebGLIntArrayConstructor);
-        DECLARE_CALLBACK(WebGLShortArrayConstructor);
-        DECLARE_CALLBACK(WebGLUnsignedByteArrayConstructor);
-        DECLARE_CALLBACK(WebGLUnsignedIntArrayConstructor);
-        DECLARE_CALLBACK(WebGLUnsignedShortArrayConstructor);
-#endif
-
-        DECLARE_PROPERTY_ACCESSOR_GETTER(ClipboardTypes);
-        DECLARE_CALLBACK(ClipboardClearData);
-        DECLARE_CALLBACK(ClipboardGetData);
-        DECLARE_CALLBACK(ClipboardSetData);
-        DECLARE_CALLBACK(ClipboardSetDragImage);
-
-        DECLARE_CALLBACK(ElementQuerySelector);
-        DECLARE_CALLBACK(ElementQuerySelectorAll);
-        DECLARE_CALLBACK(ElementSetAttribute);
-        DECLARE_CALLBACK(ElementSetAttributeNode);
-        DECLARE_CALLBACK(ElementSetAttributeNS);
-        DECLARE_CALLBACK(ElementSetAttributeNodeNS);
-
-        DECLARE_CALLBACK(HistoryPushState);
-        DECLARE_CALLBACK(HistoryReplaceState);
-
-        DECLARE_PROPERTY_ACCESSOR_SETTER(LocationProtocol);
-        DECLARE_PROPERTY_ACCESSOR_SETTER(LocationHost);
-        DECLARE_PROPERTY_ACCESSOR_SETTER(LocationHostname);
-        DECLARE_PROPERTY_ACCESSOR_SETTER(LocationPort);
-        DECLARE_PROPERTY_ACCESSOR_SETTER(LocationPathname);
-        DECLARE_PROPERTY_ACCESSOR_SETTER(LocationSearch);
-        DECLARE_PROPERTY_ACCESSOR_SETTER(LocationHash);
-        DECLARE_PROPERTY_ACCESSOR_SETTER(LocationHref);
-        DECLARE_PROPERTY_ACCESSOR_GETTER(LocationAssign);
-        DECLARE_PROPERTY_ACCESSOR_GETTER(LocationReplace);
-        DECLARE_PROPERTY_ACCESSOR_GETTER(LocationReload);
-        DECLARE_CALLBACK(LocationAssign);
-        DECLARE_CALLBACK(LocationReplace);
-        DECLARE_CALLBACK(LocationReload);
-        DECLARE_CALLBACK(LocationToString);
-        DECLARE_CALLBACK(LocationValueOf);
-        DECLARE_CALLBACK(NodeAddEventListener);
-        DECLARE_CALLBACK(NodeRemoveEventListener);
-        DECLARE_CALLBACK(NodeInsertBefore);
-        DECLARE_CALLBACK(NodeReplaceChild);
-        DECLARE_CALLBACK(NodeRemoveChild);
-        DECLARE_CALLBACK(NodeAppendChild);
-
-        // We actually only need this because WebKit has
-        // navigator.appVersion as custom. Our version just
-        // passes through.
-        DECLARE_PROPERTY_ACCESSOR(NavigatorAppVersion);
-
-        DECLARE_PROPERTY_ACCESSOR(XMLHttpRequestOnabort);
-        DECLARE_PROPERTY_ACCESSOR(XMLHttpRequestOnerror);
-        DECLARE_PROPERTY_ACCESSOR(XMLHttpRequestOnload);
-        DECLARE_PROPERTY_ACCESSOR(XMLHttpRequestOnloadstart);
-        DECLARE_PROPERTY_ACCESSOR(XMLHttpRequestOnprogress);
-        DECLARE_PROPERTY_ACCESSOR(XMLHttpRequestOnreadystatechange);
-        DECLARE_PROPERTY_ACCESSOR(XMLHttpRequestResponseText);
-        DECLARE_CALLBACK(XMLHttpRequestAddEventListener);
-        DECLARE_CALLBACK(XMLHttpRequestRemoveEventListener);
-        DECLARE_CALLBACK(XMLHttpRequestOpen);
-        DECLARE_CALLBACK(XMLHttpRequestSend);
-        DECLARE_CALLBACK(XMLHttpRequestSetRequestHeader);
-        DECLARE_CALLBACK(XMLHttpRequestGetResponseHeader);
-        DECLARE_CALLBACK(XMLHttpRequestOverrideMimeType);
-        DECLARE_CALLBACK(XMLHttpRequestDispatchEvent);
-
-        DECLARE_PROPERTY_ACCESSOR(XMLHttpRequestUploadOnabort);
-        DECLARE_PROPERTY_ACCESSOR(XMLHttpRequestUploadOnerror);
-        DECLARE_PROPERTY_ACCESSOR(XMLHttpRequestUploadOnload);
-        DECLARE_PROPERTY_ACCESSOR(XMLHttpRequestUploadOnloadstart);
-        DECLARE_PROPERTY_ACCESSOR(XMLHttpRequestUploadOnprogress);
-        DECLARE_CALLBACK(XMLHttpRequestUploadAddEventListener);
-        DECLARE_CALLBACK(XMLHttpRequestUploadRemoveEventListener);
-        DECLARE_CALLBACK(XMLHttpRequestUploadDispatchEvent);
-
-        DECLARE_CALLBACK(TreeWalkerParentNode);
-        DECLARE_CALLBACK(TreeWalkerFirstChild);
-        DECLARE_CALLBACK(TreeWalkerLastChild);
-        DECLARE_CALLBACK(TreeWalkerNextNode);
-        DECLARE_CALLBACK(TreeWalkerPreviousNode);
-        DECLARE_CALLBACK(TreeWalkerNextSibling);
-        DECLARE_CALLBACK(TreeWalkerPreviousSibling);
-
-        DECLARE_CALLBACK(InjectedScriptHostInspectedWindow);
-        DECLARE_CALLBACK(InjectedScriptHostNodeForId);
-        DECLARE_CALLBACK(InjectedScriptHostWrapObject);
-        DECLARE_CALLBACK(InjectedScriptHostUnwrapObject);
-        DECLARE_CALLBACK(InjectedScriptHostPushNodePathToFrontend);
-        DECLARE_CALLBACK(InjectedScriptHostWrapCallback);
-#if ENABLE(DATABASE)
-        DECLARE_CALLBACK(InjectedScriptHostSelectDatabase);
-        DECLARE_CALLBACK(InjectedScriptHostDatabaseForId);
-#endif
-#if ENABLE(DOM_STORAGE)
-        DECLARE_CALLBACK(InjectedScriptHostSelectDOMStorage);
-#endif
-
-        DECLARE_CALLBACK(InspectorFrontendHostSearch);
-        DECLARE_CALLBACK(InspectorFrontendHostShowContextMenu);
-
-        DECLARE_CALLBACK(ConsoleProfile);
-        DECLARE_CALLBACK(ConsoleProfileEnd);
-
-        DECLARE_CALLBACK(NodeIteratorNextNode);
-        DECLARE_CALLBACK(NodeIteratorPreviousNode);
-
-        DECLARE_CALLBACK(NodeFilterAcceptNode);
-
-        DECLARE_CALLBACK(HTMLFormElementSubmit);
-
-        DECLARE_NAMED_PROPERTY_GETTER(DOMWindow);
-        DECLARE_INDEXED_PROPERTY_GETTER(DOMWindow);
-        DECLARE_NAMED_ACCESS_CHECK(DOMWindow);
-        DECLARE_INDEXED_ACCESS_CHECK(DOMWindow);
-
-        DECLARE_NAMED_PROPERTY_GETTER(HTMLFrameSetElement);
-        DECLARE_NAMED_PROPERTY_GETTER(HTMLFormElement);
-        DECLARE_NAMED_PROPERTY_GETTER(NodeList);
-        DECLARE_NAMED_PROPERTY_GETTER(NamedNodeMap);
-        DECLARE_NAMED_PROPERTY_GETTER(CSSStyleDeclaration);
-        DECLARE_NAMED_PROPERTY_SETTER(CSSStyleDeclaration);
-        DECLARE_NAMED_PROPERTY_GETTER(HTMLPlugInElement);
-        DECLARE_NAMED_PROPERTY_SETTER(HTMLPlugInElement);
-        DECLARE_INDEXED_PROPERTY_GETTER(HTMLPlugInElement);
-        DECLARE_INDEXED_PROPERTY_SETTER(HTMLPlugInElement);
-
-        DECLARE_CALLBACK(HTMLPlugInElement);
-
-        DECLARE_NAMED_PROPERTY_GETTER(StyleSheetList);
-        DECLARE_INDEXED_PROPERTY_GETTER(NamedNodeMap);
-        DECLARE_INDEXED_PROPERTY_GETTER(HTMLFormElement);
-        DECLARE_INDEXED_PROPERTY_GETTER(HTMLOptionsCollection);
-        DECLARE_INDEXED_PROPERTY_SETTER(HTMLOptionsCollection);
-        DECLARE_NAMED_PROPERTY_GETTER(HTMLSelectElementCollection);
-        DECLARE_INDEXED_PROPERTY_SETTER(HTMLSelectElementCollection);
-        DECLARE_NAMED_PROPERTY_GETTER(HTMLAllCollection);
-        DECLARE_NAMED_PROPERTY_GETTER(HTMLCollection);
-
-#if ENABLE(3D_CANVAS)
-        DECLARE_CALLBACK(WebGLByteArrayGet);
-        DECLARE_CALLBACK(WebGLByteArraySet);
-        DECLARE_INDEXED_PROPERTY_GETTER(WebGLByteArray);
-        DECLARE_INDEXED_PROPERTY_SETTER(WebGLByteArray);
-
-        DECLARE_CALLBACK(WebGLFloatArrayGet);
-        DECLARE_CALLBACK(WebGLFloatArraySet);
-        DECLARE_INDEXED_PROPERTY_GETTER(WebGLFloatArray);
-        DECLARE_INDEXED_PROPERTY_SETTER(WebGLFloatArray);
-
-        DECLARE_CALLBACK(WebGLIntArrayGet);
-        DECLARE_CALLBACK(WebGLIntArraySet);
-        DECLARE_INDEXED_PROPERTY_GETTER(WebGLIntArray);
-        DECLARE_INDEXED_PROPERTY_SETTER(WebGLIntArray);
-
-        DECLARE_CALLBACK(WebGLShortArrayGet);
-        DECLARE_CALLBACK(WebGLShortArraySet);
-        DECLARE_INDEXED_PROPERTY_GETTER(WebGLShortArray);
-        DECLARE_INDEXED_PROPERTY_SETTER(WebGLShortArray);
-
-        DECLARE_CALLBACK(WebGLUnsignedByteArrayGet);
-        DECLARE_CALLBACK(WebGLUnsignedByteArraySet);
-        DECLARE_INDEXED_PROPERTY_GETTER(WebGLUnsignedByteArray);
-        DECLARE_INDEXED_PROPERTY_SETTER(WebGLUnsignedByteArray);
-
-        DECLARE_CALLBACK(WebGLUnsignedIntArrayGet);
-        DECLARE_CALLBACK(WebGLUnsignedIntArraySet);
-        DECLARE_INDEXED_PROPERTY_GETTER(WebGLUnsignedIntArray);
-        DECLARE_INDEXED_PROPERTY_SETTER(WebGLUnsignedIntArray);
-
-        DECLARE_CALLBACK(WebGLUnsignedShortArrayGet);
-        DECLARE_CALLBACK(WebGLUnsignedShortArraySet);
-        DECLARE_INDEXED_PROPERTY_GETTER(WebGLUnsignedShortArray);
-        DECLARE_INDEXED_PROPERTY_SETTER(WebGLUnsignedShortArray);
-#endif
-
-        DECLARE_PROPERTY_ACCESSOR_GETTER(MessageEventPorts);
-        DECLARE_CALLBACK(MessageEventInitMessageEvent);
-
-        DECLARE_PROPERTY_ACCESSOR(MessagePortOnmessage);
-        DECLARE_PROPERTY_ACCESSOR(MessagePortOnclose);
-        DECLARE_CALLBACK(MessagePortAddEventListener);
-        DECLARE_CALLBACK(MessagePortPostMessage);
-        DECLARE_CALLBACK(MessagePortRemoveEventListener);
-        DECLARE_CALLBACK(MessagePortStartConversation);
-
-        DECLARE_CALLBACK(DatabaseChangeVersion);
-        DECLARE_CALLBACK(DatabaseTransaction);
-        DECLARE_CALLBACK(DatabaseReadTransaction);
-        DECLARE_CALLBACK(SQLTransactionExecuteSql);
-        DECLARE_CALLBACK(SQLResultSetRowListItem);
-
-        DECLARE_INDEXED_PROPERTY_GETTER(ClientRectList);
-        DECLARE_INDEXED_PROPERTY_GETTER(FileList);
-
-#if ENABLE(DATAGRID)
-        DECLARE_PROPERTY_ACCESSOR(HTMLDataGridElementDataSource);
-        DECLARE_INDEXED_PROPERTY_GETTER(DataGridColumnList);
-        DECLARE_NAMED_PROPERTY_GETTER(DataGridColumnList);
-#endif
-
-#if ENABLE(DATABASE)
-        DECLARE_ACCESSOR_RUNTIME_ENABLER(DOMWindowOpenDatabase);
-#endif
-
-#if ENABLE(DOM_STORAGE)
-        DECLARE_ACCESSOR_RUNTIME_ENABLER(DOMWindowLocalStorage);
-        DECLARE_ACCESSOR_RUNTIME_ENABLER(DOMWindowSessionStorage);
-        DECLARE_INDEXED_PROPERTY_GETTER(Storage);
-        DECLARE_INDEXED_PROPERTY_SETTER(Storage);
-        DECLARE_INDEXED_PROPERTY_DELETER(Storage);
-        DECLARE_NAMED_PROPERTY_GETTER(Storage);
-        DECLARE_NAMED_PROPERTY_SETTER(Storage);
-        DECLARE_NAMED_PROPERTY_DELETER(Storage);
-        static v8::Handle<v8::Array> v8StorageNamedPropertyEnumerator(const v8::AccessorInfo& info);
-#endif
-
-#if ENABLE(SVG)
-        DECLARE_PROPERTY_ACCESSOR_GETTER(SVGLengthValue);
-        DECLARE_CALLBACK(SVGLengthConvertToSpecifiedUnits);
-        DECLARE_CALLBACK(SVGMatrixMultiply);
-        DECLARE_CALLBACK(SVGMatrixInverse);
-        DECLARE_CALLBACK(SVGMatrixRotateFromVector);
-        DECLARE_CALLBACK(SVGElementInstanceAddEventListener);
-        DECLARE_CALLBACK(SVGElementInstanceRemoveEventListener);
-#endif
-
-#if ENABLE(TOUCH_EVENTS)
-        DECLARE_INDEXED_PROPERTY_GETTER(TouchList);
-#endif
-
-#if ENABLE(WORKERS)
-        DECLARE_PROPERTY_ACCESSOR(AbstractWorkerOnerror);
-        DECLARE_CALLBACK(AbstractWorkerAddEventListener);
-        DECLARE_CALLBACK(AbstractWorkerRemoveEventListener);
-
-        DECLARE_PROPERTY_ACCESSOR(DedicatedWorkerContextOnmessage);
-        DECLARE_CALLBACK(DedicatedWorkerContextPostMessage);
-
-        DECLARE_PROPERTY_ACCESSOR(WorkerOnmessage);
-        DECLARE_CALLBACK(WorkerPostMessage);
-        DECLARE_CALLBACK(WorkerConstructor);
-
-        DECLARE_PROPERTY_ACCESSOR_GETTER(WorkerContextSelf);
-        DECLARE_PROPERTY_ACCESSOR(WorkerContextOnerror);
-        DECLARE_CALLBACK(WorkerContextImportScripts);
-        DECLARE_CALLBACK(WorkerContextSetTimeout);
-        DECLARE_CALLBACK(WorkerContextClearTimeout);
-        DECLARE_CALLBACK(WorkerContextSetInterval);
-        DECLARE_CALLBACK(WorkerContextClearInterval);
-        DECLARE_CALLBACK(WorkerContextAddEventListener);
-        DECLARE_CALLBACK(WorkerContextRemoveEventListener);
-
-#if ENABLE(NOTIFICATIONS)
-        DECLARE_ACCESSOR_RUNTIME_ENABLER(WorkerContextWebkitNotifications);
-#endif
-#endif // ENABLE(WORKERS)
-
-#if ENABLE(NOTIFICATIONS)
-        DECLARE_CALLBACK(NotificationCenterRequestPermission);
-        DECLARE_CALLBACK(NotificationCenterCreateNotification);
-        DECLARE_CALLBACK(NotificationCenterCreateHTMLNotification);
-
-        DECLARE_CALLBACK(NotificationAddEventListener);
-        DECLARE_CALLBACK(NotificationRemoveEventListener);
-        DECLARE_PROPERTY_ACCESSOR(NotificationEventHandler);
-#endif // ENABLE(NOTIFICATIONS)
-
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
-        DECLARE_ACCESSOR_RUNTIME_ENABLER(DOMWindowApplicationCache);
-        DECLARE_PROPERTY_ACCESSOR(DOMApplicationCacheEventHandler);
-        DECLARE_CALLBACK(DOMApplicationCacheAddEventListener);
-        DECLARE_CALLBACK(DOMApplicationCacheRemoveEventListener);
-#endif
-
-#if ENABLE(SHARED_WORKERS)
-        DECLARE_CALLBACK(SharedWorkerConstructor);
-        DECLARE_ACCESSOR_RUNTIME_ENABLER(DOMWindowSharedWorker);
-#endif
-
-#if ENABLE(NOTIFICATIONS)
-        DECLARE_ACCESSOR_RUNTIME_ENABLER(DOMWindowWebkitNotifications);
-#endif
-
-#if ENABLE(WEB_SOCKETS)
-        DECLARE_PROPERTY_ACCESSOR(WebSocketOnopen);
-        DECLARE_PROPERTY_ACCESSOR(WebSocketOnmessage);
-        DECLARE_PROPERTY_ACCESSOR(WebSocketOnclose);
-        DECLARE_CALLBACK(WebSocketConstructor);
-        DECLARE_CALLBACK(WebSocketAddEventListener);
-        DECLARE_CALLBACK(WebSocketRemoveEventListener);
-        DECLARE_CALLBACK(WebSocketSend);
-        DECLARE_CALLBACK(WebSocketClose);
-        DECLARE_ACCESSOR_RUNTIME_ENABLER(DOMWindowWebSocket);
-#endif
-
-        DECLARE_CALLBACK(GeolocationGetCurrentPosition);
-        DECLARE_CALLBACK(GeolocationWatchPosition);
-        DECLARE_PROPERTY_ACCESSOR_GETTER(CoordinatesAltitude);
-        DECLARE_PROPERTY_ACCESSOR_GETTER(CoordinatesAltitudeAccuracy);
-        DECLARE_PROPERTY_ACCESSOR_GETTER(CoordinatesHeading);
-        DECLARE_PROPERTY_ACCESSOR_GETTER(CoordinatesSpeed);
-
-#undef DECLARE_INDEXED_ACCESS_CHECK
-#undef DECLARE_NAMED_ACCESS_CHECK
-
-#undef DECLARE_PROPERTY_ACCESSOR_SETTER
-#undef DECLARE_PROPERTY_ACCESSOR_GETTER
-#undef DECLARE_PROPERTY_ACCESSOR
-
-#undef DECLARE_NAMED_PROPERTY_GETTER
-#undef DECLARE_NAMED_PROPERTY_SETTER
-#undef DECLARE_NAMED_PROPERTY_DELETER
-
-#undef DECLARE_INDEXED_PROPERTY_GETTER
-#undef DECLARE_INDEXED_PROPERTY_SETTER
-#undef DECLARE_INDEXED_PROPERTY_DELETER
-=======
->>>>>>> webkit.org at r54127
 
 #undef DECLARE_CALLBACK
     };
diff --git a/WebCore/bindings/v8/custom/V8TouchListCustom.cpp b/WebCore/bindings/v8/custom/V8TouchListCustom.cpp
deleted file mode 100644
index 97aad52..0000000
--- a/WebCore/bindings/v8/custom/V8TouchListCustom.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (C) 2009 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.
- */
-
-// TODO(andreip): upstream touch related changes to Chromium
-#include "config.h"
-
-#if ENABLE(TOUCH_EVENTS)
-#include "TouchList.h"
-
-#include "Touch.h"
-
-#include "V8Binding.h"
-#include "V8CustomBinding.h"
-#include "V8DOMWrapper.h"
-
-#include <wtf/RefPtr.h>
-
-namespace WebCore {
-
-INDEXED_PROPERTY_GETTER(TouchList)
-{
-    INC_STATS("DOM.TouchList.IndexedPropertyGetter");
-    TouchList* imp = V8DOMWrapper::convertToNativeObject<TouchList>(V8ClassIndex::TOUCHLIST, info.Holder());
-    RefPtr<Touch> result = imp->item(index);
-    if (!result)
-        return notHandledByInterceptor();
-
-    return V8DOMWrapper::convertToV8Object(V8ClassIndex::TOUCH, result.get());
-}
-} // namespace WebCore
-
-#endif // TOUCH_EVENTS