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

Unified Diff: third_party/WebKit/Source/web/WebSharedWorkerImpl.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
« no previous file with comments | « third_party/WebKit/Source/web/WebSharedWorkerImpl.h ('k') | third_party/WebKit/public/web/WebViewClient.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/web/WebSharedWorkerImpl.cpp
diff --git a/third_party/WebKit/Source/web/WebSharedWorkerImpl.cpp b/third_party/WebKit/Source/web/WebSharedWorkerImpl.cpp
index 4666ddb939f51af5b179cdcfaed6ff7d09de361c..4e081806f8fe66a2c0aaddee9cd6582c42bf0610 100644
--- a/third_party/WebKit/Source/web/WebSharedWorkerImpl.cpp
+++ b/third_party/WebKit/Source/web/WebSharedWorkerImpl.cpp
@@ -63,6 +63,7 @@
#include "public/platform/WebURLRequest.h"
#include "public/web/WebDevToolsAgent.h"
#include "public/web/WebFrame.h"
+#include "public/web/WebFrameWidget.h"
#include "public/web/WebSettings.h"
#include "public/web/WebView.h"
#include "public/web/WebWorkerContentSettingsClientProxy.h"
@@ -83,6 +84,7 @@ namespace blink {
WebSharedWorkerImpl::WebSharedWorkerImpl(WebSharedWorkerClient* client)
: m_webView(nullptr)
+ , m_webFrameWidget(nullptr)
, m_mainFrame(nullptr)
, m_askedToTerminate(false)
, m_workerInspectorProxy(WorkerInspectorProxy::create())
@@ -99,6 +101,7 @@ WebSharedWorkerImpl::~WebSharedWorkerImpl()
// Detach the client before closing the view to avoid getting called back.
m_mainFrame->setClient(0);
+ m_webFrameWidget->close();
m_webView->close();
m_mainFrame->close();
if (m_loaderProxy)
@@ -137,6 +140,7 @@ void WebSharedWorkerImpl::initializeLoader()
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 pause worker context on start and wait for debugger then it is the good time to do that.
m_client->workerReadyForInspection();
« no previous file with comments | « third_party/WebKit/Source/web/WebSharedWorkerImpl.h ('k') | third_party/WebKit/public/web/WebViewClient.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698