Changeset 97386 in webkit

Timestamp:

Oct 13, 2011, 12:37:57 PM (14 years ago)

Author:

commit-queue@webkit.org

Message:

Revert border radius clips (r95239) for Chromium due to performance issues. Update test expectations to skip border radius clip layout tests.
​https://bugs.webkit.org/show_bug.cgi?id=69844

Patch by Tom Hudson <​tomhudson@google.com> on 2011-10-13
Reviewed by Simon Fraser.

• rendering/RenderLayer.cpp:

(WebCore::RenderLayer::clipToRect): Only process border radius clips #if !PLATFORM(CHROMIUM)

Location:

trunk

Files:

• LayoutTests/platform/chromium/test_expectations.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderLayer.cpp (modified) (5 diffs)

trunk/LayoutTests/platform/chromium/test_expectations.txt

@@ -3499 +3499 @@
 BUGWK65862 MAC DEBUG SLOW : storage/indexeddb/index-cursor.html = PASS
 
+// Performance issues with border radius clipping on Chromium not yet resolved
+BUGCR97716 : fast/clip/overflow-border-radius-composited.html = IMAGE
+BUGCR97716 : fast/clip/overflow-border-radius-fixed-position.html = IMAGE
+BUGCR97716 : fast/clip/overflow-border-radius-transformed.html = IMAGE
+BUGCR97716 : fast/clip/overflow-border-radius-combinations.html = IMAGE
+
 // Caused by r92618
 BUGWK65874 : fast/js/preventExtensions.html = TEXT

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-10-13  Tom Hudson  <tomhudson@google.com>
+
+        Revert border radius clips (r95239) for Chromium due to performance issues. Update test expectations to skip border radius clip layout tests.
+        https://bugs.webkit.org/show_bug.cgi?id=69844
+
+        Reviewed by Simon Fraser.
+
+        * rendering/RenderLayer.cpp:
+        (WebCore::RenderLayer::clipToRect): Only process border radius clips #if !PLATFORM(CHROMIUM)
+
 2011-10-13  Julien Chaffraix  <jchaffraix@webkit.org>
 

trunk/Source/WebCore/rendering/RenderLayer.cpp

@@ -99 +99 @@
 #endif
 
+#if PLATFORM(CHROMIUM)
+// FIXME: border radius clipping triggers too-slow path on Chromium
+// https://bugs.webkit.org/show_bug.cgi?id=69866
+#define DISABLE_ROUNDED_CORNER_CLIPPING
+#endif
+
 #define MIN_INTERSECT_FOR_REVEAL 32
 
@@ -2556 +2562 @@
 }
 
+#ifndef DISABLE_ROUNDED_CORNER_CLIPPING
 static bool inContainingBlockChain(RenderLayer* startLayer, RenderLayer* endLayer)
 {
@@ -2569 +2576 @@
     return false;
 }
+#endif
 
 void RenderLayer::clipToRect(RenderLayer* rootLayer, GraphicsContext* context, const LayoutRect& paintDirtyRect, const ClipRect& clipRect,
@@ -2581 +2589 @@
         return;
 
+#ifndef DISABLE_ROUNDED_CORNER_CLIPPING
     // If the clip rect has been tainted by a border radius, then we have to walk up our layer chain applying the clips from
     // any layers with overflow. The condition for being able to apply these clips is that the overflow object be in our
@@ -2594 +2603 @@
             break;
     }
+#endif
 }