Changeset 285876 in webkit

Timestamp:

Nov 16, 2021, 11:49:47 AM (5 years ago)

Author:

Fujii Hironori

Message:

[Win][MiniBrowser][WK2] Show a message box for a provisional navigation failure
​https://bugs.webkit.org/show_bug.cgi?id=233170

Reviewed by Don Olmstead.

Show a MessageBox if a provisional navigation failed.

• MiniBrowser/win/WebKitBrowserWindow.cpp:

(WebKitBrowserWindow::WebKitBrowserWindow):
(WebKitBrowserWindow::didFailProvisionalNavigation):

• MiniBrowser/win/WebKitBrowserWindow.h:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• MiniBrowser/win/WebKitBrowserWindow.cpp (modified) (3 diffs)
• MiniBrowser/win/WebKitBrowserWindow.h (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2021-11-16  Fujii Hironori  <Hironori.Fujii@sony.com>
+
+        [Win][MiniBrowser][WK2] Show a message box for a provisional navigation failure
+        https://bugs.webkit.org/show_bug.cgi?id=233170
+
+        Reviewed by Don Olmstead.
+
+        Show a MessageBox if a provisional navigation failed.
+
+        * MiniBrowser/win/WebKitBrowserWindow.cpp:
+        (WebKitBrowserWindow::WebKitBrowserWindow):
+        (WebKitBrowserWindow::didFailProvisionalNavigation):
+        * MiniBrowser/win/WebKitBrowserWindow.h:
+
 2021-11-16  Zhifei Fang  <zhifei_fang@apple.com>
 

trunk/Tools/MiniBrowser/win/WebKitBrowserWindow.cpp

@@ -42 +42 @@
 #include <WebKit/WKWebsiteDataStoreRefCurl.h>
 #include <filesystem>
+#include <sstream>
 #include <vector>
 
@@ -154 +155 @@
     navigationClient.base.version = 0;
     navigationClient.base.clientInfo = this;
+    navigationClient.didFailProvisionalNavigation = didFailProvisionalNavigation;
     navigationClient.didReceiveAuthenticationChallenge = didReceiveAuthenticationChallenge;
     WKPageSetPageNavigationClient(page, &navigationClient.base);
@@ -360 +362 @@
 }
 
+void WebKitBrowserWindow::didFailProvisionalNavigation(WKPageRef page, WKNavigationRef navigation, WKErrorRef error, WKTypeRef userData, const void* clientInfo)
+{
+    auto& thisWindow = toWebKitBrowserWindow(clientInfo);
+    std::wstringstream text;
+    text << createString(adoptWK(WKErrorCopyLocalizedDescription(error)).get()) << std::endl;
+    text << L"Error Code: " << WKErrorGetErrorCode(error) << std::endl;
+    text << L"Domain: " << createString(adoptWK(WKErrorCopyDomain(error)).get()) << std::endl;
+    text << L"Failing URL: " << createString(adoptWK(WKErrorCopyFailingURL(error)).get());
+    MessageBox(thisWindow.m_hMainWnd, text.str().c_str(), L"Provisional Navigation Failure", MB_OK | MB_ICONWARNING);
+}
+
 void WebKitBrowserWindow::didReceiveAuthenticationChallenge(WKPageRef page, WKAuthenticationChallengeRef challenge, const void* clientInfo)
 {

trunk/Tools/MiniBrowser/win/WebKitBrowserWindow.h

@@ -70 +70 @@
     static void didChangeEstimatedProgress(const void*);
     static void didChangeActiveURL(const void*);
+    static void didFailProvisionalNavigation(WKPageRef, WKNavigationRef, WKErrorRef, WKTypeRef, const void*);
     static void didReceiveAuthenticationChallenge(WKPageRef, WKAuthenticationChallengeRef, const void*);
     static WKPageRef createNewPage(WKPageRef, WKPageConfigurationRef, WKNavigationActionRef, WKWindowFeaturesRef, const void *);