Attachment 341239 Details for Bug 185969 – Patch

[patch] Patch

bug-185969-20180525105221.patch (text/plain), 5.80 KB, created by Fujii Hironori on 2018-05-24 18:52:22 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Fujii Hironori

Created: 2018-05-24 18:52:22 PDT

Size: 5.80 KB

patch

obsolete

>Subversion Revision: 232175
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index 645f70cdc55126738f59b029c5ef8f8aebee560a..debfd18d4ad4c62161ac88d14f83c86e8a783949 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,25 @@
>+2018-05-24  Fujii Hironori  <Hironori.Fujii@sony.com>
>+
>+        [Win][MiniBrowser] Remove URL argument of MiniBrowser::init
>+        https://bugs.webkit.org/show_bug.cgi?id=185969
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        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-24  Chris Dumez  <cdumez@apple.com>
> 
>         Reduce copying of FontCascadeDescription objects by moving them around
>diff --git a/Tools/MiniBrowser/win/MiniBrowser.cpp b/Tools/MiniBrowser/win/MiniBrowser.cpp
>index 749bf044a5ac7541938261e5e9d5700a9725db06..276ae7d3004701231704a46e80467588779fe6fd 100644
>--- a/Tools/MiniBrowser/win/MiniBrowser.cpp
>+++ b/Tools/MiniBrowser/win/MiniBrowser.cpp
>@@ -69,7 +69,7 @@ MiniBrowser::MiniBrowser(HWND mainWnd, HWND urlBarWnd, bool useLayeredWebView, b
> {
> }
> 
>-HRESULT MiniBrowser::init(_bstr_t& requestedURL)
>+HRESULT MiniBrowser::init()
> {
>     updateDeviceScaleFactor();
> 
>@@ -135,7 +135,7 @@ HRESULT MiniBrowser::init(_bstr_t& requestedURL)
>     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 @@ bool MiniBrowser::setCacheFolder()
>     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 @@ HRESULT MiniBrowser::prepareViews(HWND mainWnd, const RECT& clientRect, const BS
>     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 @@ HRESULT MiniBrowser::prepareViews(HWND mainWnd, const RECT& clientRect, const BS
>     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 @@ bool MiniBrowser::goForward()
> 
> 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 @@ HRESULT MiniBrowser::loadURL(const BSTR& passedURL)
>     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))
>diff --git a/Tools/MiniBrowser/win/MiniBrowser.h b/Tools/MiniBrowser/win/MiniBrowser.h
>index 4eb58c2b41dd2ef8c1f51774ae5eb886455e78c6..dae9da902d1f31ba2aefbcf2abf7c058b8feafb7 100644
>--- a/Tools/MiniBrowser/win/MiniBrowser.h
>+++ b/Tools/MiniBrowser/win/MiniBrowser.h
>@@ -49,9 +49,10 @@ class MiniBrowser {
> 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&);
>diff --git a/Tools/MiniBrowser/win/WinMain.cpp b/Tools/MiniBrowser/win/WinMain.cpp
>index 087e94df06822305f35c7517e78209d832452d04..781d54a231ea7652d84f1de68d9d6d4516554110 100644
>--- a/Tools/MiniBrowser/win/WinMain.cpp
>+++ b/Tools/MiniBrowser/win/WinMain.cpp
>@@ -98,7 +98,7 @@ int WINAPI wWinMain(_In_ HINSTANCE hInstance, _In_opt_ HINSTANCE hPrevInstance,
>     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 @@ int WINAPI wWinMain(_In_ HINSTANCE hInstance, _In_opt_ HINSTANCE hPrevInstance,
> 
>     if (requestedURL.length())
>         loadURL(requestedURL.GetBSTR());
>+    else
>+        gMiniBrowser->loadHTMLString(_bstr_t(defaultHTML).GetBSTR());
> 
> #pragma warning(disable:4509)
>

Flags:

achristensen: review+
ews-watchlist: commit-queue-

Actions: View | Formatted Diff | Diff

Attachments on bug 185969: 341239 | 341255