Rewind the DocumentLifecycle when dirtying state

Source/core/dom/Document.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  *           (C) 2006 Alexey Proskuryakov (ap@webkit.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011, 2012 Apple Inc. All rights reserved.
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  * Copyright (C) 2008, 2009, 2011, 2012 Google Inc. All rights reserved.
  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
  * Copyright (C) Research In Motion Limited 2010-2011. All rights reserved.
@@ skipping 1562 matching lines @@
     return true;
 }
 
 void Document::scheduleRenderTreeUpdate()
 {
     ASSERT(!hasPendingStyleRecalc());
     ASSERT(shouldScheduleRenderTreeUpdate());
     ASSERT(needsRenderTreeUpdate());
 
     page()->animator().scheduleVisualUpdate();
-    m_lifecycle.advanceTo(DocumentLifecycle::StyleRecalcPending);
+    m_lifecycle.ensureStateAtMost(DocumentLifecycle::UpdatePending);
 
     InspectorInstrumentation::didScheduleStyleRecalculation(this);
 }
 
 bool Document::hasPendingForcedStyleRecalc() const
 {
     return hasPendingStyleRecalc() && !inStyleRecalc() && styleChangeType() >= SubtreeStyleChange;
 }
 
 void Document::updateDistributionIfNeeded()
@@ skipping 1029 matching lines @@
         m_elementDataCache = ElementDataCache::create();
 }
 
 bool Document::shouldScheduleLayout() const
 {
     // This function will only be called when FrameView thinks a layout is needed.
     // This enforces a couple extra rules.
     //
     //    (a) Only schedule a layout once the stylesheets are loaded.
     //    (b) Only schedule layout once we have a body element.
-
+    if (!isActive())
+        return false;
     return (isRenderingReady() && body())
         || (documentElement() && !isHTMLHtmlElement(*documentElement()));

[esprehn, 2014/04/09 21:32:25]

Can we split these too so it's easier to read?

if (isRenderingReady() && body())
  return true;
if (documentElement() && !isHTMLHtmlElement(*documentElement()))
  return true;
return false

[abarth-chromium, 2014/04/09 21:41:26]

Done.

 }
 
 int Document::elapsedTime() const
 {
     return static_cast<int>((currentTime() - m_startTime) * 1000);
 }
 
 void Document::write(const SegmentedString& text, Document* ownerDocument)
 {
     NestingLevelIncrementer nestingLevelIncrementer(m_writeRecursionDepth);
@@ skipping 2861 matching lines @@
         (*it)->invalidateCache(attrName);
 }
 
 void Document::trace(Visitor* visitor)
 {
     Supplementable<Document>::trace(visitor);
     ContainerNode::trace(visitor);
 }
 
 } // namespace WebCore