Remove StyleInvalidator machinery.

sky/engine/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 29 matching lines @@
 #include "core/HTMLElementFactory.h"
 #include "core/animation/AnimationTimeline.h"
 #include "core/animation/DocumentAnimations.h"
 #include "core/css/CSSFontSelector.h"
 #include "core/css/CSSStyleDeclaration.h"
 #include "core/css/CSSStyleSheet.h"
 #include "core/css/MediaQueryMatcher.h"
 #include "core/css/StylePropertySet.h"
 #include "core/css/StyleSheetContents.h"
 #include "core/css/StyleSheetList.h"
-#include "core/css/invalidation/StyleInvalidator.h"
 #include "core/css/parser/BisonCSSParser.h"
 #include "core/css/resolver/FontBuilder.h"
 #include "core/css/resolver/StyleResolver.h"
 #include "core/css/resolver/StyleResolverStats.h"
 #include "core/dom/Attr.h"
 #include "core/dom/DocumentFragment.h"
 #include "core/dom/DocumentLifecycleNotifier.h"
 #include "core/dom/DocumentLifecycleObserver.h"
 #include "core/dom/DocumentMarkerController.h"
 #include "core/dom/Element.h"
@@ skipping 951 matching lines @@
 }
 
 bool Document::needsRenderTreeUpdate() const
 {
     if (!isActive() || !view())
         return false;
     if (needsFullRenderTreeUpdate())
         return true;
     if (childNeedsStyleRecalc())
         return true;
-    if (childNeedsStyleInvalidation())
-        return true;
     return false;
 }
 
 bool Document::needsFullRenderTreeUpdate() const
 {
     if (!isActive() || !view())
         return false;
     if (needsStyleRecalc())
         return true;
-    if (needsStyleInvalidation())
-        return true;
     // FIXME: The childNeedsDistributionRecalc bit means either self or children, we should fix that.
     if (childNeedsDistributionRecalc())
         return true;
     if (DocumentAnimations::needsOutdatedAnimationPlayerUpdate(*this))
         return true;
     return false;
 }
 
 bool Document::shouldScheduleRenderTreeUpdate() const
 {
@@ skipping 30 matching lines @@
 void Document::updateDistributionIfNeeded()
 {
     ScriptForbiddenScope forbidScript;
 
     if (!childNeedsDistributionRecalc())
         return;
     TRACE_EVENT0("blink", "Document::updateDistributionIfNeeded");
     recalcDistribution();
 }
 
-void Document::updateStyleInvalidationIfNeeded()
-{
-    ScriptForbiddenScope forbidScript;
-
-    if (!isActive())
-        return;
-    if (!childNeedsStyleInvalidation())
-        return;
-    TRACE_EVENT0("blink", "Document::updateStyleInvalidationIfNeeded");
-    ASSERT(styleResolver());
-
-    styleResolver()->ruleFeatureSet().styleInvalidator().invalidate(*this);
-}
-
 void Document::updateDistributionForNodeIfNeeded(Node* node)
 {
     ScriptForbiddenScope forbidScript;
 
     if (node->inDocument()) {
         updateDistributionIfNeeded();
         return;
     }
     Node* root = node;
     while (Node* host = root->shadowHost())
@@ skipping 42 matching lines @@
     TRACE_EVENT_SCOPED_SAMPLING_STATE("blink", "UpdateRenderTree");
 
     // FIXME: Remove m_styleRecalcElementCounter, we should just use the accessCount() on the resolver.
     m_styleRecalcElementCounter = 0;
     TRACE_EVENT_BEGIN1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "RecalculateStyles", "frame", frame());
     TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline.stack"), "CallStack", TRACE_EVENT_SCOPE_PROCESS, "stack", InspectorCallStackEvent::currentCallStack());
 
     DocumentAnimations::updateOutdatedAnimationPlayersIfNeeded(*this);
     evaluateMediaQueryListIfNeeded();
     updateDistributionIfNeeded();
-    updateStyleInvalidationIfNeeded();
 
     // FIXME: We should update style on our ancestor chain before proceeding
     // however doing so currently causes several tests to crash, as LocalFrame::setDocument calls Document::attach
     // before setting the LocalDOMWindow on the LocalFrame, or the SecurityOrigin on the document. The attach, in turn
     // resolves style (here) and then when we resolve style on the parent chain, we may end up
     // re-attaching our containing iframe, which when asked HTMLFrameElementBase::isURLAllowed
     // hits a null-dereference due to security code always assuming the document has a SecurityOrigin.
 
     if (m_elemSheet && m_elemSheet->contents()->usesRemUnits())
         m_styleEngine->setUsesRemUnit(true);
@@ skipping 69 matching lines @@
     ASSERT(!childNeedsStyleRecalc());
     ASSERT(inStyleRecalc());
     m_lifecycle.advanceTo(DocumentLifecycle::StyleClean);
 }
 
 void Document::updateRenderTreeForNodeIfNeeded(Node* node)
 {
     bool needsRecalc = needsFullRenderTreeUpdate();
 
     for (const Node* ancestor = node; ancestor && !needsRecalc; ancestor = NodeRenderingTraversal::parent(ancestor))
-        needsRecalc = ancestor->needsStyleRecalc() || ancestor->needsStyleInvalidation();
+        needsRecalc = ancestor->needsStyleRecalc();
 
     if (needsRecalc)
         updateRenderTreeIfNeeded();
 }
 
 void Document::updateLayout()
 {
     ASSERT(isMainThread());
 
     ScriptForbiddenScope forbidScript;
@@ skipping 1738 matching lines @@
 using namespace blink;
 void showLiveDocumentInstances()
 {
     WeakDocumentSet& set = liveDocumentSet();
     fprintf(stderr, "There are %u documents currently alive:\n", set.size());
     for (WeakDocumentSet::const_iterator it = set.begin(); it != set.end(); ++it) {
         fprintf(stderr, "- Document %p URL: %s\n", *it, (*it)->url().string().utf8().data());
     }
 }
 #endif