Changeset 239666 in webkit


Ignore:
Timestamp:
Jan 6, 2019 7:27:22 PM (5 years ago)
Author:
Fujii Hironori
Message:

[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.

Location:
trunk/Tools
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/Tools/ChangeLog

    r239665 r239666  
     12019-01-06  Fujii Hironori  <Hironori.Fujii@sony.com>
     2
     3        [Win][Clang] Fix compilation warnings of MiniBrowser
     4        https://bugs.webkit.org/show_bug.cgi?id=193029
     5
     6        Reviewed by Ross Kirsling.
     7
     8        * MiniBrowser/win/MiniBrowserWebHost.h: Removed unused m_oldFont
     9        and m_URLBarFont. Reorder member variables to fix -Wreorder
     10        warning.
     11        * MiniBrowser/win/PageLoadTestClient.cpp:
     12        (PageLoadTestClient::PageLoadTestClient): Reorder the member initializer list.
     13        * MiniBrowser/win/PageLoadTestClient.h: Removed 'virtual' of
     14        pageLoadStartedAtTime and pageLoadEndedAtTime. Removed unused
     15        m_currentURLIndex.
     16        * MiniBrowser/win/WebKitBrowserWindow.cpp:
     17        (WebKitBrowserWindow::WebKitBrowserWindow): Initialize
     18        navigationClient with '{ }' to fix the missing field warning.
     19        * MiniBrowser/win/WebKitLegacyBrowserWindow.cpp:
     20        (initDocStruct): Changed the argument type docname to const.
     21
    1222019-01-06  Jiewen Tan  <jiewen_tan@apple.com>
    223

  • trunk/Tools/MiniBrowser/win/MiniBrowserWebHost.h

    r232669 r239666  
    7878
    7979private:
     80    WebKitLegacyBrowserWindow* m_client { nullptr };
    8081    HWND m_hURLBarWnd { 0 };
    81     HGDIOBJ m_URLBarFont { 0 };
    82     HGDIOBJ m_oldFont { 0 };
    83     WebKitLegacyBrowserWindow* m_client { nullptr };
    8482};

  • trunk/Tools/MiniBrowser/win/PageLoadTestClient.cpp

    r232669 r239666  
    3838PageLoadTestClient::PageLoadTestClient(WebKitLegacyBrowserWindow* host, bool pageLoadTesting)
    3939    : m_host(host)
     40    , m_waitForLoadToReallyEnd(this, &PageLoadTestClient::endPageLoad)
    4041    , m_repetitions(pageLoadTesting ? 20 : 1)
    41     , m_waitForLoadToReallyEnd(this, &PageLoadTestClient::endPageLoad)
    4242    , m_pageLoadTesting(pageLoadTesting)
    4343{

  • trunk/Tools/MiniBrowser/win/PageLoadTestClient.h

    r232669 r239666  
    128128    bool shouldConsiderPageLoadEnded() const;
    129129
    130     virtual void pageLoadStartedAtTime(CFAbsoluteTime);
    131     virtual void pageLoadEndedAtTime(CFAbsoluteTime);
     130    void pageLoadStartedAtTime(CFAbsoluteTime);
     131    void pageLoadEndedAtTime(CFAbsoluteTime);
    132132    void dumpRunStatistics();
    133133
    … …  
    147147    unsigned m_frames { 0 };
    148148    unsigned m_onLoadEvents { 0 };
    149     unsigned m_currentURLIndex { 0 };
    150149    unsigned m_currentRepetition { 0 };
    151150    unsigned m_pagesTimed { 0 };

  • trunk/Tools/MiniBrowser/win/WebKitBrowserWindow.cpp

    r239631 r239666  
    105105    auto page = WKViewGetPage(m_view.get());
    106106
    107     WKPageNavigationClientV0 navigationClient = {{ 0, this }};
     107    WKPageNavigationClientV0 navigationClient = { };
     108    navigationClient.base.version = 0;
     109    navigationClient.base.clientInfo = this;
    108110    navigationClient.didFinishNavigation = didFinishNavigation;
    109111    navigationClient.didCommitNavigation = didCommitNavigation;

  • trunk/Tools/MiniBrowser/win/WebKitLegacyBrowserWindow.cpp

    r239092 r239666  
    613613}
    614614
    615 static void initDocStruct(DOCINFO* di, TCHAR* docname)
     615static void initDocStruct(DOCINFO* di, const wchar_t* docname)
    616616{
    617617    memset(di, 0, sizeof(DOCINFO));

  • trunk/Tools/MiniBrowser/win/WebKitLegacyBrowserWindow.h

    r238051 r239666  
    121121    std::vector<IWebHistoryItemPtr> m_historyItems;
    122122
    123     std::unique_ptr<PageLoadTestClient> m_pageLoadTestClient;
    124 
    125123    IWebViewPtr m_webView;
    126124    IWebViewPrivatePtr m_webViewPrivate;
    … …  
    145143
    146144    bool m_useLayeredWebView;
     145
     146    std::unique_ptr<PageLoadTestClient> m_pageLoadTestClient;
    147147};
Note: See TracChangeset for help on using the changeset viewer.