0cae2b1e7dd111cf7081b49cf7411c0066b33cc6 |
|
16-May-2011 |
Ben Murdoch <benm@google.com> |
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
/external/webkit/Source/WebCore/platform/android/ClipboardAndroid.h
|