Changeset 206230 in webkit

Timestamp:

Sep 21, 2016, 12:59:47 PM (8 years ago)

Author:

Antti Koivisto

Message:

Document::styleResolverChanged simplification
​https://bugs.webkit.org/show_bug.cgi?id=162347

Reviewed by Anders Carlsson.

• dom/Document.cpp:

(WebCore::Document::implicitClose):
(WebCore::Document::setParsing):
(WebCore::Document::write):
(WebCore::Document::styleResolverChanged):

• Remove unncessary AnimationUpdateBlock, it is created by recalcStyle.
• Remove explicit setNeedsLayoutAndPrefWidthsRecalc/scheduleRelayout calls, style resolution invalidates those as needed.
• Remove evaluateMediaQueryList call, that is done on layout as needed.
• Remove the ancient INSTRUMENT_LAYOUT_SCHEDULING and the related printfs.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/Document.cpp (modified) (7 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-09-21  Antti Koivisto  <antti@apple.com>
+
+        Document::styleResolverChanged simplification
+        https://bugs.webkit.org/show_bug.cgi?id=162347
+
+        Reviewed by Anders Carlsson.
+
+        * dom/Document.cpp:
+        (WebCore::Document::implicitClose):
+        (WebCore::Document::setParsing):
+        (WebCore::Document::write):
+        (WebCore::Document::styleResolverChanged):
+
+            - Remove unncessary AnimationUpdateBlock, it is created by recalcStyle.
+            - Remove explicit setNeedsLayoutAndPrefWidthsRecalc/scheduleRelayout calls, style resolution
+              invalidates those as needed.
+            - Remove evaluateMediaQueryList call, that is done on layout as needed.
+            - Remove the ancient INSTRUMENT_LAYOUT_SCHEDULING and the related printfs.
+
 2016-09-21  Keith Miller  <keith_miller@apple.com>
 

trunk/Source/WebCore/dom/Document.cpp

@@ -275 +275 @@
 using namespace HTMLNames;
 
-// #define INSTRUMENT_LAYOUT_SCHEDULING 1
-
 static const unsigned cMaxWriteRecursionDepth = 21;
 
@@ -2752 +2750 @@
     if (f)
         f->loader().dispatchOnloadEvents();
-#ifdef INSTRUMENT_LAYOUT_SCHEDULING
-    if (!ownerElement())
-        printf("onload fired at %lld\n", elapsedTime().count());
-#endif
 
     // An event handler may have removed the frame
@@ -2825 +2819 @@
     if (!m_bParsing && view() && !view()->needsLayout())
         view()->fireLayoutRelatedMilestonesIfNeeded();
-
-#ifdef INSTRUMENT_LAYOUT_SCHEDULING
-    if (!ownerElement() && !m_bParsing)
-        printf("Parsing finished at %lld\n", elapsedTime().count());
-#endif
 }
 
@@ -2878 +2867 @@
        return;
 
-#ifdef INSTRUMENT_LAYOUT_SCHEDULING
-    if (!ownerElement())
-        printf("Beginning a document.write at %lld\n", elapsedTime().count());
-#endif
-
     bool hasInsertionPoint = m_parser && m_parser->hasInsertionPoint();
     if (!hasInsertionPoint && (m_ignoreOpensDuringUnloadCount || m_ignoreDestructiveWriteCount))
@@ -2892 +2876 @@
     ASSERT(m_parser);
     m_parser->insert(text);
-
-#ifdef INSTRUMENT_LAYOUT_SCHEDULING
-    if (!ownerElement())
-        printf("Ending a document.write at %lld\n", elapsedTime().count());
-#endif    
 }
 
@@ -3659 +3638 @@
     m_didCalculateStyleResolver = true;
 
-#ifdef INSTRUMENT_LAYOUT_SCHEDULING
-    if (!ownerElement())
-        printf("Beginning update of style selector at time %lld.\n", elapsedTime().count());
-#endif
-
     auto styleSheetUpdate = (updateFlag == RecalcStyleIfNeeded || updateFlag == DeferRecalcStyleIfNeeded)
         ? AuthorStyleSheets::OptimizedUpdate
@@ -3680 +3654 @@
     }
 
-    if (!stylesheetChangeRequiresStyleRecalc)
-        return;
-
-    // This recalcStyle initiates a new recalc cycle. We need to bracket it to
-    // make sure animations get the correct update time
-    {
-        AnimationUpdateBlock animationUpdateBlock(m_frame ? &m_frame->animation() : nullptr);
+    if (stylesheetChangeRequiresStyleRecalc)
         recalcStyle(Style::Force);
-    }
-
-#ifdef INSTRUMENT_LAYOUT_SCHEDULING
-    if (!ownerElement())
-        printf("Finished update of style selector at time %lld\n", elapsedTime().count());
-#endif
-
-    if (renderView()) {
-        renderView()->setNeedsLayoutAndPrefWidthsRecalc();
-        if (view())
-            view()->scheduleRelayout();
-    }
-
-    evaluateMediaQueryList();
 }