[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198
commit-queue at webkit.org
commit-queue at webkit.org
Mon Feb 21 00:23:43 UTC 2011
The following commit has been merged in the webkit-1.3 branch:
commit 0b49aec0ff66fe61e39753816d3f2fe88cd1610a
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sun Jan 30 20:04:43 2011 +0000
2011-01-30 Jeff Miller <jeffm at apple.com>
Reviewed by Dan Bernstein.
FindController::updateFindIndicator() crashes if selection isn't visible
https://bugs.webkit.org/show_bug.cgi?id=53399
* WebProcess/WebPage/FindController.cpp:
(WebKit::FindController::updateFindIndicator): Return false if ShareableBitmap::createShareable() returns null (typically because the selection rect is empty).
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@77091 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index c459588..daecbb2 100644
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,13 @@
+2011-01-30 Jeff Miller <jeffm at apple.com>
+
+ Reviewed by Dan Bernstein.
+
+ FindController::updateFindIndicator() crashes if selection isn't visible
+ https://bugs.webkit.org/show_bug.cgi?id=53399
+
+ * WebProcess/WebPage/FindController.cpp:
+ (WebKit::FindController::updateFindIndicator): Return false if ShareableBitmap::createShareable() returns null (typically because the selection rect is empty).
+
2011-01-30 Csaba Osztrogonác <ossy at webkit.org>
Unreviewed.
diff --git a/Source/WebKit2/WebProcess/WebPage/FindController.cpp b/Source/WebKit2/WebProcess/WebPage/FindController.cpp
index 98b7a92..5806987 100644
--- a/Source/WebKit2/WebProcess/WebPage/FindController.cpp
+++ b/Source/WebKit2/WebProcess/WebPage/FindController.cpp
@@ -160,6 +160,9 @@ bool FindController::updateFindIndicator(Frame* selectedFrame, bool isShowingOve
// Create a backing store and paint the find indicator text into it.
RefPtr<ShareableBitmap> findIndicatorTextBackingStore = ShareableBitmap::createShareable(selectionRectInWindowCoordinates.size());
+ if (!findIndicatorTextBackingStore)
+ return false;
+
OwnPtr<GraphicsContext> graphicsContext = findIndicatorTextBackingStore->createGraphicsContext();
graphicsContext->translate(-selectionRectInWindowCoordinates.x(), -selectionRectInWindowCoordinates.y());
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list