third_party/WebKit/Source/core/page/ChromeClient.cpp - Issue 2177333002: Move setWindowRect and windowRect calls from WebViewClient to WebWidgetClient.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/core/page/ChromeClient.cpp

Issue 2177333002: Move setWindowRect and windowRect calls from WebViewClient to WebWidgetClient. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: change CHECK to a DCHECK Created 4 years, 5 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

« third_party/WebKit/Source/core/page/ChromeClient.h ('K') | « third_party/WebKit/Source/core/page/ChromeClient.h ('k') | third_party/WebKit/Source/core/page/CreateWindow.cpp » ('j') | third_party/WebKit/Source/web/ChromeClientImpl.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/page/ChromeClient.cpp

diff --git a/third_party/WebKit/Source/core/page/ChromeClient.cpp b/third_party/WebKit/Source/core/page/ChromeClient.cpp

index 7439fb61c6545c5c86527b3b618928634f671b4b..ef48360e0d9765dee74d56a9b76cdf6db087afa1 100644

--- a/third_party/WebKit/Source/core/page/ChromeClient.cpp

+++ b/third_party/WebKit/Source/core/page/ChromeClient.cpp

@@ -36,7 +36,7 @@

namespace blink {

-void ChromeClient::setWindowRectWithAdjustment(const IntRect& pendingRect)

+void ChromeClient::setWindowRectWithAdjustment(const IntRect& pendingRect, LocalFrame* frame)

{

IntRect screen = screenInfo().availableRect;

IntRect window = pendingRect;

@@ -52,7 +52,7 @@ void ChromeClient::setWindowRectWithAdjustment(const IntRect& pendingRect)

// Constrain the window position within the valid screen area.

window.setX(std::max(screen.x(), std::min(window.x(), screen.maxX() - window.width())));

window.setY(std::max(screen.y(), std::min(window.y(), screen.maxY() - window.height())));

- setWindowRect(window);

+ setWindowRect(window, frame);

}

bool ChromeClient::canOpenModalIfDuringPageDismissal(Frame* mainFrame, ChromeClient::DialogType dialog, const String& message)