Changeset 61856 in webkit

Timestamp:

Jun 25, 2010 5:59:43 AM (14 years ago)

Author:

commit-queue@webkit.org

Message:

2010-06-25 Michael Nordman <Michael Nordman>

Reviewed by Dumitru Daniliuc.

Additional API to pass additional info needed for AppCache progress events.
​https://bugs.webkit.org/show_bug.cgi?id=37602

Also, delete an obsolete method from the worker API.

• public/WebApplicationCacheHostClient.h: define a new method
• public/WebSharedWorker.h: remove an obsolte method
• src/ApplicationCacheHostInternal.h: implement the new method (WebCore::ApplicationCacheHostInternal::notifyProgressEventListener):

Location:

trunk/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• public/WebApplicationCacheHostClient.h (modified) (1 diff)
• public/WebSharedWorker.h (modified) (1 diff)
• src/ApplicationCacheHostInternal.h (modified) (2 diffs)

trunk/WebKit/chromium/ChangeLog

@@ +1 @@
+2010-06-25  Michael Nordman  <michaeln@google.com>
+
+        Reviewed by Dumitru Daniliuc.
+
+        Additional API to pass additional info needed for AppCache progress events.
+        https://bugs.webkit.org/show_bug.cgi?id=37602
+
+        Also, delete an obsolete method from the worker API.
+
+        * public/WebApplicationCacheHostClient.h: define a new method
+        * public/WebSharedWorker.h: remove an obsolte method
+        * src/ApplicationCacheHostInternal.h: implement the new method
+        (WebCore::ApplicationCacheHostInternal::notifyProgressEventListener):
+
 2010-06-25  John Gregg  <johnnyg@google.com>
 

trunk/WebKit/chromium/public/WebApplicationCacheHostClient.h

@@ -40 +40 @@
 class WebApplicationCacheHostClient {
 public:
-    // Called to fire the event in the scriptable interface.
+    // Called to fire events in the scriptable interface.
     virtual void notifyEventListener(WebApplicationCacheHost::EventID) = 0;
+    virtual void notifyProgressEventListener(const WebURL&, int num_total, int num_complete) = 0;
 
 protected:

trunk/WebKit/chromium/public/WebSharedWorker.h

@@ -64 +64 @@
                                     long long scriptResourceAppCacheID) = 0;
 
-    // FIXME(michaeln): Remove this after the roll and adjusting to it.
-    virtual void startWorkerContext(const WebURL& scriptURL,
-                                    const WebString& name,
-                                    const WebString& userAgent,
-                                    const WebString& sourceCode)
-    {
-        startWorkerContext(scriptURL, name, userAgent, sourceCode, 0);
-    }
-
     class ConnectListener {
     public:

trunk/WebKit/chromium/src/ApplicationCacheHostInternal.h

@@ -40 +40 @@
 #include "WebKit.h"
 #include "WebKitClient.h"
+#include "WebURL.h"
 
 namespace WebCore {
@@ -58 +59 @@
     }
 
+    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)
     {