[chromium] WebKit API plumbing for applicationCache.abort()

https://bugs.webkit.org/show_bug.cgi?id=89792

Reviewed by Darin Fisher.

* public/WebApplicationCacheHost.h:
(WebKit::WebApplicationCacheHost::abort):
* src/ApplicationCacheHost.cpp:
(WebCore::ApplicationCacheHost::abort):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@121078 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebKit/chromium/ChangeLog b/Source/WebKit/chromium/ChangeLog
index 00552b3..420f778 100644 (file)
--- a/Source/WebKit/chromium/ChangeLog
+++ b/Source/WebKit/chromium/ChangeLog
@@ -1,3 +1,15 @@
+2012-06-22  Michael Nordman  <michaeln@google.com>
+
+        [chromium] WebKit API plumbing for applicationCache.abort() 
+        https://bugs.webkit.org/show_bug.cgi?id=89792
+
+        Reviewed by Darin Fisher.
+
+        * public/WebApplicationCacheHost.h:
+        (WebKit::WebApplicationCacheHost::abort):
+        * src/ApplicationCacheHost.cpp:
+        (WebCore::ApplicationCacheHost::abort):
+
 2012-06-22  James Robinson  <jamesr@chromium.org>
 
         [chromium] LayerRendererChromium is not getting visibility messages in single threaded compositing mode.

diff --git a/Source/WebKit/chromium/public/WebApplicationCacheHost.h b/Source/WebKit/chromium/public/WebApplicationCacheHost.h
index bd52218..fb68126 100644 (file)
--- a/Source/WebKit/chromium/public/WebApplicationCacheHost.h
+++ b/Source/WebKit/chromium/public/WebApplicationCacheHost.h
@@ -92,6 +92,7 @@ public:
     virtual Status status() { return Uncached; }
     virtual bool startUpdate() { return false; }
     virtual bool swapCache() { return false; }
+    virtual void abort() { }
 
     // Structures and methods to support inspecting Application Caches.
     struct CacheInfo {

diff --git a/Source/WebKit/chromium/src/ApplicationCacheHost.cpp b/Source/WebKit/chromium/src/ApplicationCacheHost.cpp
index bbf740d..2b6a477 100644 (file)
--- a/Source/WebKit/chromium/src/ApplicationCacheHost.cpp
+++ b/Source/WebKit/chromium/src/ApplicationCacheHost.cpp
@@ -299,7 +299,8 @@ bool ApplicationCacheHost::swapCache()
 
 void ApplicationCacheHost::abort()
 {
-    // FIXME: See https://bugs.webkit.org/show_bug.cgi?id=76270
+    if (m_internal)
+        m_internal->m_outerHost->abort();
 }
 
 bool ApplicationCacheHost::isApplicationCacheEnabled()