Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(389)

Unified Diff: content/browser/devtools/protocol/service_worker_handler.cc

Issue 1030103003: Report error messages to DevTools window. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: incorporated falken's comment Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/devtools/protocol/service_worker_handler.cc
diff --git a/content/browser/devtools/protocol/service_worker_handler.cc b/content/browser/devtools/protocol/service_worker_handler.cc
index c2736017a73ec2c53234656a586a7e019835a163..460c1bc92976f8918404720049ff241e33b8ab3f 100644
--- a/content/browser/devtools/protocol/service_worker_handler.cc
+++ b/content/browser/devtools/protocol/service_worker_handler.cc
@@ -7,6 +7,7 @@
#include "base/bind.h"
#include "base/containers/scoped_ptr_hash_map.h"
#include "base/strings/string_number_conversions.h"
+#include "base/strings/utf_string_conversions.h"
#include "content/browser/devtools/service_worker_devtools_agent_host.h"
#include "content/browser/devtools/service_worker_devtools_manager.h"
#include "content/browser/frame_host/frame_tree.h"
@@ -249,6 +250,8 @@ Response ServiceWorkerHandler::Enable() {
context_, base::Bind(&ServiceWorkerHandler::OnWorkerRegistrationUpdated,
weak_factory_.GetWeakPtr()),
base::Bind(&ServiceWorkerHandler::OnWorkerVersionUpdated,
+ weak_factory_.GetWeakPtr()),
+ base::Bind(&ServiceWorkerHandler::OnErrorReported,
weak_factory_.GetWeakPtr()));
context_watcher_->Start();
@@ -370,6 +373,21 @@ void ServiceWorkerHandler::OnWorkerVersionUpdated(
WorkerVersionUpdatedParams::Create()->set_versions(version_values));
}
+void ServiceWorkerHandler::OnErrorReported(
+ int64 registration_id,
+ int64 version_id,
+ const ServiceWorkerContextObserver::ErrorInfo& info) {
+ client_->WorkerErrorReported(
+ WorkerErrorReportedParams::Create()->set_error_message(
+ ServiceWorkerErrorMessage::Create()
+ ->set_error_message(base::UTF16ToUTF8(info.error_message))
+ ->set_registration_id(base::Int64ToString(registration_id))
+ ->set_version_id(base::Int64ToString(version_id))
+ ->set_source_url(info.source_url.spec())
+ ->set_line_number(info.line_number)
+ ->set_column_number(info.column_number)));
+}
+
void ServiceWorkerHandler::DispatchProtocolMessage(
DevToolsAgentHost* host,
const std::string& message) {

Powered by Google App Engine
This is Rietveld 408576698