diff options
| author | Steve Block <steveblock@google.com> | 2009-11-11 23:16:52 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2009-11-12 18:28:34 +0000 |
| commit | e431852bff2ca6954b119a8c9471fd676abea029 (patch) | |
| tree | 2c0376b2197a76742550bc628154de4036b2fa38 /WebCore/platform/Timer.cpp | |
| parent | a2bbe04f16fb11132b3318fb0aecb290f232c563 (diff) | |
| download | external_webkit-e431852bff2ca6954b119a8c9471fd676abea029.zip external_webkit-e431852bff2ca6954b119a8c9471fd676abea029.tar.gz external_webkit-e431852bff2ca6954b119a8c9471fd676abea029.tar.bz2 | |
Removes WebCorePrefixAndroid.h to aid WebKit upstreaming.
Content from WebCorePrefixAndroid.h has been moved to WebCorePrefix.h and the Android Makefiles modified to use that file.
- Enabler flags have been moved to WebCore/config.h.
- flex_XXX_T types are defined in WebCore/css/maketokenizer
- Most system includes are alreay present in WebCorePrefix.h
- Some includes have been moved directly to the source files that require them.
- The following includes seem not to be required so have been dropped.
- #include <limits.h>
- #include <math.h>
- #include <stdint.h>
- #include <unistd.h>
Change-Id: I8eba4d0a606463503554955e113d57bdf76a7136
Diffstat (limited to 'WebCore/platform/Timer.cpp')
| -rw-r--r-- | WebCore/platform/Timer.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/WebCore/platform/Timer.cpp b/WebCore/platform/Timer.cpp index 539846c..4804540 100644 --- a/WebCore/platform/Timer.cpp +++ b/WebCore/platform/Timer.cpp @@ -37,6 +37,11 @@ #include <wtf/HashSet.h> #include <wtf/Vector.h> +#if PLATFORM(ANDROID) +#include "stl_iterator_base.h" +#include "heap.h" +#endif + using namespace std; namespace WebCore { @@ -324,4 +329,3 @@ void TimerBase::fireTimersInNestedEventLoop() } } // namespace WebCore - |