Changeset 95567 in webkit

Timestamp:

Sep 20, 2011 1:26:13 PM (13 years ago)

Author:

hyatt@apple.com

Message:

Source/WebCore: ​https://bugs.webkit.org/show_bug.cgi?id=68314

Make sure that the containing block loop when clipping to border-radius
terminates by checking if you hit the RenderView. Null checking isn't sufficient
for stupid historical reasons that should be fixed (i.e., the RenderView returns itself
as its own containing block, even though this should just be changed).

Reviewed by Simon Fraser and Darin Adler.

Added new test in fast/clip.

• rendering/RenderLayer.cpp:

(WebCore::inContainingBlockChain):

LayoutTests: ​https://bugs.webkit.org/show_bug.cgi?id=68314

Added some more clipping tests for overflow to make sure the right things happen
when border-radius is specified.

Reviewed by Simon Fraser and Darin Adler.

• fast/clip/overflow-border-radius-fixed-position.html: Added.
• platform/mac/fast/clip/overflow-border-radius-fixed-position-expected.png: Added.
• platform/mac/fast/clip/overflow-border-radius-fixed-position-expected.txt: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/clip/overflow-border-radius-fixed-position.html (added)
• LayoutTests/platform/mac/fast/clip/overflow-border-radius-fixed-position-expected.png (added)
• LayoutTests/platform/mac/fast/clip/overflow-border-radius-fixed-position-expected.txt (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderLayer.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-09-20  David Hyatt  <hyatt@apple.com>
+
+        https://bugs.webkit.org/show_bug.cgi?id=68314
+        
+        Added some more clipping tests for overflow to make sure the right things happen
+        when border-radius is specified.
+
+        Reviewed by Simon Fraser and Darin Adler.
+
+        * fast/clip/overflow-border-radius-fixed-position.html: Added.
+        * platform/mac/fast/clip/overflow-border-radius-fixed-position-expected.png: Added.
+        * platform/mac/fast/clip/overflow-border-radius-fixed-position-expected.txt: Added.
+
 2011-09-20  Dan Bernstein  <mitz@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-09-20  David Hyatt  <hyatt@apple.com>
+
+        https://bugs.webkit.org/show_bug.cgi?id=68314
+
+        Make sure that the containing block loop when clipping to border-radius
+        terminates by checking if you hit the RenderView. Null checking isn't sufficient
+        for stupid historical reasons that should be fixed (i.e., the RenderView returns itself
+        as its own containing block, even though this should just be changed).
+
+        Reviewed by Simon Fraser and Darin Adler.
+
+        Added new test in fast/clip.
+
+        * rendering/RenderLayer.cpp:
+        (WebCore::inContainingBlockChain):
+
 2011-09-20  Dan Bernstein  <mitz@apple.com>
 

trunk/Source/WebCore/rendering/RenderLayer.cpp

@@ -2560 +2560 @@
         return true;
     
-    for (RenderBlock* currentBlock = startLayer->renderer()->containingBlock(); currentBlock; currentBlock = currentBlock->containingBlock()) {
+    RenderView* view = startLayer->renderer()->view();
+    for (RenderBlock* currentBlock = startLayer->renderer()->containingBlock(); currentBlock && currentBlock != view; currentBlock = currentBlock->containingBlock()) {
         if (currentBlock->layer() == endLayer)
             return true;