Expose details for appcache error events [Chromium]

content/child/appcache/web_application_cache_host_impl.cc

 // Copyright 2013 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 "content/child/appcache/web_application_cache_host_impl.h"
 
 #include "base/compiler_specific.h"
 #include "base/id_map.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
+#include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/public/platform/WebURL.h"
 #include "third_party/WebKit/public/platform/WebURLRequest.h"
 #include "third_party/WebKit/public/platform/WebURLResponse.h"
 
 using blink::WebApplicationCacheHost;
 using blink::WebApplicationCacheHostClient;
+using blink::WebString;
 using blink::WebURLRequest;
 using blink::WebURL;
 using blink::WebURLResponse;
 using blink::WebVector;
 using appcache::AppCacheBackend;
 using appcache::AppCacheResourceInfo;
 
 namespace content {
 
 namespace {
@@ skipping 99 matching lines @@
   // deleted within the script event handler.
   const char* kFormatString = "Application Cache Progress event (%d of %d) %s";
   std::string message = base::StringPrintf(kFormatString, num_complete,
                                            num_total, url.spec().c_str());
   OnLogMessage(appcache::LOG_INFO, message);
   status_ = appcache::DOWNLOADING;
   client_->notifyProgressEventListener(url, num_total, num_complete);
 }
 
 void WebApplicationCacheHostImpl::OnErrorEventRaised(
-    const std::string& message) {
+    const appcache::ErrorDetails& details) {
   // Emit logging output prior to calling out to script as we can get
   // deleted within the script event handler.
   const char* kFormatString = "Application Cache Error event: %s";
-  std::string full_message = base::StringPrintf(kFormatString,
-                                                message.c_str());
+  std::string full_message =
+      base::StringPrintf(kFormatString, details.message.c_str());
   OnLogMessage(appcache::LOG_ERROR, full_message);
 
   status_ = cache_info_.is_complete ? appcache::IDLE : appcache::UNCACHED;
-  client_->notifyEventListener(static_cast<EventID>(appcache::ERROR_EVENT));
+  if (details.is_cross_origin) {
+    // Don't leak detailed information to script for cross-origin resources.
+    DCHECK_EQ(appcache::RESOURCE_ERROR, details.reason);
+    client_->notifyErrorEventListener(
+        static_cast<ErrorReason>(details.reason), details.url, 0, WebString());
+  } else {
+    client_->notifyErrorEventListener(static_cast<ErrorReason>(details.reason),
+                                      details.url,
+                                      details.status,
+                                      WebString::fromUTF8(details.message));
+  }
 }
 
 void WebApplicationCacheHostImpl::willStartMainResourceRequest(
     WebURLRequest& request, const WebApplicationCacheHost* spawning_host) {
   request.setAppCacheHostID(host_id_);
 
   original_main_resource_url_ = ClearUrlRef(request.url());
 
   std::string method = request.httpMethod().utf8();
   is_get_method_ = (method == appcache::kHttpGETMethod);
@@ skipping 143 matching lines @@
     web_resources[i].isExplicit = resource_infos[i].is_explicit;
     web_resources[i].isManifest = resource_infos[i].is_manifest;
     web_resources[i].isForeign = resource_infos[i].is_foreign;
     web_resources[i].isFallback = resource_infos[i].is_fallback;
     web_resources[i].url = resource_infos[i].url;
   }
   resources->swap(web_resources);
 }
 
 }  // namespace content