Changeset 26865 in webkit

Timestamp:

Oct 22, 2007 12:31:01 AM (17 years ago)

Author:

hyatt

Message:

Fix for 15596, regression from my transform changes. Preserve null checks on the clip rects calls for parent(),
since the method is called on orphaned layers. This is not very well understood.

Reviewed by eric

• rendering/RenderLayer.cpp: (WebCore::RenderLayer::calculateClipRects): (WebCore::RenderLayer::calculateRects):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderLayer.cpp (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-10-22  David Hyatt  <hyatt@apple.com>
+
+        Fix for 15596, regression from my transform changes.  Preserve null checks on the clip rects calls for parent(),
+        since the method is called on orphaned layers.  This is not very well understood.
+
+        Reviewed by eric
+
+        * rendering/RenderLayer.cpp:
+        (WebCore::RenderLayer::calculateClipRects):
+        (WebCore::RenderLayer::calculateRects):
+
 2007-10-21  Mark Rowe  <mrowe@apple.com>
 

trunk/WebCore/rendering/RenderLayer.cpp

@@ -1742 +1742 @@
         return; // We have the correct cached value.
 
-    if (rootLayer == this) {
+    if (rootLayer == this || !parent()) {
         // The root layer's clip rect is always just its dimensions.
         m_clipRects = new (m_object->renderArena()) ClipRects(IntRect(0,0,width(),height()));
@@ -1812 +1812 @@
                                  IntRect& backgroundRect, IntRect& foregroundRect, IntRect& outlineRect) const
 {
-    if (rootLayer != this) {
+    if (rootLayer != this && parent()) {
         parent()->calculateClipRects(rootLayer);