Attachment 358059 Details for Bug 193029 – Patch

[patch] Patch

bug-193029-20181225171449.patch (text/plain), 7.19 KB, created by Fujii Hironori on 2018-12-25 00:14:50 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Fujii Hironori

Created: 2018-12-25 00:14:50 PST

Size: 7.19 KB

patch

obsolete

>Subversion Revision: 239551
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index 8dcee1e52700fae0a737c5008d5a85f0f1a8f060..e11a73118a95d3dae30bced4e0e9764d2a1c0e47 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,28 @@
>+2018-12-24  Fujii Hironori  <Hironori.Fujii@sony.com>
>+
>+        [Win][Clang] Fix compilation warnings of MiniBrowser
>+        https://bugs.webkit.org/show_bug.cgi?id=193029
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * MiniBrowser/win/MiniBrowserWebHost.cpp:
>+        (MiniBrowserWebHost::didFinishLoadForFrame): Applied const_cast to
>+        string literals.
>+        * MiniBrowser/win/MiniBrowserWebHost.h: Removed unused m_oldFont
>+        and m_URLBarFont. Reoder member variables to fix -Wreorder
>+        warning.
>+        * MiniBrowser/win/PageLoadTestClient.cpp:
>+        (PageLoadTestClient::PageLoadTestClient): Reoder the member initializer list.
>+        * MiniBrowser/win/PageLoadTestClient.h: Removed 'virtual' of
>+        pageLoadStartedAtTime and pageLoadEndedAtTime. Removed unused
>+        m_currentURLIndex.
>+        * MiniBrowser/win/WebKitBrowserWindow.cpp:
>+        (WebKitBrowserWindow::WebKitBrowserWindow): Initialize
>+        navigationClient with '{ }' to fix the missing field warning.
>+        * MiniBrowser/win/WebKitLegacyBrowserWindow.cpp:
>+        (initDocStruct): Changed the arugment type docname to const.
>+        Applied const_cast to docname.
>+
> 2018-12-22  Carlos Garcia Campos  <cgarcia@igalia.com>
> 
>         WebDriver: warn about non existing tests when parsing expectations
>diff --git a/Tools/MiniBrowser/win/MiniBrowserWebHost.cpp b/Tools/MiniBrowser/win/MiniBrowserWebHost.cpp
>index 7fe73246745ef9fc3c74a7d645053f2ad941f7eb..d7c17a9d2de9c5409fb5a3e86c3eb99e0904696b 100644
>--- a/Tools/MiniBrowser/win/MiniBrowserWebHost.cpp
>+++ b/Tools/MiniBrowser/win/MiniBrowserWebHost.cpp
>@@ -167,7 +167,7 @@ HRESULT MiniBrowserWebHost::didFinishLoadForFrame(_In_opt_ IWebView* webView, _I
>         m_client->showLastVisitedSites(*webView);
> 
>     // The following is for the test page:
>-    HRESULT hr = doc->getElementById(L"webkit logo", &element.GetInterfacePtr());
>+    HRESULT hr = doc->getElementById(const_cast<wchar_t*>(L"webkit logo"), &element.GetInterfacePtr());
>     if (!SUCCEEDED(hr))
>         return hr;
> 
>@@ -175,7 +175,7 @@ HRESULT MiniBrowserWebHost::didFinishLoadForFrame(_In_opt_ IWebView* webView, _I
>     if (!SUCCEEDED(hr))
>         return hr;
> 
>-    hr = target->addEventListener(L"click", new SimpleEventListener (L"webkit logo click"), FALSE);
>+    hr = target->addEventListener(const_cast<wchar_t*>(L"click"), new SimpleEventListener (const_cast<wchar_t*>(L"webkit logo click")), FALSE);
>     if (!SUCCEEDED(hr))
>         return hr;
> 
>diff --git a/Tools/MiniBrowser/win/MiniBrowserWebHost.h b/Tools/MiniBrowser/win/MiniBrowserWebHost.h
>index 80b993576668cc06b7b56e1c81fed506fe5cb195..61d173d6b3564b763f1a2c22306531e6ff698b65 100644
>--- a/Tools/MiniBrowser/win/MiniBrowserWebHost.h
>+++ b/Tools/MiniBrowser/win/MiniBrowserWebHost.h
>@@ -77,8 +77,6 @@ protected:
>     HRESULT updateAddressBar(IWebView&);
> 
> private:
>-    HWND m_hURLBarWnd { 0 };
>-    HGDIOBJ m_URLBarFont { 0 };
>-    HGDIOBJ m_oldFont { 0 };
>     WebKitLegacyBrowserWindow* m_client { nullptr };
>+    HWND m_hURLBarWnd { 0 };
> };
>diff --git a/Tools/MiniBrowser/win/PageLoadTestClient.cpp b/Tools/MiniBrowser/win/PageLoadTestClient.cpp
>index 31943324d8da60e3ed82f498872836b69aeb2277..51bf4e2208d6cb57a78fc5d0d2c879599a321ce3 100644
>--- a/Tools/MiniBrowser/win/PageLoadTestClient.cpp
>+++ b/Tools/MiniBrowser/win/PageLoadTestClient.cpp
>@@ -37,8 +37,8 @@ static const CFTimeInterval waitForNewResourceLoadDuration = 0.1;
> 
> PageLoadTestClient::PageLoadTestClient(WebKitLegacyBrowserWindow* host, bool pageLoadTesting)
>     : m_host(host)
>-    , m_repetitions(pageLoadTesting ? 20 : 1)
>     , m_waitForLoadToReallyEnd(this, &PageLoadTestClient::endPageLoad)
>+    , m_repetitions(pageLoadTesting ? 20 : 1)
>     , m_pageLoadTesting(pageLoadTesting)
> {
> }
>diff --git a/Tools/MiniBrowser/win/PageLoadTestClient.h b/Tools/MiniBrowser/win/PageLoadTestClient.h
>index 0df0aa8aa99d4091305d31b30edc2042e0ce1b6b..7511243fa747a5489a955c9b80820c2ccd26c275 100644
>--- a/Tools/MiniBrowser/win/PageLoadTestClient.h
>+++ b/Tools/MiniBrowser/win/PageLoadTestClient.h
>@@ -127,8 +127,8 @@ private:
>     void clearPageLoadState();
>     bool shouldConsiderPageLoadEnded() const;
> 
>-    virtual void pageLoadStartedAtTime(CFAbsoluteTime);
>-    virtual void pageLoadEndedAtTime(CFAbsoluteTime);
>+    void pageLoadStartedAtTime(CFAbsoluteTime);
>+    void pageLoadEndedAtTime(CFAbsoluteTime);
>     void dumpRunStatistics();
> 
>     WebKitLegacyBrowserWindow* m_host;
>@@ -146,7 +146,6 @@ private:
>     double m_geometricMeanProductSum { 1.0 };
>     unsigned m_frames { 0 };
>     unsigned m_onLoadEvents { 0 };
>-    unsigned m_currentURLIndex { 0 };
>     unsigned m_currentRepetition { 0 };
>     unsigned m_pagesTimed { 0 };
>     unsigned m_repetitions;
>diff --git a/Tools/MiniBrowser/win/WebKitBrowserWindow.cpp b/Tools/MiniBrowser/win/WebKitBrowserWindow.cpp
>index a83860656f5f329287a1073a5b2a7ca1261df9ba..fdb1add906e6cd7e216b12fe7df5cd7495c80ac1 100644
>--- a/Tools/MiniBrowser/win/WebKitBrowserWindow.cpp
>+++ b/Tools/MiniBrowser/win/WebKitBrowserWindow.cpp
>@@ -104,7 +104,9 @@ WebKitBrowserWindow::WebKitBrowserWindow(HWND mainWnd, HWND urlBarWnd)
>     m_view = adoptWK(WKViewCreate(rect, conf.get(), mainWnd));
>     auto page = WKViewGetPage(m_view.get());
> 
>-    WKPageNavigationClientV0 navigationClient = {{ 0, this }};
>+    WKPageNavigationClientV0 navigationClient = { };
>+    navigationClient.base.version = 0;
>+    navigationClient.base.clientInfo = this;
>     navigationClient.didFinishNavigation = didFinishNavigation;
>     navigationClient.didCommitNavigation = didCommitNavigation;
>     navigationClient.didReceiveAuthenticationChallenge = didReceiveAuthenticationChallenge;
>diff --git a/Tools/MiniBrowser/win/WebKitLegacyBrowserWindow.cpp b/Tools/MiniBrowser/win/WebKitLegacyBrowserWindow.cpp
>index d6430b44021f2175c1cfc8269ce49054ac9af16b..8bcfe57b76cf47ec665342b00e21f8256b37d217 100644
>--- a/Tools/MiniBrowser/win/WebKitLegacyBrowserWindow.cpp
>+++ b/Tools/MiniBrowser/win/WebKitLegacyBrowserWindow.cpp
>@@ -612,11 +612,11 @@ static HDC getPrinterDC()
>     return pdlg.hDC;
> }
> 
>-static void initDocStruct(DOCINFO* di, TCHAR* docname)
>+static void initDocStruct(DOCINFO* di, const wchar_t* docname)
> {
>     memset(di, 0, sizeof(DOCINFO));
>     di->cbSize = sizeof(DOCINFO);
>-    di->lpszDocName = docname;
>+    di->lpszDocName = const_cast<wchar_t*>(docname);
> }
> 
> void WebKitLegacyBrowserWindow::print()
>diff --git a/Tools/MiniBrowser/win/WebKitLegacyBrowserWindow.h b/Tools/MiniBrowser/win/WebKitLegacyBrowserWindow.h
>index ece4eaf2409bdc9806f0042e17d4c34c44ca9964..ea49645fe3381b72a00a7027090fe487c492289d 100644
>--- a/Tools/MiniBrowser/win/WebKitLegacyBrowserWindow.h
>+++ b/Tools/MiniBrowser/win/WebKitLegacyBrowserWindow.h
>@@ -120,8 +120,6 @@ private:
> 
>     std::vector<IWebHistoryItemPtr> m_historyItems;
> 
>-    std::unique_ptr<PageLoadTestClient> m_pageLoadTestClient;
>-
>     IWebViewPtr m_webView;
>     IWebViewPrivatePtr m_webViewPrivate;
> 
>@@ -144,4 +142,6 @@ private:
>     HWND m_viewWnd { nullptr };
> 
>     bool m_useLayeredWebView;
>+
>+    std::unique_ptr<PageLoadTestClient> m_pageLoadTestClient;
> };

Actions: View | Formatted Diff | Diff

Attachments on bug 193029: 358059 | 358095 | 358474