OSDN Git Service

Merge webkit.org at r54127 : Fix conflict with addition of virtual destructor to...
authorSteve Block <steveblock@google.com>
Tue, 2 Feb 2010 18:33:51 +0000 (18:33 +0000)
committerSteve Block <steveblock@google.com>
Thu, 4 Feb 2010 15:07:01 +0000 (15:07 +0000)
commitd6bf7f1ee68ff0a6c4ce9cbfdd9ccade0d75615c
treedca5b3380919bc2f113ebb53416d3ece2814dc56
parenta161eb599140267f553b1efb6458ab4a899d700a
Merge webkit.org at r54127 : Fix conflict with addition of virtual destructor to Visitor class

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
WebCore/bindings/v8/V8DOMMap.h