| 3d1195ca6a380e5af16e3a505a007369cf18a4db |
|
08-Jun-2011 |
Steve Block <steveblock@google.com> |
Fix some include guards in Android files
This will become relevant after we merge beyond
http://trac.webkit.org/changeset/81977 (and its follow-up build fixes
r81982, r81988, r81990, r82018) which relies on all platforms'
instances of FontPlatformData.h using the correct include guard.
Change-Id: I58ec4c8ee23698c41d86794333d603b95f303764
/external/webkit/Source/WebKit/android/plugins/PluginTimer.h
|
| 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/WebKit/android/plugins/PluginTimer.h
|
| a2c606d1d8312a5d063e4a11e5911d9c8e4a3d19 |
|
13-May-2011 |
Ben Murdoch <benm@google.com> |
Merge WebKit at r75993: Move WebKit/android files to Source
Change-Id: Ifa871f8320bdb3a09fe189fffecc23f702c394b9
/external/webkit/Source/WebKit/android/plugins/PluginTimer.h
|