[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
andersca at apple.com
andersca at apple.com
Wed Dec 22 16:00:57 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 51b226f6bd4f872930ee2eb782e65c02fc96182c
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Nov 17 21:57:32 2010 +0000
Don't crash when invalidating a page overlay that hasn't been installed yet
https://bugs.webkit.org/show_bug.cgi?id=49685
Reviewed by John Sullivan.
Null check the web page.
* WebProcess/WebPage/PageOverlay.cpp:
(WebKit::PageOverlay::setNeedsDisplay):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72241 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 0358cb4..a0e682d 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,15 @@
+2010-11-17 Anders Carlsson <andersca at apple.com>
+
+ Reviewed by John Sullivan.
+
+ Don't crash when invalidating a page overlay that hasn't been installed yet
+ https://bugs.webkit.org/show_bug.cgi?id=49685
+
+ Null check the web page.
+
+ * WebProcess/WebPage/PageOverlay.cpp:
+ (WebKit::PageOverlay::setNeedsDisplay):
+
2010-11-17 Brady Eidson <beidson at apple.com>
Reviewed by Darin Adler.
diff --git a/WebKit2/WebProcess/WebPage/PageOverlay.cpp b/WebKit2/WebProcess/WebPage/PageOverlay.cpp
index 7e7d286..cc785fc 100644
--- a/WebKit2/WebProcess/WebPage/PageOverlay.cpp
+++ b/WebKit2/WebProcess/WebPage/PageOverlay.cpp
@@ -72,7 +72,8 @@ void PageOverlay::setPage(WebPage* webPage)
void PageOverlay::setNeedsDisplay(const WebCore::IntRect& dirtyRect)
{
- m_webPage->drawingArea()->setNeedsDisplay(dirtyRect);
+ if (m_webPage)
+ m_webPage->drawingArea()->setNeedsDisplay(dirtyRect);
}
void PageOverlay::setNeedsDisplay()
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list