[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.16-1409-g5afdf4d
eric at webkit.org
eric at webkit.org
Thu Dec 3 13:23:40 UTC 2009
The following commit has been merged in the webkit-1.1 branch:
commit be3a800f2912bde89cc7b029bb805b87def4d8a7
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Oct 30 17:27:52 2009 +0000
2009-10-30 Alexander Pavlov <apavlov at chromium.org>
Reviewed by Timothy Hatcher.
Fix Web Inspector crash on the errors/warnings counter click
RenderObject::createVisiblePosition(const Position& position)
understands "null Positions", so we can construct such a Position manually.
https://bugs.webkit.org/show_bug.cgi?id=30499
* rendering/RenderBox.cpp:
(WebCore::RenderBox::positionForPoint):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50341 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index cee32de..129b691 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2009-10-30 Alexander Pavlov <apavlov at chromium.org>
+
+ Reviewed by Timothy Hatcher.
+
+ Fix Web Inspector crash on the errors/warnings counter click
+
+ RenderObject::createVisiblePosition(const Position& position)
+ understands "null Positions", so we can construct such a Position manually.
+
+ https://bugs.webkit.org/show_bug.cgi?id=30499
+
+ * rendering/RenderBox.cpp:
+ (WebCore::RenderBox::positionForPoint):
+
2009-10-30 Joanmarie Diggs <joanmarie.diggs at gmail.com>
Reviewed by Xan Lopez.
diff --git a/WebCore/rendering/RenderBox.cpp b/WebCore/rendering/RenderBox.cpp
index 1df82a4..ccf0ff9 100644
--- a/WebCore/rendering/RenderBox.cpp
+++ b/WebCore/rendering/RenderBox.cpp
@@ -2695,7 +2695,7 @@ VisiblePosition RenderBox::positionForPoint(const IntPoint& point)
{
// no children...return this render object's element, if there is one, and offset 0
if (!firstChild())
- return createVisiblePosition(firstDeepEditingPositionForNode(node()));
+ return createVisiblePosition(node() ? firstDeepEditingPositionForNode(node()) : Position(0, 0));
int xPos = point.x();
int yPos = point.y();
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list