[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
aroben at apple.com
aroben at apple.com
Wed Dec 22 15:28:33 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit a9d2eb8a0bedf0a492abfa763c966b9fabb9f1b3
Author: aroben at apple.com <aroben at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Nov 4 12:39:38 2010 +0000
Remove lame puts()s from WebPageProxy
Rubber-stamped by Anders Carlsson.
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::loadURL):
(WebKit::WebPageProxy::loadURLRequest):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71327 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 148478f..b95676d 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,13 @@
+2010-11-04 Adam Roben <aroben at apple.com>
+
+ Remove lame puts()s from WebPageProxy
+
+ Rubber-stamped by Anders Carlsson.
+
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::loadURL):
+ (WebKit::WebPageProxy::loadURLRequest):
+
2010-11-03 Alice Liu <alice.liu at apple.com>
Fix clang++ build
diff --git a/WebKit2/UIProcess/WebPageProxy.cpp b/WebKit2/UIProcess/WebPageProxy.cpp
index 23a6489..4549803 100644
--- a/WebKit2/UIProcess/WebPageProxy.cpp
+++ b/WebKit2/UIProcess/WebPageProxy.cpp
@@ -251,20 +251,16 @@ bool WebPageProxy::tryClose()
void WebPageProxy::loadURL(const String& url)
{
- if (!isValid()) {
- puts("loadURL called with a dead WebProcess");
+ if (!isValid())
relaunch();
- }
process()->send(Messages::WebPage::LoadURL(url), m_pageID);
}
void WebPageProxy::loadURLRequest(WebURLRequest* urlRequest)
{
- if (!isValid()) {
- puts("loadURLRequest called with a dead WebProcess");
+ if (!isValid())
relaunch();
- }
process()->send(Messages::WebPage::LoadURLRequest(urlRequest->resourceRequest()), m_pageID);
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list