Title: [120133] trunk/Tools
- Revision
- 120133
- Author
- [email protected]
- Date
- 2012-06-12 15:47:56 -0700 (Tue, 12 Jun 2012)
Log Message
WinLauncher should show loading errors
https://bugs.webkit.org/show_bug.cgi?id=80760
Patch by Ashod Nakashian <[email protected]> on 2012-06-12
Reviewed by Brent Fulgham.
* WinLauncher/WinLauncher.cpp: Added load-fail handler to show messagebox with error.
(WinLauncherWebHost::didFailProvisionalLoadWithError):
* WinLauncher/WinLauncher.h:
(WinLauncherWebHost::didFailProvisionalLoadWithError):
(WinLauncherWebHost):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (120132 => 120133)
--- trunk/Tools/ChangeLog 2012-06-12 22:39:01 UTC (rev 120132)
+++ trunk/Tools/ChangeLog 2012-06-12 22:47:56 UTC (rev 120133)
@@ -1,3 +1,16 @@
+2012-06-12 Ashod Nakashian <[email protected]>
+
+ WinLauncher should show loading errors
+ https://bugs.webkit.org/show_bug.cgi?id=80760
+
+ Reviewed by Brent Fulgham.
+
+ * WinLauncher/WinLauncher.cpp: Added load-fail handler to show messagebox with error.
+ (WinLauncherWebHost::didFailProvisionalLoadWithError):
+ * WinLauncher/WinLauncher.h:
+ (WinLauncherWebHost::didFailProvisionalLoadWithError):
+ (WinLauncherWebHost):
+
2012-06-12 Ryuan Choi <[email protected]>
[EFL][WK2] Add MiniBrowserEfl.
Modified: trunk/Tools/WinLauncher/WinLauncher.cpp (120132 => 120133)
--- trunk/Tools/WinLauncher/WinLauncher.cpp 2012-06-12 22:39:01 UTC (rev 120132)
+++ trunk/Tools/WinLauncher/WinLauncher.cpp 2012-06-12 22:47:56 UTC (rev 120133)
@@ -142,6 +142,20 @@
return 0;
}
+HRESULT STDMETHODCALLTYPE WinLauncherWebHost::didFailProvisionalLoadWithError(IWebView*, IWebError *error, IWebFrame*)
+{
+ BSTR errorDescription = 0;
+ HRESULT hr = error->localizedDescription(&errorDescription);
+ if (FAILED(hr))
+ errorDescription = L"Failed to load page and to localize error description.";
+
+ ::MessageBoxW(0, static_cast<LPCWSTR>(errorDescription), L"Error", MB_APPLMODAL | MB_OK);
+ if (SUCCEEDED(hr))
+ SysFreeString(errorDescription);
+
+ return S_OK;
+}
+
HRESULT STDMETHODCALLTYPE WinLauncherWebHost::QueryInterface(REFIID riid, void** ppvObject)
{
*ppvObject = 0;
Modified: trunk/Tools/WinLauncher/WinLauncher.h (120132 => 120133)
--- trunk/Tools/WinLauncher/WinLauncher.h 2012-06-12 22:39:01 UTC (rev 120132)
+++ trunk/Tools/WinLauncher/WinLauncher.h 2012-06-12 22:47:56 UTC (rev 120133)
@@ -50,7 +50,7 @@
virtual HRESULT STDMETHODCALLTYPE didFailProvisionalLoadWithError(
/* [in] */ IWebView *webView,
/* [in] */ IWebError *error,
- /* [in] */ IWebFrame *frame) { return S_OK; }
+ /* [in] */ IWebFrame*);
virtual HRESULT STDMETHODCALLTYPE didCommitLoadForFrame(
/* [in] */ IWebView *webView,
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
