Report an error message when an update job results in an error.

webkit/appcache/web_application_cache_host_impl.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "webkit/appcache/web_application_cache_host_impl.h"
 
 #include "base/compiler_specific.h"
 #include "base/id_map.h"
 #include "base/string_util.h"
 #include "base/singleton.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebDataSource.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebURL.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebURLRequest.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebURLResponse.h"
 
 using WebKit::WebApplicationCacheHost;
 using WebKit::WebApplicationCacheHostClient;
 using WebKit::WebDataSource;
 using WebKit::WebFrame;
 using WebKit::WebURLRequest;
 using WebKit::WebURL;
 using WebKit::WebURLResponse;
 
 namespace appcache {
 
 typedef IDMap<WebApplicationCacheHostImpl> HostsMap;
 
+// Note: the order of the elements in this array must match those
+// of the EventID enum in appcache_interfaces.h.
+static const char* kEventNames[] = {
+  "Checking", "Error", "NoUpdate", "Downloading", "Progress",
+  "UpdateReady", "Cached", "Obsolete"
+};
+
 static HostsMap* all_hosts() {
   return Singleton<HostsMap>::get();
 }
 
 WebApplicationCacheHostImpl* WebApplicationCacheHostImpl::FromId(int id) {
   return all_hosts()->Lookup(id);
 }
 
 WebApplicationCacheHostImpl* WebApplicationCacheHostImpl::FromFrame(
     WebFrame* frame) {
@@ skipping 35 matching lines @@
   has_status_ = true;
 }
 
 void WebApplicationCacheHostImpl::OnStatusChanged(appcache::Status status) {
   if (has_status_)
     status_ = status;
 }
 
 void WebApplicationCacheHostImpl::OnEventRaised(appcache::EventID event_id) {
   DCHECK(event_id != PROGRESS_EVENT);  // See OnProgressEventRaised.
+  DCHECK(event_id != ERROR_EVENT);  // See OnErrorEventRaised.
+
+  // Emit logging output prior to calling out to script as we can get
+  // deleted withing the script event handler.
+  const char* kFormatString = "Application Cache %s event";
+  std::string message = StringPrintf(kFormatString, kEventNames[event_id]);
+  OnLogMessage(LOG_INFO, message);
+
   // Most events change the status. Clear out what we know so that the latest
   // status will be obtained from the backend.
   has_status_ = false;
   has_cached_status_ = false;
   client_->notifyEventListener(static_cast<EventID>(event_id));
 }
 
 void WebApplicationCacheHostImpl::OnProgressEventRaised(
     const GURL& url, int num_total, int num_complete) {
+  // Emit logging output prior to calling out to script as we can get
+  // deleted withing the script event handler.
+  const char* kFormatString = "Application Cache Progress event (%d of %d) %s";
+  std::string message = StringPrintf(kFormatString, num_complete,
+                                     num_total, url.spec().c_str());
+  OnLogMessage(LOG_INFO, message);
+
   client_->notifyProgressEventListener(url, num_total, num_complete);
 }
 
+void WebApplicationCacheHostImpl::OnErrorEventRaised(
+    const std::string& message) {
+  // Emit logging output prior to calling out to script as we can get
+  // deleted withing the script event handler.
+  const char* kFormatString = "Application Cache Error event: %s";
+  std::string full_message = StringPrintf(kFormatString, message.c_str());
+  OnLogMessage(LOG_ERROR, full_message);
+
+  // Most events change the status. Clear out what we know so that the latest
+  // status will be obtained from the backend.
+  has_status_ = false;
+  has_cached_status_ = false;
+  client_->notifyEventListener(static_cast<EventID>(ERROR_EVENT));
+}
+
 void WebApplicationCacheHostImpl::willStartMainResourceRequest(
     WebURLRequest& request) {
   request.setAppCacheHostID(host_id_);
   std::string method = request.httpMethod().utf8();
   is_get_method_ = (method == kHttpGETMethod);
   DCHECK(method == StringToUpperASCII(method));
 }
 
 void WebApplicationCacheHostImpl::willStartSubResourceRequest(
     WebURLRequest& request) {
@@ skipping 120 matching lines @@
 
 bool WebApplicationCacheHostImpl::swapCache() {
   // Cache status will change when cache is swapped. Clear out any saved idea
   // of status so that backend will be queried for actual status.
   has_status_ = false;
   has_cached_status_ = false;
   return backend_->SwapCache(host_id_);
 }
 
 }  // appcache namespace