third_party/WebKit/Source/web/WebEmbeddedWorkerImpl.cpp - Issue 2290233007: Move convertViewportToWindow and convertWindowToViewport from

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

Issue 2290233007: Move convertViewportToWindow and convertWindowToViewport from (Closed)

Patch Set: Created 4 years, 4 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:

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 daedd57d2ea097b390f9602cf1368b45244b5291..d2d4215d129be3f48766ddbddfaf22da35957e3e 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)

@@ -293,6 +296,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(nullptr, m_webView, m_mainFrame);

dcheng 2016/09/08 05:25:47 I would /really/ like to disallow null clients, be

falken 2016/09/08 05:50:39 I don't totally understand why webFrameWidget is n

lfg 2016/09/08 21:40:43 I think for now we can use a WebViewFrameWidget, b

// If we were asked to wait for debugger then it is the good time to do that.

m_workerContextClient->workerReadyForInspection();