Modified: trunk/Tools/ChangeLog (232229 => 232230)
--- trunk/Tools/ChangeLog 2018-05-28 00:49:21 UTC (rev 232229)
+++ trunk/Tools/ChangeLog 2018-05-28 02:22:35 UTC (rev 232230)
@@ -1,3 +1,25 @@
+2018-05-27 Fujii Hironori <[email protected]>
+
+ [Win][MiniBrowser] Remove URL argument of MiniBrowser::init
+ https://bugs.webkit.org/show_bug.cgi?id=185969
+
+ Reviewed by Alex Christensen.
+
+ MiniBrowser::init takes URL argument, but it's used only for
+ loading default HTML if URL is not given.
+
+ - Add a new method MiniBrowser::loadHTMLString
+ - Remove loadHTMLString process from MiniBrowser::prepareViews
+
+ * MiniBrowser/win/MiniBrowser.cpp:
+ (MiniBrowser::init): Removed `requestedURL` argument.
+ (MiniBrowser::prepareViews): Ditto.
+ (MiniBrowser::loadHTMLString): New.
+ (MiniBrowser::loadURL): Return E_INVALIDARG if passedURL is null instead of calling loadHTMLString.
+ * MiniBrowser/win/MiniBrowser.h: Removed URL argument. Added loadHTMLString.
+ * MiniBrowser/win/WinMain.cpp:
+ (wWinMain): Call MiniBrowser::loadHTMLString if URL is not given.
+
2018-05-27 David Kilzer <[email protected]>
svn-apply fails when a patch has an empty file
Modified: trunk/Tools/MiniBrowser/win/MiniBrowser.cpp (232229 => 232230)
--- trunk/Tools/MiniBrowser/win/MiniBrowser.cpp 2018-05-28 00:49:21 UTC (rev 232229)
+++ trunk/Tools/MiniBrowser/win/MiniBrowser.cpp 2018-05-28 02:22:35 UTC (rev 232230)
@@ -69,7 +69,7 @@
{
}
-HRESULT MiniBrowser::init(_bstr_t& requestedURL)
+HRESULT MiniBrowser::init()
{
updateDeviceScaleFactor();
@@ -135,7 +135,7 @@
if (usesLayeredWebView())
clientRect = { s_windowPosition.x, s_windowPosition.y, s_windowPosition.x + s_windowSize.cx, s_windowPosition.y + s_windowSize.cy };
- hr = prepareViews(m_hMainWnd, clientRect, requestedURL.GetBSTR());
+ hr = prepareViews(m_hMainWnd, clientRect);
if (FAILED(hr))
return hr;
@@ -157,7 +157,7 @@
return true;
}
-HRESULT MiniBrowser::prepareViews(HWND mainWnd, const RECT& clientRect, const BSTR& requestedURL)
+HRESULT MiniBrowser::prepareViews(HWND mainWnd, const RECT& clientRect)
{
if (!m_webView)
return E_FAIL;
@@ -170,15 +170,6 @@
if (FAILED(hr))
return hr;
- if (!requestedURL) {
- IWebFramePtr frame;
- hr = m_webView->mainFrame(&frame.GetInterfacePtr());
- if (FAILED(hr))
- return hr;
-
- frame->loadHTMLString(_bstr_t(defaultHTML).GetBSTR(), 0);
- }
-
hr = m_webViewPrivate->setTransparent(m_useLayeredWebView);
if (FAILED(hr))
return hr;
@@ -192,6 +183,17 @@
return hr;
}
+HRESULT MiniBrowser::loadHTMLString(const BSTR& str)
+{
+ IWebFramePtr frame;
+ HRESULT hr = m_webView->mainFrame(&frame.GetInterfacePtr());
+ if (FAILED(hr))
+ return hr;
+
+ frame->loadHTMLString(str, 0);
+ return hr;
+}
+
static WNDPROC gDefWebKitProc;
static LRESULT CALLBACK viewWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
@@ -463,6 +465,9 @@
HRESULT MiniBrowser::loadURL(const BSTR& passedURL)
{
+ if (!passedURL)
+ return E_INVALIDARG;
+
_bstr_t urlBStr(passedURL);
if (!!urlBStr && (::PathFileExists(urlBStr) || ::PathIsUNC(urlBStr))) {
TCHAR fileURL[INTERNET_MAX_URL_LENGTH];
@@ -477,9 +482,6 @@
if (FAILED(hr))
return hr;
- if (!passedURL)
- return frame->loadHTMLString(_bstr_t(defaultHTML).GetBSTR(), 0);
-
IWebMutableURLRequestPtr request;
hr = WebKitCreateInstance(CLSID_WebMutableURLRequest, 0, IID_IWebMutableURLRequest, (void**)&request);
if (FAILED(hr))
Modified: trunk/Tools/MiniBrowser/win/MiniBrowser.h (232229 => 232230)
--- trunk/Tools/MiniBrowser/win/MiniBrowser.h 2018-05-28 00:49:21 UTC (rev 232229)
+++ trunk/Tools/MiniBrowser/win/MiniBrowser.h 2018-05-28 02:22:35 UTC (rev 232230)
@@ -49,9 +49,10 @@
public:
MiniBrowser(HWND mainWnd, HWND urlBarWnd, bool useLayeredWebView = false, bool pageLoadTesting = false);
- HRESULT init(_bstr_t& requestedURL);
- HRESULT prepareViews(HWND mainWnd, const RECT& clientRect, const BSTR& requestedURL);
+ HRESULT init();
+ HRESULT prepareViews(HWND mainWnd, const RECT& clientRect);
+ HRESULT loadHTMLString(const BSTR&);
HRESULT loadURL(const BSTR& passedURL);
void showLastVisitedSites(IWebView&);
Modified: trunk/Tools/MiniBrowser/win/WinMain.cpp (232229 => 232230)
--- trunk/Tools/MiniBrowser/win/WinMain.cpp 2018-05-28 00:49:21 UTC (rev 232229)
+++ trunk/Tools/MiniBrowser/win/WinMain.cpp 2018-05-28 02:22:35 UTC (rev 232230)
@@ -98,7 +98,7 @@
gMiniBrowser = new MiniBrowser(hMainWnd, hURLBarWnd, usesLayeredWebView, pageLoadTesting);
if (!gMiniBrowser)
goto exit;
- HRESULT hr = gMiniBrowser->init(requestedURL);
+ HRESULT hr = gMiniBrowser->init();
if (FAILED(hr))
goto exit;
@@ -113,6 +113,8 @@
if (requestedURL.length())
loadURL(requestedURL.GetBSTR());
+ else
+ gMiniBrowser->loadHTMLString(_bstr_t(defaultHTML).GetBSTR());
#pragma warning(disable:4509)
