[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198
jberlin at webkit.org
jberlin at webkit.org
Sun Feb 20 22:47:53 UTC 2011
The following commit has been merged in the webkit-1.3 branch:
commit 5f49caeb2f08669d25b6a062a14afa11a4fbfa98
Author: jberlin at webkit.org <jberlin at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Jan 11 19:40:00 2011 +0000
Fix crash on launch on Windows.
Reviewed by Anders Carlsson and Sam Weinig.
* UIProcess/win/WebView.cpp:
(WebKit::WebView::onSizeEvent):
The drawing area is no longer initialized before the WebView is created and the first
onSize is receieved.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75521 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 3a67c2e..f02777d 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,14 @@
+2011-01-11 Jessie Berlin <jberlin at apple.com>
+
+ Reviewed by Anders Carlsson and Sam Weinig.
+
+ Fix crash on launch on Windows.
+
+ * UIProcess/win/WebView.cpp:
+ (WebKit::WebView::onSizeEvent):
+ The drawing area is no longer initialized before the WebView is created and the first
+ onSize is receieved.
+
2011-01-11 Anders Carlsson <andersca at apple.com>
Reviewed by Dan Bernstein.
diff --git a/WebKit2/UIProcess/win/WebView.cpp b/WebKit2/UIProcess/win/WebView.cpp
index 9fe71a1..831392c 100644
--- a/WebKit2/UIProcess/win/WebView.cpp
+++ b/WebKit2/UIProcess/win/WebView.cpp
@@ -420,7 +420,8 @@ LRESULT WebView::onSizeEvent(HWND, UINT, WPARAM, LPARAM lParam, bool& handled)
int width = LOWORD(lParam);
int height = HIWORD(lParam);
- m_page->drawingArea()->setSize(IntSize(width, height));
+ if (m_page->drawingArea())
+ m_page->drawingArea()->setSize(IntSize(width, height));
handled = true;
return 0;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list