Attachment 358474 Details for Bug 193029 – Patch for landing

[patch] Patch for landing

bug-193029-20190107121850.patch (text/plain), 5.71 KB, created by Fujii Hironori on 2019-01-06 19:18:51 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Fujii Hironori

Created: 2019-01-06 19:18:51 PST

Size: 5.71 KB

patch

obsolete

>Subversion Revision: 239665
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index 0a926975465a263a80688ce4269550cc7304d0d3..3e68f076c1e3ffc6d8e97632187f9ba97e3a8df2 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,24 @@
>+2019-01-06  Fujii Hironori  <Hironori.Fujii@sony.com>
>+
>+        [Win][Clang] Fix compilation warnings of MiniBrowser
>+        https://bugs.webkit.org/show_bug.cgi?id=193029
>+
>+        Reviewed by Ross Kirsling.
>+
>+        * MiniBrowser/win/MiniBrowserWebHost.h: Removed unused m_oldFont
>+        and m_URLBarFont. Reorder member variables to fix -Wreorder
>+        warning.
>+        * MiniBrowser/win/PageLoadTestClient.cpp:
>+        (PageLoadTestClient::PageLoadTestClient): Reorder 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 argument type docname to const.
>+
> 2019-01-06  Jiewen Tan  <jiewen_tan@apple.com>
> 
>         [WebAuthN] Import U2F command/response converters from Chromium
>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 99ee0440bac0a809b49f4e8677d675b13c242c02..5a53268f6b768ffcaa9f6246e22a33b3578057d9 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..3de9fe55c126cc35c2bf6a3276458b775624bcef 100644
>--- a/Tools/MiniBrowser/win/WebKitLegacyBrowserWindow.cpp
>+++ b/Tools/MiniBrowser/win/WebKitLegacyBrowserWindow.cpp
>@@ -612,7 +612,7 @@ 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);
>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