diff options
| author | Ben Murdoch <benm@google.com> | 2011-06-02 12:07:03 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-06-10 10:47:21 +0100 |
| commit | 2daae5fd11344eaa88a0d92b0f6d65f8d2255c00 (patch) | |
| tree | e4964fbd1cb70599f7718ff03e50ea1dab33890b /Source/WebCore/platform/TreeShared.h | |
| parent | 87bdf0060a247bfbe668342b87e0874182e0ffa9 (diff) | |
| download | external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.zip external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.tar.gz external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.tar.bz2 | |
Merge WebKit at r84325: Initial merge by git.
Change-Id: Ic1a909300ecc0a13ddc6b4e784371d2ac6e3d59b
Diffstat (limited to 'Source/WebCore/platform/TreeShared.h')
| -rw-r--r-- | Source/WebCore/platform/TreeShared.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/Source/WebCore/platform/TreeShared.h b/Source/WebCore/platform/TreeShared.h index 9e27c5e..2888ebf 100644 --- a/Source/WebCore/platform/TreeShared.h +++ b/Source/WebCore/platform/TreeShared.h @@ -109,11 +109,7 @@ public: bool m_inRemovedLastRefFunction; #endif -private: -#ifndef NDEBUG - friend void adopted<>(TreeShared<T>*); -#endif - +protected: virtual void removedLastRef() { #ifndef NDEBUG @@ -122,6 +118,11 @@ private: delete this; } +private: +#ifndef NDEBUG + friend void adopted<>(TreeShared<T>*); +#endif + int m_refCount; T* m_parent; #ifndef NDEBUG |