diff options
| author | Steve Block <steveblock@google.com> | 2010-02-02 18:33:51 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-02-04 15:07:01 +0000 |
| commit | d6bf7f1ee68ff0a6c4ce9cbfdd9ccade0d75615c (patch) | |
| tree | dca5b3380919bc2f113ebb53416d3ece2814dc56 /WebCore/bindings/v8 | |
| parent | a161eb599140267f553b1efb6458ab4a899d700a (diff) | |
| download | external_webkit-d6bf7f1ee68ff0a6c4ce9cbfdd9ccade0d75615c.zip external_webkit-d6bf7f1ee68ff0a6c4ce9cbfdd9ccade0d75615c.tar.gz external_webkit-d6bf7f1ee68ff0a6c4ce9cbfdd9ccade0d75615c.tar.bz2 | |
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
Diffstat (limited to 'WebCore/bindings/v8')
| -rw-r--r-- | WebCore/bindings/v8/V8DOMMap.h | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/WebCore/bindings/v8/V8DOMMap.h b/WebCore/bindings/v8/V8DOMMap.h index 8f93127..d42daa4 100644 --- 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. |