Changeset 154430 in webkit

Timestamp:

Aug 21, 2013 5:15:08 PM (11 years ago)

Author:

Simon Fraser

Message:

Setting -webkit-filter: in :active selector causes failure to redraw
​https://bugs.webkit.org/show_bug.cgi?id=120135

Source/WebCore:

Reviewed by Jer Noble.

When removing a filter on an inline child of a compositing layer,
the inline loses its RenderLayer and compositing layer, but we fail to
repaint the compositing layer that the inline is now painting into.

This worked correctly for opacity, because opacity toggles cause
layouts (which then paint the correct layer), so do the same for filters.

Test: css3/filters/remove-filter-repaint.html

• rendering/style/RenderStyle.cpp:

(WebCore::RenderStyle::changeRequiresLayout): Return true if we toggled
between having filters and not. Drive-by cleanup, making use of new convenience
function for hasOpacity().

• rendering/style/StyleRareNonInheritedData.cpp:

(WebCore::StyleRareNonInheritedData::hasFilters): Returns true if we have any
filters.

• rendering/style/StyleRareNonInheritedData.h:

(WebCore::StyleRareNonInheritedData::hasOpacity): Convenience function that
returns true if opacity is < 1.

LayoutTests:

Reviewed by Jer Noble.

Ref test for removing a filter on an inline.

• css3/filters/remove-filter-repaint-expected.html: Added.
• css3/filters/remove-filter-repaint.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/css3/filters/remove-filter-repaint-expected.html (added)
• LayoutTests/css3/filters/remove-filter-repaint.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/style/RenderStyle.cpp (modified) (2 diffs)
• Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp (modified) (1 diff)
• Source/WebCore/rendering/style/StyleRareNonInheritedData.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-08-21  Simon Fraser  <simon.fraser@apple.com>
+
+        Setting -webkit-filter: in :active selector causes failure to redraw
+        https://bugs.webkit.org/show_bug.cgi?id=120135
+
+        Reviewed by Jer Noble.
+        
+        Ref test for removing a filter on an inline.
+
+        * css3/filters/remove-filter-repaint-expected.html: Added.
+        * css3/filters/remove-filter-repaint.html: Added.
+
 2013-08-21  Yi Shen  <max.hong.shen@gmail.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-08-21  Simon Fraser  <simon.fraser@apple.com>
+
+        Setting -webkit-filter: in :active selector causes failure to redraw
+        https://bugs.webkit.org/show_bug.cgi?id=120135
+
+        Reviewed by Jer Noble.
+        
+        When removing a filter on an inline child of a compositing layer,
+        the inline loses its RenderLayer and compositing layer, but we fail to
+        repaint the compositing layer that the inline is now painting into.
+        
+        This worked correctly for opacity, because opacity toggles cause
+        layouts (which then paint the correct layer), so do the same for filters.
+
+        Test: css3/filters/remove-filter-repaint.html
+
+        * rendering/style/RenderStyle.cpp:
+        (WebCore::RenderStyle::changeRequiresLayout): Return true if we toggled
+        between having filters and not. Drive-by cleanup, making use of new convenience
+        function for hasOpacity().
+        * rendering/style/StyleRareNonInheritedData.cpp:
+        (WebCore::StyleRareNonInheritedData::hasFilters): Returns true if we have any
+        filters.
+        * rendering/style/StyleRareNonInheritedData.h:
+        (WebCore::StyleRareNonInheritedData::hasOpacity): Convenience function that
+        returns true if opacity is < 1.
+
 2013-08-21  Gavin Barraclough  <barraclough@apple.com>
 

trunk/Source/WebCore/rendering/style/RenderStyle.cpp

@@ -598 +598 @@
         return true;
 
-    if ((rareNonInheritedData->opacity == 1 && other->rareNonInheritedData->opacity < 1)
-        || (rareNonInheritedData->opacity < 1 && other->rareNonInheritedData->opacity == 1)) {
+    if (rareNonInheritedData->hasOpacity() != other->rareNonInheritedData->hasOpacity()) {
         // FIXME: We would like to use SimplifiedLayout here, but we can't quite do that yet.
         // We need to make sure SimplifiedLayout can operate correctly on RenderInlines (we will need
@@ -607 +606 @@
         return true;
     }
+
+#if ENABLE(CSS_FILTERS)
+    if (rareNonInheritedData->hasFilters() != other->rareNonInheritedData->hasFilters())
+        return true;
+#endif
 
     const QuotesData* quotesDataA = rareInheritedData->quotes.get();

trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp

@@ -327 +327 @@
 }
 
+bool StyleRareNonInheritedData::hasFilters() const
+{
+    return m_filter.get() && !m_filter->m_operations.isEmpty();
+}
+
 } // namespace WebCore

trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.h

@@ -91 +91 @@
     bool animationDataEquivalent(const StyleRareNonInheritedData&) const;
     bool transitionDataEquivalent(const StyleRareNonInheritedData&) const;
-
-    float opacity; // Whether or not we're transparent.
+    bool hasFilters() const;
+    bool hasOpacity() const { return opacity < 1; }
+
+    float opacity;
 
     float m_aspectRatioDenominator;