[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[hyatt]

The following commit has been merged in the debian/unstable branch:
commit cfe1a3e7a0bee1d8784f2f71a0e6e7a56f387637
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Sep 25 00:00:28 2003 +0000

    	Fix for 3430612, crash on about:blank in updateHoverActiveState.  Just missing
    	a null-check.  Also remove a hover optimization that was bogus.
    
            Reviewed by darin
    
            * khtml/rendering/render_layer.cpp:
            (RenderLayer::updateHoverActiveState):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5047 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 6de3845..09f7e8b 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,13 @@
+2003-09-24  David Hyatt  <hyatt at apple.com>
+
+	Fix for 3430612, crash on about:blank in updateHoverActiveState.  Just missing
+	a null-check.  Also remove a hover optimization that was bogus.
+	
+        Reviewed by darin
+
+        * khtml/rendering/render_layer.cpp:
+        (RenderLayer::updateHoverActiveState):
+
 2003-09-24  Richard Williamson   <rjw at apple.com>
 
 	Fixed 3420736.  Clear renderer caches when get an ATS font changed notification.  This fix may be moot depending on progress toward fixing 2695906.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 6de3845..09f7e8b 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,13 @@
+2003-09-24  David Hyatt  <hyatt at apple.com>
+
+	Fix for 3430612, crash on about:blank in updateHoverActiveState.  Just missing
+	a null-check.  Also remove a hover optimization that was bogus.
+	
+        Reviewed by darin
+
+        * khtml/rendering/render_layer.cpp:
+        (RenderLayer::updateHoverActiveState):
+
 2003-09-24  Richard Williamson   <rjw at apple.com>
 
 	Fixed 3420736.  Clear renderer caches when get an ATS font changed notification.  This fix may be moot depending on progress toward fixing 2695906.
diff --git a/WebCore/khtml/rendering/render_layer.cpp b/WebCore/khtml/rendering/render_layer.cpp
index 05b35c7..6ce9152 100644
--- a/WebCore/khtml/rendering/render_layer.cpp
+++ b/WebCore/khtml/rendering/render_layer.cpp
@@ -897,23 +897,21 @@ void RenderLayer::updateHoverActiveState(RenderObject::NodeInfo& info)
     // We don't update :hover/:active state when the info is marked as readonly.
     if (info.readonly())
         return;
-    
+
     // Check to see if the hovered node has changed.  If not, then we don't need to
     // do anything.  An exception is if we just went from :hover into :hover:active,
     // in which case we need to update to get the new :active state.
     DOM::DocumentImpl* doc = renderer()->document();
     DOM::NodeImpl* oldHoverNode = doc ? doc->hoverNode() : 0;
     DOM::NodeImpl* newHoverNode = info.innerNode();
-        
-    if (oldHoverNode == newHoverNode && (!oldHoverNode || oldHoverNode->active() == info.active()))
-        return;
 
     // Update our current hover node.
-    info.innerNode()->getDocument()->setHoverNode(newHoverNode);
-    
+    if (doc)
+        doc->setHoverNode(newHoverNode);
+
     // We have two different objects.  Fetch their renderers.
     RenderObject* oldHoverObj = oldHoverNode ? oldHoverNode->renderer() : 0;
-    RenderObject* newHoverObj = info.innerNode() ? info.innerNode()->renderer() : 0;
+    RenderObject* newHoverObj = newHoverNode ? newHoverNode->renderer() : 0;
     
     // Locate the common ancestor render object for the two renderers.
     RenderObject* ancestor = commonAncestor(oldHoverObj, newHoverObj);

-- 
WebKit Debian packaging