diff options
| author | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-01 22:31:35 +0000 |
|---|---|---|
| committer | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-01 22:31:35 +0000 |
| commit | de56f378336660dcc848763c80267a5e063ae47d (patch) | |
| tree | 7f551b88923b35bc4022ce6ab3a3f602fb60d91c /webkit/pending/TreeShared.h | |
| parent | dc4f63c80cb90efe594131030aad6776e5945fcc (diff) | |
| download | chromium_src-de56f378336660dcc848763c80267a5e063ae47d.zip chromium_src-de56f378336660dcc848763c80267a5e063ae47d.tar.gz chromium_src-de56f378336660dcc848763c80267a5e063ae47d.tar.bz2 | |
Merge the chrome_webkit_merge_branch back on to trunk. This brings us
up to webkit@36102.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2778 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/pending/TreeShared.h')
| -rw-r--r-- | webkit/pending/TreeShared.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/webkit/pending/TreeShared.h b/webkit/pending/TreeShared.h index a33fd1f..bb38364 100644 --- a/webkit/pending/TreeShared.h +++ b/webkit/pending/TreeShared.h @@ -26,7 +26,7 @@ namespace WebCore { -#if USE(V8_BINDING) +#if USE(V8) template<class T> class TreeShared : public Peerable { public: @@ -126,7 +126,7 @@ private: void* m_peer; }; -#elif USE(JAVASCRIPTCORE_BINDINGS) +#elif USE(JSC) template<class T> class TreeShared : Noncopyable { public: |