Changeset 195088 in webkit

Timestamp:

Jan 14, 2016 7:31:52 PM (8 years ago)

Author:

mmaxfield@apple.com

Message:

Mixing Content Blocking of fonts and display:none rules causes battery drain
​https://bugs.webkit.org/show_bug.cgi?id=153051
<rdar://problem/23187709>

Reviewed by Alex Christensen.

Source/WebCore:

If we have applied a rule before and we are not applying it again, don't
resolve the style again.

Test: http/tests/contentextensions/font-display-none-repeated-layout.html

• contentextensions/ContentExtensionStyleSheet.cpp:

(WebCore::ContentExtensions::ContentExtensionStyleSheet::addDisplayNoneSelector):

• contentextensions/ContentExtensionStyleSheet.h:
• dom/ExtensionStyleSheets.cpp:

(WebCore::ExtensionStyleSheets::addDisplayNoneSelector):

LayoutTests:

Make sure that layoutCount does not skyrocket.

• http/tests/contentextensions/font-display-none-repeated-layout-expected.txt: Added.
• http/tests/contentextensions/font-display-none-repeated-layout.html: Added.
• http/tests/contentextensions/font-display-none-repeated-layout.html.json: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/tests/contentextensions/font-display-none-repeated-layout-expected.txt (added)
• LayoutTests/http/tests/contentextensions/font-display-none-repeated-layout.html (added)
• LayoutTests/http/tests/contentextensions/font-display-none-repeated-layout.html.json (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/contentextensions/ContentExtensionStyleSheet.cpp (modified) (2 diffs)
• Source/WebCore/contentextensions/ContentExtensionStyleSheet.h (modified) (1 diff)
• Source/WebCore/dom/ExtensionStyleSheets.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2016-01-14  Myles C. Maxfield  <mmaxfield@apple.com>
+
+        Mixing Content Blocking of fonts and display:none rules causes battery drain
+        https://bugs.webkit.org/show_bug.cgi?id=153051
+        <rdar://problem/23187709>
+
+        Reviewed by Alex Christensen.
+
+        Make sure that layoutCount does not skyrocket.
+
+        * http/tests/contentextensions/font-display-none-repeated-layout-expected.txt: Added.
+        * http/tests/contentextensions/font-display-none-repeated-layout.html: Added.
+        * http/tests/contentextensions/font-display-none-repeated-layout.html.json: Added.
+
 2016-01-14  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-01-14  Myles C. Maxfield  <mmaxfield@apple.com>
+
+        Mixing Content Blocking of fonts and display:none rules causes battery drain
+        https://bugs.webkit.org/show_bug.cgi?id=153051
+        <rdar://problem/23187709>
+
+        Reviewed by Alex Christensen.
+
+        If we have applied a rule before and we are not applying it again, don't
+        resolve the style again.
+
+        Test: http/tests/contentextensions/font-display-none-repeated-layout.html
+
+        * contentextensions/ContentExtensionStyleSheet.cpp:
+        (WebCore::ContentExtensions::ContentExtensionStyleSheet::addDisplayNoneSelector):
+        * contentextensions/ContentExtensionStyleSheet.h:
+        * dom/ExtensionStyleSheets.cpp:
+        (WebCore::ExtensionStyleSheets::addDisplayNoneSelector):
+
 2016-01-14  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Source/WebCore/contentextensions/ContentExtensionStyleSheet.cpp

@@ -44 +44 @@
 }
 
-void ContentExtensionStyleSheet::addDisplayNoneSelector(const String& selector, uint32_t selectorID)
+bool ContentExtensionStyleSheet::addDisplayNoneSelector(const String& selector, uint32_t selectorID)
 {
     ASSERT(selectorID != std::numeric_limits<uint32_t>::max());
 
     if (!m_addedSelectorIDs.add(selectorID).isNewEntry)
-        return;
+        return false;
 
     StringBuilder css;
@@ -57 +57 @@
     css.append('}');
     m_styleSheet->contents().parseString(css.toString());
+    return true;
 }
 

trunk/Source/WebCore/contentextensions/ContentExtensionStyleSheet.h

@@ -47 +47 @@
     }
 
-    void addDisplayNoneSelector(const String& selector, uint32_t selectorID);
+    bool addDisplayNoneSelector(const String& selector, uint32_t selectorID);
 
     CSSStyleSheet& styleSheet() { return m_styleSheet.get(); }

trunk/Source/WebCore/dom/ExtensionStyleSheets.cpp

@@ -180 +180 @@
     }
 
-    result.iterator->value->addDisplayNoneSelector(selector, selectorID);
-    m_styleResolverChangedTimer.startOneShot(0);
+    if (result.iterator->value->addDisplayNoneSelector(selector, selectorID))
+        m_styleResolverChangedTimer.startOneShot(0);
 }