[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
darin
darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 07:32:42 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 42d8fdbd3fb4bbfa50453bc5361c3c18f6d9a414
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Mar 31 22:31:16 2003 +0000
Reviewed by Chris.
- fixed 3213093 -- REGRESSION: crash accessing menu items right after launch with about:blank as homepage
* khtml/khtmlview.cpp: (KHTMLView::viewportMouseMoveEvent):
Another place needed a check for null.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3974 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 6ace94d..c4e8cfe 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,12 @@
+2003-03-31 Darin Adler <darin at apple.com>
+
+ Reviewed by Chris.
+
+ - fixed 3213093 -- REGRESSION: crash accessing menu items right after launch with about:blank as homepage
+
+ * khtml/khtmlview.cpp: (KHTMLView::viewportMouseMoveEvent):
+ Another place needed a check for null.
+
2003-03-31 David Hyatt <hyatt at apple.com>
Fix for 3211849. I accidentally removed a BORDER_COLOR case
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 6ace94d..c4e8cfe 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,12 @@
+2003-03-31 Darin Adler <darin at apple.com>
+
+ Reviewed by Chris.
+
+ - fixed 3213093 -- REGRESSION: crash accessing menu items right after launch with about:blank as homepage
+
+ * khtml/khtmlview.cpp: (KHTMLView::viewportMouseMoveEvent):
+ Another place needed a check for null.
+
2003-03-31 David Hyatt <hyatt at apple.com>
Fix for 3211849. I accidentally removed a BORDER_COLOR case
diff --git a/WebCore/khtml/khtmlview.cpp b/WebCore/khtml/khtmlview.cpp
index c62e48f..f6618b0 100644
--- a/WebCore/khtml/khtmlview.cpp
+++ b/WebCore/khtml/khtmlview.cpp
@@ -605,8 +605,9 @@ void KHTMLView::viewportMouseMoveEvent( QMouseEvent * _mouse )
else if ( (mev.url.length() || isSubmitImage(mev.innerNode.handle()))
&& m_part->settings()->changeCursor() )
c = m_part->urlCursor();
- else if ( mev.innerNode.nodeType() == Node::TEXT_NODE
- || mev.innerNode.nodeType() == Node::CDATA_SECTION_NODE )
+ else if ( !mev.innerNode.isNull()
+ && (mev.innerNode.nodeType() == Node::TEXT_NODE
+ || mev.innerNode.nodeType() == Node::CDATA_SECTION_NODE) )
c = KCursor::ibeamCursor();
break;
case CURSOR_CROSS:
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list