<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[202327] trunk/Tools</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/202327">202327</a></dd>
<dt>Author</dt> <dd>pvollan@apple.com</dd>
<dt>Date</dt> <dd>2016-06-22 01:35:03 -0700 (Wed, 22 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Win] Implement modal dialog support in MiniBrowser.
https://bugs.webkit.org/show_bug.cgi?id=158976
Reviewed by Brent Fulgham.
* MiniBrowser/win/PrintWebUIDelegate.cpp:
(PrintWebUIDelegate::createWebViewWithRequest):
(getHandleFromWebView):
(PrintWebUIDelegate::webViewClose):
(PrintWebUIDelegate::setFrame):
(PrintWebUIDelegate::webViewFrame):
(PrintWebUIDelegate::canRunModal):
(findTopLevelParent):
(PrintWebUIDelegate::runModal):
(PrintWebUIDelegate::createModalDialog):
* MiniBrowser/win/PrintWebUIDelegate.h:
(PrintWebUIDelegate::webViewClose):
(PrintWebUIDelegate::setFrame):
(PrintWebUIDelegate::webViewFrame):
(PrintWebUIDelegate::canRunModal):
(PrintWebUIDelegate::runModal):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsMiniBrowserwinPrintWebUIDelegatecpp">trunk/Tools/MiniBrowser/win/PrintWebUIDelegate.cpp</a></li>
<li><a href="#trunkToolsMiniBrowserwinPrintWebUIDelegateh">trunk/Tools/MiniBrowser/win/PrintWebUIDelegate.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (202326 => 202327)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-06-22 07:48:15 UTC (rev 202326)
+++ trunk/Tools/ChangeLog 2016-06-22 08:35:03 UTC (rev 202327)
</span><span class="lines">@@ -1,5 +1,29 @@
</span><span class="cx"> 2016-06-22 Per Arne Vollan <pvollan@apple.com>
</span><span class="cx">
</span><ins>+ [Win] Implement modal dialog support in MiniBrowser.
+ https://bugs.webkit.org/show_bug.cgi?id=158976
+
+ Reviewed by Brent Fulgham.
+
+ * MiniBrowser/win/PrintWebUIDelegate.cpp:
+ (PrintWebUIDelegate::createWebViewWithRequest):
+ (getHandleFromWebView):
+ (PrintWebUIDelegate::webViewClose):
+ (PrintWebUIDelegate::setFrame):
+ (PrintWebUIDelegate::webViewFrame):
+ (PrintWebUIDelegate::canRunModal):
+ (findTopLevelParent):
+ (PrintWebUIDelegate::runModal):
+ (PrintWebUIDelegate::createModalDialog):
+ * MiniBrowser/win/PrintWebUIDelegate.h:
+ (PrintWebUIDelegate::webViewClose):
+ (PrintWebUIDelegate::setFrame):
+ (PrintWebUIDelegate::webViewFrame):
+ (PrintWebUIDelegate::canRunModal):
+ (PrintWebUIDelegate::runModal):
+
+2016-06-22 Per Arne Vollan <pvollan@apple.com>
+
</ins><span class="cx"> window.showModalDialog doesn't work in DumpRenderTree on Windows
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=53675
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsMiniBrowserwinPrintWebUIDelegatecpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/win/PrintWebUIDelegate.cpp (202326 => 202327)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/win/PrintWebUIDelegate.cpp 2016-06-22 07:48:15 UTC (rev 202326)
+++ trunk/Tools/MiniBrowser/win/PrintWebUIDelegate.cpp 2016-06-22 08:35:03 UTC (rev 202327)
</span><span class="lines">@@ -27,6 +27,10 @@
</span><span class="cx"> #include "stdafx.h"
</span><span class="cx"> #include "PrintWebUIDelegate.h"
</span><span class="cx">
</span><ins>+#if USE(CF)
+#include <CoreFoundation/CoreFoundation.h>
+#endif
+#include <WebCore/COMPtr.h>
</ins><span class="cx"> #include <WebKit/WebKitCOMAPI.h>
</span><span class="cx"> #include <comip.h>
</span><span class="cx"> #include <commctrl.h>
</span><span class="lines">@@ -81,6 +85,54 @@
</span><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static HWND getHandleFromWebView(IWebView* webView)
+{
+ COMPtr<IWebViewPrivate2> webViewPrivate;
+ HRESULT hr = webView->QueryInterface(&webViewPrivate);
+ if (FAILED(hr))
+ return nullptr;
+
+ HWND webViewWindow = nullptr;
+ hr = webViewPrivate->viewWindow(&webViewWindow);
+ if (FAILED(hr))
+ return nullptr;
+
+ return webViewWindow;
+}
+
+HRESULT PrintWebUIDelegate::webViewClose(_In_opt_ IWebView* webView)
+{
+ HWND hostWindow;
+ HRESULT hr = webView->hostWindow(&hostWindow);
+ if (FAILED(hr))
+ return hr;
+
+ ::DestroyWindow(hostWindow);
+
+ if (hostWindow == m_modalDialogParent)
+ m_modalDialogParent = nullptr;
+
+ return S_OK;
+}
+
+HRESULT PrintWebUIDelegate::setFrame(_In_opt_ IWebView* webView, _In_ RECT* rect)
+{
+ if (m_modalDialogParent)
+ ::MoveWindow(m_modalDialogParent, rect->left, rect->top, rect->right - rect->left, rect->bottom - rect->top, FALSE);
+
+ ::MoveWindow(getHandleFromWebView(webView), 0, 0, rect->right - rect->left, rect->bottom - rect->top, FALSE);
+
+ return S_OK;
+}
+
+HRESULT PrintWebUIDelegate::webViewFrame(_In_opt_ IWebView* webView, _Out_ RECT* rect)
+{
+ if (!::GetWindowRect(getHandleFromWebView(webView), rect))
+ return E_FAIL;
+
+ return S_OK;
+}
+
</ins><span class="cx"> HRESULT PrintWebUIDelegate::QueryInterface(_In_ REFIID riid, _COM_Outptr_ void** ppvObject)
</span><span class="cx"> {
</span><span class="cx"> if (!ppvObject)
</span><span class="lines">@@ -237,10 +289,82 @@
</span><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-HRESULT PrintWebUIDelegate::createModalDialog(_In_opt_ IWebView*, _In_opt_ IWebURLRequest*, _COM_Outptr_opt_ IWebView** webView)
</del><ins>+HRESULT PrintWebUIDelegate::canRunModal(_In_opt_ IWebView*, _Out_ BOOL* canRunBoolean)
</ins><span class="cx"> {
</span><del>- if (!webView)
</del><ins>+ if (!canRunBoolean)
</ins><span class="cx"> return E_POINTER;
</span><del>- *webView = nullptr;
- return E_NOTIMPL;
</del><ins>+ *canRunBoolean = TRUE;
+ return S_OK;
</ins><span class="cx"> }
</span><ins>+
+static HWND findTopLevelParent(HWND window)
+{
+ if (!window)
+ return nullptr;
+
+ HWND current = window;
+ for (HWND parent = GetParent(current); current; current = parent, parent = GetParent(parent)) {
+ if (!parent)
+ return current;
+ }
+ ASSERT_NOT_REACHED();
+ return nullptr;
+}
+
+HRESULT PrintWebUIDelegate::runModal(_In_opt_ IWebView* webView)
+{
+ COMPtr<IWebView> protector(webView);
+
+ auto topLevelParent = findTopLevelParent(::GetWindow(m_modalDialogParent, GW_OWNER));
+
+ ::EnableWindow(topLevelParent, FALSE);
+
+ while (::IsWindow(getHandleFromWebView(webView))) {
+#if USE(CF)
+ CFRunLoopRunInMode(kCFRunLoopDefaultMode, 0, true);
+#endif
+ MSG msg;
+ if (!::GetMessage(&msg, 0, 0, 0))
+ break;
+
+ ::TranslateMessage(&msg);
+ ::DispatchMessage(&msg);
+ }
+
+ ::EnableWindow(topLevelParent, TRUE);
+
+ return S_OK;
+}
+
+HRESULT PrintWebUIDelegate::createModalDialog(_In_opt_ IWebView* sender, _In_opt_ IWebURLRequest* request, _COM_Outptr_opt_ IWebView** newWebView)
+{
+ if (!newWebView)
+ return E_POINTER;
+
+ COMPtr<IWebView> webView;
+ HRESULT hr = WebKitCreateInstance(CLSID_WebView, 0, IID_IWebView, (void**)&webView);
+ if (FAILED(hr))
+ return hr;
+
+ m_modalDialogParent = ::CreateWindow(L"STATIC", L"ModalDialog", WS_OVERLAPPED | WS_VISIBLE, 0, 0, 0, 0, getHandleFromWebView(sender), nullptr, nullptr, nullptr);
+
+ hr = webView->setHostWindow(m_modalDialogParent);
+ if (FAILED(hr))
+ return hr;
+
+ RECT clientRect = { 0, 0, 0, 0 };
+ hr = webView->initWithFrame(clientRect, 0, _bstr_t(L""));
+ if (FAILED(hr))
+ return hr;
+
+ COMPtr<IWebUIDelegate> uiDelegate;
+ hr = sender->uiDelegate(&uiDelegate);
+ if (FAILED(hr))
+ return hr;
+
+ webView->setUIDelegate(uiDelegate.get());
+
+ *newWebView = webView.leakRef();
+
+ return S_OK;
+}
</ins></span></pre></div>
<a id="trunkToolsMiniBrowserwinPrintWebUIDelegateh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/win/PrintWebUIDelegate.h (202326 => 202327)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/win/PrintWebUIDelegate.h 2016-06-22 07:48:15 UTC (rev 202326)
+++ trunk/Tools/MiniBrowser/win/PrintWebUIDelegate.h 2016-06-22 08:35:03 UTC (rev 202327)
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx">
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE createWebViewWithRequest(_In_opt_ IWebView*, _In_opt_ IWebURLRequest*, _COM_Outptr_opt_ IWebView**);
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE webViewShow(_In_opt_ IWebView*) { return E_NOTIMPL; }
</span><del>- virtual HRESULT STDMETHODCALLTYPE webViewClose(_In_opt_ IWebView*) { return E_NOTIMPL; }
</del><ins>+ virtual HRESULT STDMETHODCALLTYPE webViewClose(_In_opt_ IWebView*);
</ins><span class="cx"> virtual HRESULT STDMETHODCALLTYPE webViewFocus(_In_opt_ IWebView*) { return E_NOTIMPL; }
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE webViewUnfocus(_In_opt_ IWebView*) { return E_NOTIMPL; }
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE webViewFirstResponder(_In_opt_ IWebView*, _Out_ HWND*) { return E_NOTIMPL; }
</span><span class="lines">@@ -53,8 +53,8 @@
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE setStatusBarVisible(_In_opt_ IWebView*, BOOL) { return E_NOTIMPL; }
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE webViewIsResizable(_In_opt_ IWebView*, _Out_ BOOL*) { return E_NOTIMPL; }
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE setResizable(_In_opt_ IWebView*, BOOL) { return E_NOTIMPL; }
</span><del>- virtual HRESULT STDMETHODCALLTYPE setFrame(_In_opt_ IWebView*, _In_ RECT*) { return E_NOTIMPL; }
- virtual HRESULT STDMETHODCALLTYPE webViewFrame(_In_opt_ IWebView*, _Out_ RECT*) { return E_NOTIMPL; }
</del><ins>+ virtual HRESULT STDMETHODCALLTYPE setFrame(_In_opt_ IWebView*, _In_ RECT*);
+ virtual HRESULT STDMETHODCALLTYPE webViewFrame(_In_opt_ IWebView*, _Out_ RECT*);
</ins><span class="cx"> virtual HRESULT STDMETHODCALLTYPE setContentRect(_In_opt_ IWebView*, _In_ RECT*) { return E_NOTIMPL; }
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE webViewContentRect(_In_opt_ IWebView*, _Out_ RECT*) { return E_NOTIMPL; }
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE runJavaScriptAlertPanelWithMessage(_In_opt_ IWebView*, _In_ BSTR);
</span><span class="lines">@@ -93,9 +93,9 @@
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE drawHeaderInRect(_In_opt_ IWebView*, _In_ RECT*, ULONG_PTR);
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE drawFooterInRect(_In_opt_ IWebView*, _In_ RECT*, ULONG_PTR, UINT, UINT);
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE webViewPrintingMarginRect(_In_opt_ IWebView*, _Out_ RECT*);
</span><del>- virtual HRESULT STDMETHODCALLTYPE canRunModal(_In_opt_ IWebView*, _Out_ BOOL*) { return E_NOTIMPL; }
</del><ins>+ virtual HRESULT STDMETHODCALLTYPE canRunModal(_In_opt_ IWebView*, _Out_ BOOL*);
</ins><span class="cx"> virtual HRESULT STDMETHODCALLTYPE createModalDialog(_In_opt_ IWebView*, _In_opt_ IWebURLRequest*, _COM_Outptr_opt_ IWebView**);
</span><del>- virtual HRESULT STDMETHODCALLTYPE runModal(_In_opt_ IWebView*) { return E_NOTIMPL; }
</del><ins>+ virtual HRESULT STDMETHODCALLTYPE runModal(_In_opt_ IWebView*);
</ins><span class="cx"> virtual HRESULT STDMETHODCALLTYPE isMenuBarVisible(_In_opt_ IWebView*, _Out_ BOOL*) { return E_NOTIMPL; }
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE setMenuBarVisible(_In_opt_ IWebView*, BOOL) { return E_NOTIMPL; }
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE runDatabaseSizeLimitPrompt(_In_opt_ IWebView*, _In_ BSTR, _In_opt_ IWebFrame*, _Out_ BOOL*) { return E_NOTIMPL; }
</span><span class="lines">@@ -104,6 +104,7 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> int m_refCount { 1 };
</span><ins>+ HWND m_modalDialogParent { nullptr };
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre>
</div>
</div>
</body>
</html>