[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

commit-queue at webkit.org commit-queue at webkit.org
Wed Dec 22 11:53:39 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 4557069a14d9d5c99ff2d23b53060bc76407891a
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Aug 10 21:35:10 2010 +0000

    2010-08-10  Kavita Kanetkar  <kkanetkar at chromium.org>
    
            Reviewed by Joseph Pecoraro.
    
            Web Inspector: Support appcache status change for Chrome
            https://bugs.webkit.org/show_bug.cgi?id=43531
    
            * src/ApplicationCacheHost.cpp:
            (WebCore::ApplicationCacheHost::notifyDOMApplicationCache):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65094 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 6850dbf..4729efa 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,13 @@
+2010-08-10  Kavita Kanetkar  <kkanetkar at chromium.org>
+
+        Reviewed by Joseph Pecoraro.
+
+        Web Inspector: Support appcache status change for Chrome
+        https://bugs.webkit.org/show_bug.cgi?id=43531
+
+        * src/ApplicationCacheHost.cpp:
+        (WebCore::ApplicationCacheHost::notifyDOMApplicationCache):
+
 2010-08-10  Kenneth Russell  <kbr at google.com>
 
         Reviewed by Dimitri Glazkov.
diff --git a/WebKit/chromium/src/ApplicationCacheHost.cpp b/WebKit/chromium/src/ApplicationCacheHost.cpp
index dfd4754..3bfcfe2 100644
--- a/WebKit/chromium/src/ApplicationCacheHost.cpp
+++ b/WebKit/chromium/src/ApplicationCacheHost.cpp
@@ -202,6 +202,15 @@ void ApplicationCacheHost::setDOMApplicationCache(DOMApplicationCache* domApplic
 
 void ApplicationCacheHost::notifyDOMApplicationCache(EventID id, int total, int done)
 {
+#if ENABLE(INSPECTOR)
+    // If host's frame is main frame and inspector frontend is connected, update appcache status.
+    if (id != PROGRESS_EVENT && m_documentLoader->frame()) {
+        Page* page = m_documentLoader->frame()->page();
+        if (page && page->inspectorController()->applicationCacheAgent() && page->mainFrame() == m_documentLoader->frame())
+            page->inspectorController()->applicationCacheAgent()->updateApplicationCacheStatus(status());
+    }
+#endif
+
     if (m_defersEvents) {
         // Event dispatching is deferred until document.onload has fired.
         m_deferredEvents.append(DeferredEvent(id, total, done));

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list