Attachment 349016 Details for Bug 189336 – WIP patch

[patch] WIP patch

wip.patch (text/plain), 3.21 KB, created by Fujii Hironori on 2018-09-06 04:06:59 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Fujii Hironori

Created: 2018-09-06 04:06:59 PDT

Size: 3.21 KB

patch

obsolete

>diff --git a/Tools/MiniBrowser/win/WebKitBrowserWindow.cpp b/Tools/MiniBrowser/win/WebKitBrowserWindow.cpp
>index e658a4ea423..01b62e14e66 100644
>--- a/Tools/MiniBrowser/win/WebKitBrowserWindow.cpp
>+++ b/Tools/MiniBrowser/win/WebKitBrowserWindow.cpp
>@@ -91,10 +91,10 @@ WebKitBrowserWindow::WebKitBrowserWindow(HWND mainWnd, HWND urlBarWnd)
>     m_view = adoptWK(WKViewCreate(rect, conf.get(), mainWnd));
>     auto page = WKViewGetPage(m_view.get());
> 
>-    WKPageLoaderClientV0 loadClient = {{ 0, this }};
>-    loadClient.didReceiveTitleForFrame = didReceiveTitleForFrame;
>-    loadClient.didCommitLoadForFrame = didCommitLoadForFrame;
>-    WKPageSetPageLoaderClient(page, &loadClient.base);
>+    WKPageNavigationClientV0 navigationClient = {{ 0, this }};
>+    navigationClient.didFinishNavigation = didFinishNavigation;
>+    navigationClient.didCommitNavigation = didCommitNavigation;
>+    WKPageSetPageNavigationClient(page, &navigationClient.base);
> }
> 
> HRESULT WebKitBrowserWindow::init()
>@@ -213,22 +213,19 @@ static WebKitBrowserWindow& toWebKitBrowserWindow(const void *clientInfo)
>     return *const_cast<WebKitBrowserWindow*>(static_cast<const WebKitBrowserWindow*>(clientInfo));
> }
> 
>-void WebKitBrowserWindow::didReceiveTitleForFrame(WKPageRef page, WKStringRef title, WKFrameRef frame, WKTypeRef userData, const void *clientInfo)
>+void WebKitBrowserWindow::didFinishNavigation(WKPageRef page, WKNavigationRef navigation, WKTypeRef userData, const void* clientInfo)
> {
>-    if (!WKFrameIsMainFrame(frame))
>-        return;
>-    std::wstring titleString = createString(title) + L" [WebKit]";
>+    WKRetainPtr<WKStringRef> title = adoptWK(WKPageCopyTitle(page));
>+    std::wstring titleString = createString(title.get()) + L" [WebKit]";
>     auto& thisWindow = toWebKitBrowserWindow(clientInfo);
>     SetWindowText(thisWindow.m_hMainWnd, titleString.c_str());
> }
> 
>-void WebKitBrowserWindow::didCommitLoadForFrame(WKPageRef page, WKFrameRef frame, WKTypeRef userData, const void *clientInfo)
>+void WebKitBrowserWindow::didCommitNavigation(WKPageRef page, WKNavigationRef navigation, WKTypeRef userData, const void* clientInfo)
> {
>-    if (!WKFrameIsMainFrame(frame))
>-        return;
>     auto& thisWindow = toWebKitBrowserWindow(clientInfo);
> 
>-    WKRetainPtr<WKURLRef> wkurl = adoptWK(WKFrameCopyURL(frame));
>+    WKRetainPtr<WKURLRef> wkurl = adoptWK(WKPageCopyCommittedURL(page));
>     std::wstring urlString = createString(wkurl.get());
>     SetWindowText(thisWindow.m_urlBarWnd, urlString.c_str());
> }
>diff --git a/Tools/MiniBrowser/win/WebKitBrowserWindow.h b/Tools/MiniBrowser/win/WebKitBrowserWindow.h
>index 1583d7416a7..a7ac900f2bb 100644
>--- a/Tools/MiniBrowser/win/WebKitBrowserWindow.h
>+++ b/Tools/MiniBrowser/win/WebKitBrowserWindow.h
>@@ -57,8 +57,8 @@ private:
>     void zoomIn() override;
>     void zoomOut() override;
> 
>-    static void didReceiveTitleForFrame(WKPageRef, WKStringRef, WKFrameRef, WKTypeRef, const void *);
>-    static void didCommitLoadForFrame(WKPageRef, WKFrameRef, WKTypeRef, const void *);
>+    static void didFinishNavigation(WKPageRef, WKNavigationRef, WKTypeRef, const void*);
>+    static void didCommitNavigation(WKPageRef, WKNavigationRef, WKTypeRef, const void*);
> 
>     WKRetainPtr<WKViewRef> m_view;
>     HWND m_hMainWnd { nullptr };

Actions: View | Formatted Diff | Diff

Attachments on bug 189336: 349016 | 349113