Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(297)

Unified Diff: sky/engine/core/dom/Document.cpp

Issue 712173002: Remove StyleInvalidator machinery. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « sky/engine/core/dom/Document.h ('k') | sky/engine/core/dom/Element.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/dom/Document.cpp
diff --git a/sky/engine/core/dom/Document.cpp b/sky/engine/core/dom/Document.cpp
index e259da8470625b6af560a0cfcf36723a7f5219d9..404fc8827fd22ca98d82872a23d4a7a8ff68b674 100644
--- a/sky/engine/core/dom/Document.cpp
+++ b/sky/engine/core/dom/Document.cpp
@@ -47,7 +47,6 @@
#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"
@@ -1019,8 +1018,6 @@ bool Document::needsRenderTreeUpdate() const
return true;
if (childNeedsStyleRecalc())
return true;
- if (childNeedsStyleInvalidation())
- return true;
return false;
}
@@ -1030,8 +1027,6 @@ bool Document::needsFullRenderTreeUpdate() const
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;
@@ -1082,20 +1077,6 @@ void 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;
@@ -1158,7 +1139,6 @@ void Document::updateRenderTree(StyleRecalcChange change)
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
@@ -1248,7 +1228,7 @@ 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();
« no previous file with comments | « sky/engine/core/dom/Document.h ('k') | sky/engine/core/dom/Element.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698