Filip/playwright
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

browser(webkit): outerWidth/Height on Windows (#3154)

Browse source
This commit is contained in:
Yury Semikhatsky 2020-07-24 14:10:32 -07:00 committed by GitHub
parent e7cca86757
commit 3162c06f49
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
browser_patches/webkit/BUILD_NUMBER
View file

@ -1,2 +1,2 @@
1317 1318
Changed: lushnikov@chromium.org Thu Jul 23 17:44:30 PDT 2020 Changed: yurys@chromium.org Fri Jul 24 20:46:33 GMTST 2020

14
browser_patches/webkit/embedder/Playwright/win/WebKitBrowserWindow.cpp
View file

@ -85,6 +85,7 @@ WebKitBrowserWindow::WebKitBrowserWindow(BrowserWindowClient& client, HWND mainW
uiClient.runJavaScriptPrompt = runJavaScriptPrompt; uiClient.runJavaScriptPrompt = runJavaScriptPrompt;
uiClient.runBeforeUnloadConfirmPanel = runBeforeUnloadConfirmPanel; uiClient.runBeforeUnloadConfirmPanel = runBeforeUnloadConfirmPanel;
uiClient.handleJavaScriptDialog = handleJavaScriptDialog; uiClient.handleJavaScriptDialog = handleJavaScriptDialog;
uiClient.getWindowFrame = getWindowFrame;
WKPageSetPageUIClient(page, &uiClient.base); WKPageSetPageUIClient(page, &uiClient.base);
WKPageStateClientV0 stateClient = { }; WKPageStateClientV0 stateClient = { };
@ -338,6 +339,19 @@ void WebKitBrowserWindow::handleJavaScriptDialog(WKPageRef page, bool accept, WK
} }
} }
WKRect WebKitBrowserWindow::getWindowFrame(WKPageRef page, const void *clientInfo) {
auto& thisWindow = toWebKitBrowserWindow(clientInfo);
WKRect wkFrame { };
RECT r;
if (::GetWindowRect(thisWindow.m_hMainWnd, &r)) {
wkFrame.origin.x = r.left;
wkFrame.origin.y = r.top;
wkFrame.size.width = r.right - r.left;
wkFrame.size.height = r.bottom - r.top;
}
return wkFrame;
}
WKPageRef WebKitBrowserWindow::createPageCallback(WKPageConfigurationRef configuration) WKPageRef WebKitBrowserWindow::createPageCallback(WKPageConfigurationRef configuration)
{ {
// This comes from the Playwright agent, configuration is a pool+data pair. // This comes from the Playwright agent, configuration is a pool+data pair.

1
browser_patches/webkit/embedder/Playwright/win/WebKitBrowserWindow.h
View file

@ -70,6 +70,7 @@ private:
static void runJavaScriptPrompt(WKPageRef page, WKStringRef message, WKStringRef defaultValue, WKFrameRef frame, WKSecurityOriginRef securityOrigin, WKPageRunJavaScriptPromptResultListenerRef listener, const void *clientInfo); static void runJavaScriptPrompt(WKPageRef page, WKStringRef message, WKStringRef defaultValue, WKFrameRef frame, WKSecurityOriginRef securityOrigin, WKPageRunJavaScriptPromptResultListenerRef listener, const void *clientInfo);
static void runBeforeUnloadConfirmPanel(WKPageRef page, WKStringRef message, WKFrameRef frame, WKPageRunBeforeUnloadConfirmPanelResultListenerRef listener, const void *clientInfo); static void runBeforeUnloadConfirmPanel(WKPageRef page, WKStringRef message, WKFrameRef frame, WKPageRunBeforeUnloadConfirmPanelResultListenerRef listener, const void *clientInfo);
static void handleJavaScriptDialog(WKPageRef page, bool accept, WKStringRef value, const void *clientInfo); static void handleJavaScriptDialog(WKPageRef page, bool accept, WKStringRef value, const void *clientInfo);
static WKRect getWindowFrame(WKPageRef page, const void *clientInfo);
static void didNotHandleKeyEvent(WKPageRef, WKNativeEventPtr, const void*); static void didNotHandleKeyEvent(WKPageRef, WKNativeEventPtr, const void*);
static void decidePolicyForResponse(WKPageRef, WKFrameRef, WKURLResponseRef, WKURLRequestRef, WKFramePolicyListenerRef, WKTypeRef, const void*); static void decidePolicyForResponse(WKPageRef, WKFrameRef, WKURLResponseRef, WKURLRequestRef, WKFramePolicyListenerRef, WKTypeRef, const void*);