Merge webkit.org at r54127 : Fix conflict with addition of virtual destructor to...

Android had added a virtual destructor to DOMWrapperMap::Vistor
See https://android-git.corp.google.com/g/#change,21263

DOMWrapperMap::Vistor was removed and WeakReferenceMap::Visitor was added in
http://trac.webkit.org/changeset/51998
DOMWrapperMap inherits from WeakReferenceMap.

The virtual desctructor was upstreamed to webkit.org for WeakReferenceMap::Visitor in
http://trac.webkit.org/changeset/53401
Note that the message in the ChangeLog is incorrect.

Change-Id: Ia801155d0b42100e91b891b0568486fc76d037e1

diff --git a/WebCore/bindings/v8/V8DOMMap.h b/WebCore/bindings/v8/V8DOMMap.h
index 8f93127..d42daa4 100644 (file)
--- a/WebCore/bindings/v8/V8DOMMap.h
+++ b/WebCore/bindings/v8/V8DOMMap.h
@@ -138,15 +138,6 @@ namespace WebCore {
     template <class KeyType> class DOMWrapperMap : public WeakReferenceMap<KeyType, v8::Object> {
     public:
         DOMWrapperMap(v8::WeakReferenceCallback callback) : WeakReferenceMap<KeyType, v8::Object>(callback) { }
-<<<<<<< HEAD
-
-        class Visitor {
-        public:
-          virtual void visitDOMWrapper(KeyType* key, v8::Persistent<v8::Object> object) = 0;
-          virtual ~Visitor() { }
-        };
-=======
->>>>>>> webkit.org at r54127
     };
 
     // An opaque class that represents a set of DOM wrappers.