[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
timothy at apple.com
timothy at apple.com
Wed Dec 22 16:01:26 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit b2a521017b3866f2917bbe47e27c79f8c0fa1e9e
Author: timothy at apple.com <timothy at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Nov 17 22:46:34 2010 +0000
Fix a crash when closing the inspected page when the Web Inspector
page was never created.
https://bugs.webkit.org/show_bug.cgi?id=49687
Reviewed by John Sullivan.
* WebProcess/WebCoreSupport/WebInspectorClient.cpp:
(WebKit::WebInspectorClient::sendMessageToFrontend): Null check the Inspector WebPage.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72246 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index a0e682d..d9c7c10 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,15 @@
+2010-11-17 Timothy Hatcher <timothy at apple.com>
+
+ Fix a crash when closing the inspected page when the Web Inspector
+ page was never created.
+
+ https://bugs.webkit.org/show_bug.cgi?id=49687
+
+ Reviewed by John Sullivan.
+
+ * WebProcess/WebCoreSupport/WebInspectorClient.cpp:
+ (WebKit::WebInspectorClient::sendMessageToFrontend): Null check the Inspector WebPage.
+
2010-11-17 Anders Carlsson <andersca at apple.com>
Reviewed by John Sullivan.
diff --git a/WebKit2/WebProcess/WebCoreSupport/WebInspectorClient.cpp b/WebKit2/WebProcess/WebCoreSupport/WebInspectorClient.cpp
index a6d3855..e29723d 100644
--- a/WebKit2/WebProcess/WebCoreSupport/WebInspectorClient.cpp
+++ b/WebKit2/WebProcess/WebCoreSupport/WebInspectorClient.cpp
@@ -74,7 +74,9 @@ void WebInspectorClient::storeSetting(const String&, const String&)
bool WebInspectorClient::sendMessageToFrontend(const String& message)
{
- return doDispatchMessageOnFrontendPage(m_page->inspector()->inspectorPage()->corePage(), message);
+ if (WebPage* inspectorPage = m_page->inspector()->inspectorPage())
+ return doDispatchMessageOnFrontendPage(inspectorPage->corePage(), message);
+ return false;
}
} // namespace WebKit
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list