Additional nil check from fix for 4040749.

        * khtml/rendering/render_layer.cpp:
        (RenderLayer::updateLayerPosition):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@8820 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index cc4ff0eb4d58c3afcc45c546e3c6cd2a21dd1cf4..dee40aed591dc67c0608f3c85c740deefdcfde97 100644 (file)
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,10 @@
+2005-03-07  Richard Williamson   <rjw@apple.com>
+
+       Additional nil check from fix for 4040749.
+
+        * khtml/rendering/render_layer.cpp:
+        (RenderLayer::updateLayerPosition):
+
 2005-03-07  David Harrison  <harrison@apple.com>
 
         Reviewed by Darin.

diff --git a/WebCore/khtml/rendering/render_layer.cpp b/WebCore/khtml/rendering/render_layer.cpp
index f9843cd9d441b46a13b588aca98ece2b22bc6d79..a72973e6f9642ac3c57851c615e0a242b4e690b5 100644 (file)
--- a/WebCore/khtml/rendering/render_layer.cpp
+++ b/WebCore/khtml/rendering/render_layer.cpp
@@ -212,7 +212,7 @@ void RenderLayer::updateLayerPosition()
     }
     
     // Subtract our parent's scroll offset.
-    if (m_object->isPositioned()) {
+    if (m_object->isPositioned() && enclosingPositionedAncestor()) {
         RenderLayer* positionedParent = enclosingPositionedAncestor();
 
         // For positioned layers, we subtract out the enclosing positioned layer's scroll offset.