diff options
| author | Ben Murdoch <benm@google.com> | 2011-05-16 18:01:30 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-05-23 18:54:15 +0100 |
| commit | 0cae2b1e7dd111cf7081b49cf7411c0066b33cc6 (patch) | |
| tree | 168147612f8c03d7e95a64496ac46118869694e1 /Source/WebKit/android/plugins | |
| parent | e4427b844b712104108d886d50294f7d3a052a32 (diff) | |
| download | external_webkit-0cae2b1e7dd111cf7081b49cf7411c0066b33cc6.zip external_webkit-0cae2b1e7dd111cf7081b49cf7411c0066b33cc6.tar.gz external_webkit-0cae2b1e7dd111cf7081b49cf7411c0066b33cc6.tar.bz2 | |
Merge WebKit at r76408: Update Uses of Noncopyable/FastAllocBase
Upstream now uses macros rather than inheritance for classes
declard Noncopyable or Fast Allocated.
Note that in the case of PluginTimer and ClipboardAndroid we
now need to explicitly declare them fast allocated. This is
because previously they got the fast allocated methods through
a common superclass (FastAllocBase) but now both parents provide
implementations, so there is an ambiguity the compiler cannot
resolve.
See http://trac.webkit.org/changeset/76248
Change-Id: I186e3fd36bde2074d34f453983d48e8fc223f420
Diffstat (limited to 'Source/WebKit/android/plugins')
| -rw-r--r-- | Source/WebKit/android/plugins/PluginTimer.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Source/WebKit/android/plugins/PluginTimer.h b/Source/WebKit/android/plugins/PluginTimer.h index 20c0816..231dca5 100644 --- a/Source/WebKit/android/plugins/PluginTimer.h +++ b/Source/WebKit/android/plugins/PluginTimer.h @@ -27,6 +27,7 @@ #ifndef PluginTimer_H #define PluginTimer_H +#include "FastAllocBase.h" #include "RefCounted.h" #include "Timer.h" #include "npapi.h" @@ -36,6 +37,7 @@ namespace WebCore { class PluginTimerList; class PluginTimer : public TimerBase, public RefCounted<PluginTimer> { + WTF_MAKE_FAST_ALLOCATED; public: PluginTimer(PluginTimer** list, NPP instance, bool repeat, void (*proc)(NPP npp, uint32_t timerID)); |