Changeset 207372 in webkit

Timestamp:

Oct 15, 2016 1:27:19 AM (8 years ago)

Author:

Antti Koivisto

Message:

100% CPU on homedepot.com page
​https://bugs.webkit.org/show_bug.cgi?id=163452
<rdar://problem/28730708>

Reviewed by Simon Fraser.

Source/WebCore:

The site has a keyframe animation on body. Currently this causes the animation to invalidate the
style of the entire document.

Animations use SyntheticStyleChange to invalidate elements when animation progresses and currently
that causes full subtree invalidation. However animation only ever affect individual elements and
the normal style resolution mechanism should be able to deal with things like inheritance as needed.

Test: fast/animation/animation-style-update-size.html

• dom/Document.cpp:

(WebCore::Document::recalcStyle):

• dom/Document.h:

(WebCore::Document::lastStyleUpdateSizeForTesting):

Testing support.

• style/StyleTreeResolver.cpp:

(WebCore::Style::TreeResolver::resolveElement):

Don't force subtree style resolution for SyntheticStyleChange.

• style/StyleUpdate.h:

(WebCore::Style::Update::size):

• testing/Internals.cpp:

(WebCore::Internals::lastStyleUpdateSize):

• testing/Internals.h:
• testing/Internals.idl:

LayoutTests:

• fast/animation/animation-style-update-size-expected.txt: Added.
• fast/animation/animation-style-update-size.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/animation/animation-style-update-size-expected.txt (added)
• LayoutTests/fast/animation/animation-style-update-size.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/dom/Document.cpp (modified) (1 diff)
• Source/WebCore/dom/Document.h (modified) (2 diffs)
• Source/WebCore/style/StyleTreeResolver.cpp (modified) (1 diff)
• Source/WebCore/style/StyleUpdate.h (modified) (1 diff)
• Source/WebCore/testing/Internals.cpp (modified) (1 diff)
• Source/WebCore/testing/Internals.h (modified) (1 diff)
• Source/WebCore/testing/Internals.idl (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2016-10-14  Antti Koivisto  <antti@apple.com>
+
+        100% CPU on homedepot.com page
+        https://bugs.webkit.org/show_bug.cgi?id=163452
+        <rdar://problem/28730708>
+
+        Reviewed by Simon Fraser.
+
+        * fast/animation/animation-style-update-size-expected.txt: Added.
+        * fast/animation/animation-style-update-size.html: Added.
+
 2016-10-14  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-10-14  Antti Koivisto  <antti@apple.com>
+
+        100% CPU on homedepot.com page
+        https://bugs.webkit.org/show_bug.cgi?id=163452
+        <rdar://problem/28730708>
+
+        Reviewed by Simon Fraser.
+
+        The site has a keyframe animation on body. Currently this causes the animation to invalidate the
+        style of the entire document.
+
+        Animations use SyntheticStyleChange to invalidate elements when animation progresses and currently
+        that causes full subtree invalidation. However animation only ever affect individual elements and
+        the normal style resolution mechanism should be able to deal with things like inheritance as needed.
+
+        Test: fast/animation/animation-style-update-size.html
+
+        * dom/Document.cpp:
+        (WebCore::Document::recalcStyle):
+        * dom/Document.h:
+        (WebCore::Document::lastStyleUpdateSizeForTesting):
+
+            Testing support.
+
+        * style/StyleTreeResolver.cpp:
+        (WebCore::Style::TreeResolver::resolveElement):
+
+            Don't force subtree style resolution for SyntheticStyleChange.
+
+        * style/StyleUpdate.h:
+        (WebCore::Style::Update::size):
+        * testing/Internals.cpp:
+        (WebCore::Internals::lastStyleUpdateSize):
+        * testing/Internals.h:
+        * testing/Internals.idl:
+
 2016-10-14  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/dom/Document.cpp

@@ -1852 +1852 @@
         auto styleUpdate = resolver.resolve(change);
 
+        m_lastStyleUpdateSizeForTesting = styleUpdate ? styleUpdate->size() : 0;
+
         clearNeedsStyleRecalc();
         clearChildNeedsStyleRecalc();

trunk/Source/WebCore/dom/Document.h

@@ -536 +536 @@
     WEBCORE_EXPORT void updateStyleIfNeeded();
     bool needsStyleRecalc() const;
+    unsigned lastStyleUpdateSizeForTesting() const { return m_lastStyleUpdateSizeForTesting; }
 
     WEBCORE_EXPORT void updateLayout();
@@ -1489 +1490 @@
     bool m_closeAfterStyleRecalc;
     bool m_inRenderTreeUpdate { false };
+    unsigned m_lastStyleUpdateSizeForTesting { 0 };
 
     bool m_gotoAnchorNeededAfterStylesheetsLoad;

trunk/Source/WebCore/style/StyleTreeResolver.cpp

@@ -234 +234 @@
     }
 
-    if (update.change != Detach && (parent().change == Force || element.styleChangeType() >= FullStyleChange))
+    if (update.change != Detach && (parent().change == Force || element.styleChangeType() == FullStyleChange))
         update.change = Force;
 

trunk/Source/WebCore/style/StyleUpdate.h

@@ -69 +69 @@
     const Document& document() const { return m_document; }
 
+    unsigned size() const { return m_elements.size() + m_texts.size(); }
+
     void addElement(Element&, Element* parent, ElementUpdate&&);
     void addText(Text&, Element* parent);

trunk/Source/WebCore/testing/Internals.cpp

@@ -2386 +2386 @@
 }
 
+unsigned Internals::lastStyleUpdateSize() const
+{
+    Document* document = contextDocument();
+    if (!document)
+        return 0;
+    return document->lastStyleUpdateSizeForTesting();
+}
+
 void Internals::startTrackingCompositingUpdates(ExceptionCode& ec)
 {

trunk/Source/WebCore/testing/Internals.h

@@ -330 +330 @@
     void startTrackingStyleRecalcs(ExceptionCode&);
     unsigned styleRecalcCount(ExceptionCode&);
+    unsigned lastStyleUpdateSize() const;
 
     void startTrackingCompositingUpdates(ExceptionCode&);

trunk/Source/WebCore/testing/Internals.idl

@@ -328 +328 @@
     [MayThrowLegacyException] void startTrackingStyleRecalcs();
     [MayThrowLegacyException] unsigned long styleRecalcCount();
+    readonly attribute unsigned long lastStyleUpdateSize;
 
     [MayThrowLegacyException] void startTrackingCompositingUpdates();