Commit 2cbd54ce authored by dgozman's avatar dgozman Committed by Commit bot

Revert of [DevTools] Migrate ServiceWorker domain to new generator. (patchset...

Revert of [DevTools] Migrate ServiceWorker domain to new generator. (patchset #2 id:20001 of https://codereview.chromium.org/2573993003/ )

Reason for revert:
Crashes.
BUG=674474

Original issue's description:
> [DevTools] Migrate ServiceWorker domain to new generator.
>
> BUG=664683
> TBR=pfeldman
>
> Committed: https://crrev.com/b41d221cb138f0f5e3824229f12bf794172e106f
> Cr-Commit-Position: refs/heads/master@{#438676}

TBR=caseq@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=664683

Review-Url: https://codereview.chromium.org/2577233002
Cr-Commit-Position: refs/heads/master@{#438942}
parent ef9b9da8
...@@ -184,8 +184,6 @@ source_set("browser") { ...@@ -184,8 +184,6 @@ source_set("browser") {
"$target_gen_dir/devtools/protocol/schema.h", "$target_gen_dir/devtools/protocol/schema.h",
"$target_gen_dir/devtools/protocol/security.cc", "$target_gen_dir/devtools/protocol/security.cc",
"$target_gen_dir/devtools/protocol/security.h", "$target_gen_dir/devtools/protocol/security.h",
"$target_gen_dir/devtools/protocol/service_worker.cc",
"$target_gen_dir/devtools/protocol/service_worker.h",
"$target_gen_dir/devtools/protocol/storage.cc", "$target_gen_dir/devtools/protocol/storage.cc",
"$target_gen_dir/devtools/protocol/storage.h", "$target_gen_dir/devtools/protocol/storage.h",
"$target_gen_dir/devtools/protocol/system_info.cc", "$target_gen_dir/devtools/protocol/system_info.cc",
......
...@@ -76,8 +76,6 @@ inspector_protocol_generate("protocol_sources") { ...@@ -76,8 +76,6 @@ inspector_protocol_generate("protocol_sources") {
"protocol/schema.h", "protocol/schema.h",
"protocol/security.cc", "protocol/security.cc",
"protocol/security.h", "protocol/security.h",
"protocol/service_worker.cc",
"protocol/service_worker.h",
"protocol/storage.cc", "protocol/storage.cc",
"protocol/storage.h", "protocol/storage.h",
"protocol/system_info.cc", "protocol/system_info.cc",
......
...@@ -643,7 +643,7 @@ fields = [] ...@@ -643,7 +643,7 @@ fields = []
includes = [] includes = []
fields_init = [] fields_init = []
browser_domains_list = ["Target", "Input"] browser_domains_list = ["Target", "ServiceWorker", "Input"]
browser_commands_list = [] browser_commands_list = []
async_commands_list = [ async_commands_list = [
"Input.synthesizePinchGesture", "Input.synthesizePinchGesture",
......
...@@ -11,11 +11,18 @@ ...@@ -11,11 +11,18 @@
#include "base/macros.h" #include "base/macros.h"
#include "base/memory/weak_ptr.h" #include "base/memory/weak_ptr.h"
#include "content/browser/devtools/protocol/service_worker.h" #include "content/browser/devtools/protocol/devtools_protocol_dispatcher.h"
#include "content/browser/devtools/service_worker_devtools_agent_host.h" #include "content/browser/devtools/service_worker_devtools_agent_host.h"
#include "content/browser/devtools/service_worker_devtools_manager.h" #include "content/browser/devtools/service_worker_devtools_manager.h"
#include "content/browser/service_worker/service_worker_context_observer.h" #include "content/browser/service_worker/service_worker_context_observer.h"
#include "content/browser/service_worker/service_worker_info.h" #include "content/browser/service_worker/service_worker_info.h"
#include "content/public/browser/devtools_agent_host.h"
#include "content/public/browser/devtools_agent_host_client.h"
// Windows headers will redefine SendMessage.
#ifdef SendMessage
#undef SendMessage
#endif
namespace content { namespace content {
...@@ -23,32 +30,37 @@ class RenderFrameHostImpl; ...@@ -23,32 +30,37 @@ class RenderFrameHostImpl;
class ServiceWorkerContextWatcher; class ServiceWorkerContextWatcher;
class ServiceWorkerContextWrapper; class ServiceWorkerContextWrapper;
namespace protocol { namespace devtools {
namespace service_worker {
class ServiceWorkerHandler : public ServiceWorker::Backend { class ServiceWorkerHandler {
public: public:
typedef DevToolsProtocolClient::Response Response;
ServiceWorkerHandler(); ServiceWorkerHandler();
~ServiceWorkerHandler() override; ~ServiceWorkerHandler();
void Wire(UberDispatcher*);
void SetRenderFrameHost(RenderFrameHostImpl* render_frame_host); void SetRenderFrameHost(RenderFrameHostImpl* render_frame_host);
void SetClient(std::unique_ptr<Client> client);
Response Enable() override; void Detached();
Response Disable() override;
Response Unregister(const std::string& scope_url) override; // Protocol 'service worker' domain implementation.
Response StartWorker(const std::string& scope_url) override; Response Enable();
Response SkipWaiting(const std::string& scope_url) override; Response Disable();
Response StopWorker(const std::string& version_id) override; Response Unregister(const std::string& scope_url);
Response UpdateRegistration(const std::string& scope_url) override; Response StartWorker(const std::string& scope_url);
Response InspectWorker(const std::string& version_id) override; Response SkipWaiting(const std::string& scope_url);
Response SetForceUpdateOnPageLoad(bool force_update_on_page_load) override; Response StopWorker(const std::string& version_id);
Response UpdateRegistration(const std::string& scope_url);
Response InspectWorker(const std::string& version_id);
Response SetForceUpdateOnPageLoad(bool force_update_on_page_load);
Response DeliverPushMessage(const std::string& origin, Response DeliverPushMessage(const std::string& origin,
const std::string& registration_id, const std::string& registration_id,
const std::string& data) override; const std::string& data);
Response DispatchSyncEvent(const std::string& origin, Response DispatchSyncEvent(const std::string& origin,
const std::string& registration_id, const std::string& registration_id,
const std::string& tag, const std::string& tag,
bool last_chance) override; bool last_chance);
private: private:
void OnWorkerRegistrationUpdated( void OnWorkerRegistrationUpdated(
...@@ -63,7 +75,7 @@ class ServiceWorkerHandler : public ServiceWorker::Backend { ...@@ -63,7 +75,7 @@ class ServiceWorkerHandler : public ServiceWorker::Backend {
void ClearForceUpdate(); void ClearForceUpdate();
scoped_refptr<ServiceWorkerContextWrapper> context_; scoped_refptr<ServiceWorkerContextWrapper> context_;
std::unique_ptr<ServiceWorker::Frontend> frontend_; std::unique_ptr<Client> client_;
bool enabled_; bool enabled_;
scoped_refptr<ServiceWorkerContextWatcher> context_watcher_; scoped_refptr<ServiceWorkerContextWatcher> context_watcher_;
RenderFrameHostImpl* render_frame_host_; RenderFrameHostImpl* render_frame_host_;
...@@ -73,7 +85,8 @@ class ServiceWorkerHandler : public ServiceWorker::Backend { ...@@ -73,7 +85,8 @@ class ServiceWorkerHandler : public ServiceWorker::Backend {
DISALLOW_COPY_AND_ASSIGN(ServiceWorkerHandler); DISALLOW_COPY_AND_ASSIGN(ServiceWorkerHandler);
}; };
} // namespace protocol } // namespace service_worker
} // namespace devtools
} // namespace content } // namespace content
#endif // CONTENT_BROWSER_DEVTOOLS_PROTOCOL_SERVICE_WORKER_HANDLER_H_ #endif // CONTENT_BROWSER_DEVTOOLS_PROTOCOL_SERVICE_WORKER_HANDLER_H_
...@@ -51,9 +51,6 @@ ...@@ -51,9 +51,6 @@
{ {
"domain": "Security" "domain": "Security"
}, },
{
"domain": "ServiceWorker"
},
{ {
"domain": "Storage" "domain": "Storage"
}, },
......
...@@ -395,6 +395,8 @@ RenderFrameDevToolsAgentHost::RenderFrameDevToolsAgentHost( ...@@ -395,6 +395,8 @@ RenderFrameDevToolsAgentHost::RenderFrameDevToolsAgentHost(
RenderFrameHostImpl* host) RenderFrameHostImpl* host)
: DevToolsAgentHostImpl(base::GenerateGUID()), : DevToolsAgentHostImpl(base::GenerateGUID()),
input_handler_(new devtools::input::InputHandler()), input_handler_(new devtools::input::InputHandler()),
service_worker_handler_(
new devtools::service_worker::ServiceWorkerHandler()),
target_handler_(new devtools::target::TargetHandler()), target_handler_(new devtools::target::TargetHandler()),
frame_trace_recorder_(nullptr), frame_trace_recorder_(nullptr),
protocol_handler_(new DevToolsProtocolHandler(this)), protocol_handler_(new DevToolsProtocolHandler(this)),
...@@ -404,6 +406,7 @@ RenderFrameDevToolsAgentHost::RenderFrameDevToolsAgentHost( ...@@ -404,6 +406,7 @@ RenderFrameDevToolsAgentHost::RenderFrameDevToolsAgentHost(
frame_tree_node_(host->frame_tree_node()) { frame_tree_node_(host->frame_tree_node()) {
DevToolsProtocolDispatcher* dispatcher = protocol_handler_->dispatcher(); DevToolsProtocolDispatcher* dispatcher = protocol_handler_->dispatcher();
dispatcher->SetInputHandler(input_handler_.get()); dispatcher->SetInputHandler(input_handler_.get());
dispatcher->SetServiceWorkerHandler(service_worker_handler_.get());
dispatcher->SetTargetHandler(target_handler_.get()); dispatcher->SetTargetHandler(target_handler_.get());
SetPending(host); SetPending(host);
...@@ -506,10 +509,6 @@ void RenderFrameDevToolsAgentHost::Attach() { ...@@ -506,10 +509,6 @@ void RenderFrameDevToolsAgentHost::Attach() {
security_handler_->SetRenderFrameHost(handlers_frame_host_); security_handler_->SetRenderFrameHost(handlers_frame_host_);
} }
service_worker_handler_.reset(new protocol::ServiceWorkerHandler());
service_worker_handler_->Wire(session()->dispatcher());
service_worker_handler_->SetRenderFrameHost(handlers_frame_host_);
storage_handler_.reset(new protocol::StorageHandler()); storage_handler_.reset(new protocol::StorageHandler());
storage_handler_->Wire(session()->dispatcher()); storage_handler_->Wire(session()->dispatcher());
storage_handler_->SetRenderFrameHost(handlers_frame_host_); storage_handler_->SetRenderFrameHost(handlers_frame_host_);
...@@ -550,8 +549,6 @@ void RenderFrameDevToolsAgentHost::Detach() { ...@@ -550,8 +549,6 @@ void RenderFrameDevToolsAgentHost::Detach() {
security_handler_->Disable(); security_handler_->Disable();
security_handler_.reset(); security_handler_.reset();
} }
service_worker_handler_->Disable();
service_worker_handler_.reset();
storage_handler_->Disable(); storage_handler_->Disable();
storage_handler_.reset(); storage_handler_.reset();
tracing_handler_->Disable(); tracing_handler_->Disable();
...@@ -618,6 +615,7 @@ void RenderFrameDevToolsAgentHost::OnClientDetached() { ...@@ -618,6 +615,7 @@ void RenderFrameDevToolsAgentHost::OnClientDetached() {
#if defined(OS_ANDROID) #if defined(OS_ANDROID)
power_save_blocker_.reset(); power_save_blocker_.reset();
#endif #endif
service_worker_handler_->Detached();
target_handler_->Detached(); target_handler_->Detached();
frame_trace_recorder_.reset(); frame_trace_recorder_.reset();
in_navigation_protocol_message_buffer_.clear(); in_navigation_protocol_message_buffer_.clear();
...@@ -966,8 +964,7 @@ void RenderFrameDevToolsAgentHost::UpdateProtocolHandlers( ...@@ -966,8 +964,7 @@ void RenderFrameDevToolsAgentHost::UpdateProtocolHandlers(
network_handler_->SetRenderFrameHost(host); network_handler_->SetRenderFrameHost(host);
if (page_handler_) if (page_handler_)
page_handler_->SetRenderFrameHost(host); page_handler_->SetRenderFrameHost(host);
if (service_worker_handler_) service_worker_handler_->SetRenderFrameHost(host);
service_worker_handler_->SetRenderFrameHost(host);
if (security_handler_) if (security_handler_)
security_handler_->SetRenderFrameHost(host); security_handler_->SetRenderFrameHost(host);
if (storage_handler_) if (storage_handler_)
......
...@@ -41,6 +41,7 @@ class RenderFrameHostImpl; ...@@ -41,6 +41,7 @@ class RenderFrameHostImpl;
namespace devtools { namespace devtools {
namespace input { class InputHandler; } namespace input { class InputHandler; }
namespace service_worker { class ServiceWorkerHandler; }
namespace target { class TargetHandler; } namespace target { class TargetHandler; }
} }
...@@ -53,7 +54,6 @@ class NetworkHandler; ...@@ -53,7 +54,6 @@ class NetworkHandler;
class PageHandler; class PageHandler;
class SchemaHandler; class SchemaHandler;
class SecurityHandler; class SecurityHandler;
class ServiceWorkerHandler;
class StorageHandler; class StorageHandler;
class TracingHandler; class TracingHandler;
} // namespace protocol } // namespace protocol
...@@ -191,7 +191,8 @@ class CONTENT_EXPORT RenderFrameDevToolsAgentHost ...@@ -191,7 +191,8 @@ class CONTENT_EXPORT RenderFrameDevToolsAgentHost
std::unique_ptr<protocol::PageHandler> page_handler_; std::unique_ptr<protocol::PageHandler> page_handler_;
std::unique_ptr<protocol::SchemaHandler> schema_handler_; std::unique_ptr<protocol::SchemaHandler> schema_handler_;
std::unique_ptr<protocol::SecurityHandler> security_handler_; std::unique_ptr<protocol::SecurityHandler> security_handler_;
std::unique_ptr<protocol::ServiceWorkerHandler> service_worker_handler_; std::unique_ptr<devtools::service_worker::ServiceWorkerHandler>
service_worker_handler_;
std::unique_ptr<protocol::StorageHandler> storage_handler_; std::unique_ptr<protocol::StorageHandler> storage_handler_;
std::unique_ptr<devtools::target::TargetHandler> target_handler_; std::unique_ptr<devtools::target::TargetHandler> target_handler_;
std::unique_ptr<protocol::TracingHandler> tracing_handler_; std::unique_ptr<protocol::TracingHandler> tracing_handler_;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment