diff options
| author | Kristian Monsen <kristianm@google.com> | 2010-06-28 16:42:48 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2010-07-02 10:29:56 +0100 |
| commit | 06ea8e899e48f1f2f396b70e63fae369f2f23232 (patch) | |
| tree | 20c1428cd05c76f32394ab354ea35ed99acd86d8 /WebKit/chromium/src/ApplicationCacheHostInternal.h | |
| parent | 72aad67af14193199e29cdd5c4ddc095a8b9a8a8 (diff) | |
| download | external_webkit-06ea8e899e48f1f2f396b70e63fae369f2f23232.zip external_webkit-06ea8e899e48f1f2f396b70e63fae369f2f23232.tar.gz external_webkit-06ea8e899e48f1f2f396b70e63fae369f2f23232.tar.bz2 | |
Merge WebKit at r61871: Initial merge by git.
Change-Id: I6cff43abca9cc4782e088a469ad4f03f166a65d5
Diffstat (limited to 'WebKit/chromium/src/ApplicationCacheHostInternal.h')
| -rw-r--r-- | WebKit/chromium/src/ApplicationCacheHostInternal.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/WebKit/chromium/src/ApplicationCacheHostInternal.h b/WebKit/chromium/src/ApplicationCacheHostInternal.h index bf6c4ae..edaaca9 100644 --- a/WebKit/chromium/src/ApplicationCacheHostInternal.h +++ b/WebKit/chromium/src/ApplicationCacheHostInternal.h @@ -39,6 +39,7 @@ #include "WebFrameImpl.h" #include "WebKit.h" #include "WebKitClient.h" +#include "WebURL.h" namespace WebCore { @@ -57,6 +58,17 @@ public: m_innerHost->notifyDOMApplicationCache(static_cast<ApplicationCacheHost::EventID>(eventID)); } + virtual void notifyProgressEventListener(const WebKit::WebURL&, int num_total, int num_complete) + { + // FIXME: Modify webcore's progress event handling to carry the extra info and alter the + // layout tests to not fail when the more recently specified 'final' event is raised. + // For now, we're eating the extra info and that last event. + // See https://bugs.webkit.org/show_bug.cgi?id=37602 + if (num_complete == num_total) + return; + notifyEventListener(WebKit::WebApplicationCacheHost::ProgressEvent); + } + static WebKit::WebApplicationCacheHost* toWebApplicationCacheHost(ApplicationCacheHost* innerHost) { if (innerHost && innerHost->m_internal.get()) |