Attachment 349113 Details for Bug 189336 – Patch

[patch] Patch

bug-189336-20180907141432.patch (text/plain), 4.68 KB, created by Fujii Hironori on 2018-09-06 22:14:33 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Fujii Hironori

Created: 2018-09-06 22:14:33 PDT

Size: 4.68 KB

patch

obsolete

>Subversion Revision: 235722
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index 90ac723ae6c679936618d3879b3dbb72ce3e9d1f..c37b97a51aeea7f52374a07488b55d4b36bdc3cb 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,24 @@
>+2018-09-06  Fujii Hironori  <Hironori.Fujii@sony.com>
>+
>+        [WinCairo][MiniBrowser][WebKit] REGRESSION(r235398): ASSERTION FAILED: !m_client.didReceiveTitleForFrame
>+        https://bugs.webkit.org/show_bug.cgi?id=189336
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        WKPageSetPageLoaderClient is deprecated. Replaced it with
>+        WKPageSetPageNavigationClient.
>+
>+        * MiniBrowser/win/WebKitBrowserWindow.cpp:
>+        (WebKitBrowserWindow::WebKitBrowserWindow):
>+        Call WKPageSetPageNavigationClient instead of WKPageSetPageLoaderClient.
>+        (WebKitBrowserWindow::didFinishNavigation):
>+        Copied from didReceiveTitleForFrame. Use WKPageCopyTitle to get the title.
>+        (WebKitBrowserWindow::didCommitNavigation):
>+        Copied from didCommitLoadForFrame. Use WKPageCopyCommittedURL to get the URL.
>+        (WebKitBrowserWindow::didReceiveTitleForFrame): Deleted.
>+        (WebKitBrowserWindow::didCommitLoadForFrame): Deleted.
>+        * MiniBrowser/win/WebKitBrowserWindow.h: Renamed the class methods.
>+
> 2018-09-05  Don Olmstead  <don.olmstead@sony.com>
> 
>         [CMake] Allow port specific options on gtest
>diff --git a/Tools/MiniBrowser/win/WebKitBrowserWindow.cpp b/Tools/MiniBrowser/win/WebKitBrowserWindow.cpp
>index e658a4ea423e6aeaacecd546deafee65a69833c2..01b62e14e669af94e08e960c8c7f91c8439f8ad5 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 1583d7416a773f32fb6ba74ee648b68ea68b5559..a7ac900f2bbf1af633ba4fbaa05a764c6f257e5b 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