[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e
aroben at apple.com
aroben at apple.com
Fri Jan 21 15:03:58 UTC 2011
The following commit has been merged in the debian/experimental branch:
commit b128d2f21b963699ff2a876306812b1da70e1435
Author: aroben at apple.com <aroben at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Jan 6 20:48:06 2011 +0000
Make WKViews work on Windows after a crashed web process gets relaunched
Fixes <http://webkit.org/b/52001> Relaunching the web process fails to
revivify WKViews on Windows
Reviewed by Ada Chan.
* UIProcess/win/WebView.cpp:
(WebKit::WebView::didRelaunchProcess): Implemented by porting code from
-[WKView _didRelaunchProcess].
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75184 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 7be479e..f075558 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,5 +1,18 @@
2011-01-06 Adam Roben <aroben at apple.com>
+ Make WKViews work on Windows after a crashed web process gets relaunched
+
+ Fixes <http://webkit.org/b/52001> Relaunching the web process fails to
+ revivify WKViews on Windows
+
+ Reviewed by Ada Chan.
+
+ * UIProcess/win/WebView.cpp:
+ (WebKit::WebView::didRelaunchProcess): Implemented by porting code from
+ -[WKView _didRelaunchProcess].
+
+2011-01-06 Adam Roben <aroben at apple.com>
+
Remove WebView::m_rect
It was only used in the constructor, and wasn't even kept up-to-date as
diff --git a/WebKit2/UIProcess/win/WebView.cpp b/WebKit2/UIProcess/win/WebView.cpp
index dec28fc..4d04c89 100644
--- a/WebKit2/UIProcess/win/WebView.cpp
+++ b/WebKit2/UIProcess/win/WebView.cpp
@@ -578,6 +578,13 @@ void WebView::processDidCrash()
void WebView::didRelaunchProcess()
{
+ RECT clientRect;
+ if (!::GetClientRect(m_window, &clientRect))
+ return;
+
+ m_page->reinitializeWebPage(IntRect(clientRect).size());
+ updateActiveState();
+ m_page->setFocused(::GetFocus() == m_window);
}
void WebView::takeFocus(bool)
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list