diff options
| author | Steve Block <steveblock@google.com> | 2009-12-22 20:09:45 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-01-07 13:07:59 +0000 |
| commit | c933033665a5ba9e96d0bc451f348c6ae1fadb4e (patch) | |
| tree | eeaf9f0977b2bcd8b0310aeef69208ecb839a981 /WebCore/html/HTMLTokenizer.cpp | |
| parent | 8c8c7b43f311d492d2c13ee68bc91875262ae072 (diff) | |
| download | external_webkit-c933033665a5ba9e96d0bc451f348c6ae1fadb4e.zip external_webkit-c933033665a5ba9e96d0bc451f348c6ae1fadb4e.tar.gz external_webkit-c933033665a5ba9e96d0bc451f348c6ae1fadb4e.tar.bz2 | |
Updates Document::setExtraLayoutDelay to reflect recent submission to webkit.org.
setExtraLayoutDelay was an Android addition and was upstreamed to webkit.org in
https://bugs.webkit.org/show_bug.cgi?id=32875
Removes Document::extraLayoutDelay by incorporating the extra delay in Document::minimumLayoutDelay.
Removes ANDROID_MOBILE guards, as this extra code is not inhernetly specific to Android, and is a
no-op if Document::setExtraLayoutDelay is not called. This removes the last uses of ANDROID_MOBILE.
Change-Id: I1e18a994f32b29558dcf9a5c76aefab62e9fc13d
Diffstat (limited to 'WebCore/html/HTMLTokenizer.cpp')
| -rw-r--r-- | WebCore/html/HTMLTokenizer.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/WebCore/html/HTMLTokenizer.cpp b/WebCore/html/HTMLTokenizer.cpp index 3ca6958..a552442 100644 --- a/WebCore/html/HTMLTokenizer.cpp +++ b/WebCore/html/HTMLTokenizer.cpp @@ -1849,11 +1849,7 @@ void HTMLTokenizer::timerFired(Timer<HTMLTokenizer>*) printf("Beginning timer write at time %d\n", m_doc->elapsedTime()); #endif -#ifdef ANDROID_MOBILE - if (m_doc->view() && m_doc->view()->layoutPending() && !m_doc->minimumLayoutDelay() && !m_doc->extraLayoutDelay()) { -#else if (m_doc->view() && m_doc->view()->layoutPending() && !m_doc->minimumLayoutDelay()) { -#endif // Restart the timer and let layout win. This is basically a way of ensuring that the layout // timer has higher priority than our timer. m_timer.startOneShot(0); |