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

Unified Diff: third_party/WebKit/Source/web/WebEmbeddedWorkerImpl.cpp

Issue 2290233007: Move convertViewportToWindow and convertWindowToViewport from (Closed)
Patch Set: add client to WebSharedWorkerImpl Created 4 years, 3 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: third_party/WebKit/Source/web/WebEmbeddedWorkerImpl.cpp
diff --git a/third_party/WebKit/Source/web/WebEmbeddedWorkerImpl.cpp b/third_party/WebKit/Source/web/WebEmbeddedWorkerImpl.cpp
index ea01010b55685d051035c5a78fbe8679b59369e5..155b8be1b13ae78b77bd11bf94c6d1f9edd1e80c 100644
--- a/third_party/WebKit/Source/web/WebEmbeddedWorkerImpl.cpp
+++ b/third_party/WebKit/Source/web/WebEmbeddedWorkerImpl.cpp
@@ -60,6 +60,7 @@
#include "public/platform/modules/serviceworker/WebServiceWorkerProvider.h"
#include "public/web/WebConsoleMessage.h"
#include "public/web/WebDevToolsAgent.h"
+#include "public/web/WebFrameWidget.h"
#include "public/web/WebSettings.h"
#include "public/web/WebView.h"
#include "public/web/WebWorkerContentSettingsClientProxy.h"
@@ -93,6 +94,7 @@ WebEmbeddedWorkerImpl::WebEmbeddedWorkerImpl(std::unique_ptr<WebServiceWorkerCon
, m_contentSettingsClient(std::move(contentSettingsClient))
, m_workerInspectorProxy(WorkerInspectorProxy::create())
, m_webView(nullptr)
+ , m_webFrameWidget(nullptr)
, m_mainFrame(nullptr)
, m_loadingShadowPage(false)
, m_askedToTerminate(false)
@@ -122,6 +124,7 @@ WebEmbeddedWorkerImpl::~WebEmbeddedWorkerImpl()
m_workerGlobalScopeProxy.clear();
}
+ m_webFrameWidget->close();
m_webView->close();
m_mainFrame->close();
if (m_loaderProxy)
@@ -292,6 +295,7 @@ void WebEmbeddedWorkerImpl::prepareShadowPageForLoader()
m_mainFrame = toWebLocalFrameImpl(WebLocalFrame::create(WebTreeScopeType::Document, this));
m_webView->setMainFrame(m_mainFrame.get());
m_mainFrame->setDevToolsAgentClient(this);
+ m_webFrameWidget = WebFrameWidget::create(this, m_webView, m_mainFrame);
// If we were asked to wait for debugger then it is the good time to do that.
m_workerContextClient->workerReadyForInspection();
« no previous file with comments | « third_party/WebKit/Source/web/WebEmbeddedWorkerImpl.h ('k') | third_party/WebKit/Source/web/WebSharedWorkerImpl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698