Changeset 18491 in webkit

Timestamp:

Dec 31, 2006 6:25:57 AM (17 years ago)

Author:

ddkilzer

Message:

LayoutTests:

Reviewed by Hyatt. Tweaked by Mitz.

• test for ​http://bugs.webkit.org/show_bug.cgi?id=9659 Quirksmode: Fixed / Overflow > Positioned objects get hidden when scrolling

• fast/overflow/clip-rects-fixed-ancestor-expected.checksum: Added.
• fast/overflow/clip-rects-fixed-ancestor-expected.png: Added.
• fast/overflow/clip-rects-fixed-ancestor-expected.txt: Added.
• fast/overflow/clip-rects-fixed-ancestor.html: Added.

WebCore:

Reviewed by Hyatt.

• fix ​http://bugs.webkit.org/show_bug.cgi?id=9659 Quirksmode: Fixed / Overflow > Positioned objects get hidden when scrolling

Added a 'fixed' flag to ClipRects, indicating that the cached rects are in
viewport coordinates. The flag is set (and scrolling is compensated for) for
fixed objects and their descendants.

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

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/overflow/clip-rects-fixed-ancestor-expected.checksum (added)
• LayoutTests/fast/overflow/clip-rects-fixed-ancestor-expected.png (added)
• LayoutTests/fast/overflow/clip-rects-fixed-ancestor-expected.txt (added)
• LayoutTests/fast/overflow/clip-rects-fixed-ancestor.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/rendering/RenderLayer.cpp (modified) (5 diffs)
• WebCore/rendering/RenderLayer.h (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2006-12-31  Chris McLay  <chris@eeoh.com.au>
+
+        Reviewed by Hyatt. Tweaked by Mitz.
+
+        - test for http://bugs.webkit.org/show_bug.cgi?id=9659
+          Quirksmode: Fixed / Overflow > Positioned objects get hidden when scrolling
+
+        * fast/overflow/clip-rects-fixed-ancestor-expected.checksum: Added.
+        * fast/overflow/clip-rects-fixed-ancestor-expected.png: Added.
+        * fast/overflow/clip-rects-fixed-ancestor-expected.txt: Added.
+        * fast/overflow/clip-rects-fixed-ancestor.html: Added.
+
 2006-12-31  Mitz Pettel  <mitz@webkit.org>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2006-12-31  Mitz Pettel  <mitz@webkit.org>
+
+        Reviewed by Hyatt.
+
+        - fix http://bugs.webkit.org/show_bug.cgi?id=9659
+          Quirksmode: Fixed / Overflow > Positioned objects get hidden when scrolling
+
+        Added a 'fixed' flag to ClipRects, indicating that the cached rects are in
+        viewport coordinates. The flag is set (and scrolling is compensated for) for
+        fixed objects and their descendants.
+
+        * rendering/RenderLayer.cpp:
+        (WebCore::RenderLayer::calculateClipRects):
+        (WebCore::RenderLayer::calculateRects):
+        * rendering/RenderLayer.h:
+        (WebCore::ClipRects::ClipRects):
+        (WebCore::ClipRects::fixed):
+
 2006-12-31  Mitz Pettel  <mitz@webkit.org>
 

trunk/WebCore/rendering/RenderLayer.cpp

@@ -1616 +1616 @@
     IntRect overflowClipRect(parent()->clipRects()->overflowClipRect());
     IntRect fixedClipRect(parent()->clipRects()->fixedClipRect());
+    bool fixed = parent()->clipRects()->fixed();
 
     // A fixed object is essentially the root of its containing block hierarchy, so when
@@ -1622 +1623 @@
         posClipRect = fixedClipRect;
         overflowClipRect = fixedClipRect;
+        fixed = true;
     }
     else if (m_object->style()->position() == RelativePosition)
@@ -1634 +1636 @@
         int y = 0;
         convertToLayerCoords(rootLayer, x, y);
+        if (fixed) {
+            x -= renderer()->view()->frameView()->contentsX();
+            y -= renderer()->view()->frameView()->contentsY();
+        }
         
         if (m_object->hasOverflowClip()) {
@@ -1651 +1657 @@
     // If our clip rects match our parent's clip, then we can just share its data structure and
     // ref count.
-    if (posClipRect == parent()->clipRects()->posClipRect() &&
+    if (fixed == parent()->clipRects()->fixed() &&
+        posClipRect == parent()->clipRects()->posClipRect() &&
         overflowClipRect == parent()->clipRects()->overflowClipRect() &&
         fixedClipRect == parent()->clipRects()->fixedClipRect())
         m_clipRects = parent()->clipRects();
     else
-        m_clipRects = new (m_object->renderArena()) ClipRects(overflowClipRect, fixedClipRect, posClipRect);
+        m_clipRects = new (m_object->renderArena()) ClipRects(overflowClipRect, fixedClipRect, posClipRect, fixed);
     m_clipRects->ref();
 }
@@ -1665 +1672 @@
     if (parent()) {
         parent()->calculateClipRects(rootLayer);
+
         backgroundRect = m_object->style()->position() == FixedPosition ? parent()->clipRects()->fixedClipRect() :
                          (m_object->isPositioned() ? parent()->clipRects()->posClipRect() : 
                                                      parent()->clipRects()->overflowClipRect());
+        if (parent()->clipRects()->fixed())
+            backgroundRect.move(renderer()->view()->frameView()->contentsX(), renderer()->view()->frameView()->contentsY());
+
         backgroundRect.intersect(paintDirtyRect);
     } else

trunk/WebCore/rendering/RenderLayer.h

@@ -71 +71 @@
         , m_posClipRect(r)
         , m_refCnt(0)
+        , m_fixed(false)
     {
     }
 
-    ClipRects(const IntRect& o, const IntRect& f, const IntRect& p)
-        : m_overflowClipRect(o)
-        , m_fixedClipRect(f)
-        , m_posClipRect(p)
+    ClipRects(const IntRect& overflowRect, const IntRect& fixedRect, const IntRect& posRect, bool fixed)
+        : m_overflowClipRect(overflowRect)
+        , m_fixedClipRect(fixedRect)
+        , m_posClipRect(posRect)
         , m_refCnt(0)
+        , m_fixed(fixed)
     {
     }
@@ -85 +87 @@
     const IntRect& fixedClipRect() { return m_fixedClipRect; }
     const IntRect& posClipRect() { return m_posClipRect; }
+    bool fixed() const { return m_fixed; }
 
     void ref() { m_refCnt++; }
@@ -105 +108 @@
     IntRect m_fixedClipRect;
     IntRect m_posClipRect;
-    unsigned m_refCnt;
+    unsigned m_refCnt : 31;
+    bool m_fixed : 1;
 };