diff options
| author | Andrei Popescu <andreip@google.com> | 2010-01-11 08:03:30 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-01-11 08:03:30 -0800 |
| commit | c74d807c018da5b7a0f8c89e0e735361c59092ac (patch) | |
| tree | ded2072a77b111ec737ae1ae5861ace1c379221b /WebCore | |
| parent | 7c1b3b8c573eed35ddc15fd7dd3d762403f30755 (diff) | |
| parent | 5f53aa361c2190e849eaea8aa53984acbc4cc63f (diff) | |
| download | external_webkit-c74d807c018da5b7a0f8c89e0e735361c59092ac.zip external_webkit-c74d807c018da5b7a0f8c89e0e735361c59092ac.tar.gz external_webkit-c74d807c018da5b7a0f8c89e0e735361c59092ac.tar.bz2 | |
Merge "Update v8/bindings to remove the ANDROID #ifdefs and confirm that DOMData now officially has a virtual dtor."
Diffstat (limited to 'WebCore')
| -rw-r--r-- | WebCore/bindings/v8/ChildThreadDOMData.h | 3 | ||||
| -rw-r--r-- | WebCore/bindings/v8/DOMData.cpp | 4 | ||||
| -rw-r--r-- | WebCore/bindings/v8/DOMData.h | 4 |
3 files changed, 5 insertions, 6 deletions
diff --git a/WebCore/bindings/v8/ChildThreadDOMData.h b/WebCore/bindings/v8/ChildThreadDOMData.h index 173a5e8..dfb85e8 100644 --- a/WebCore/bindings/v8/ChildThreadDOMData.h +++ b/WebCore/bindings/v8/ChildThreadDOMData.h @@ -39,9 +39,6 @@ namespace WebCore { class ChildThreadDOMData : public DOMData { public: ChildThreadDOMData(); -#if PLATFORM(ANDROID) - virtual ~ChildThreadDOMData() { } -#endif DOMDataStore& getStore(); diff --git a/WebCore/bindings/v8/DOMData.cpp b/WebCore/bindings/v8/DOMData.cpp index 54bcc55..ec9a938 100644 --- a/WebCore/bindings/v8/DOMData.cpp +++ b/WebCore/bindings/v8/DOMData.cpp @@ -44,6 +44,10 @@ DOMData::DOMData() { } +DOMData::~DOMData() +{ +} + DOMData* DOMData::getCurrent() { if (WTF::isMainThread()) diff --git a/WebCore/bindings/v8/DOMData.h b/WebCore/bindings/v8/DOMData.h index 7bf9f91..4947e82 100644 --- a/WebCore/bindings/v8/DOMData.h +++ b/WebCore/bindings/v8/DOMData.h @@ -45,9 +45,7 @@ namespace WebCore { class DOMData : public Noncopyable { public: DOMData(); -#if PLATFORM(ANDROID) - virtual ~DOMData() { } -#endif + virtual ~DOMData(); static DOMData* getCurrent(); virtual DOMDataStore& getStore() = 0; |