Current work-in-progress crbug.com/567021

third_party/WebKit/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 515 matching lines @@
 MediaQueryMatcher& Document::mediaQueryMatcher()
 {
     if (!m_mediaQueryMatcher)
         m_mediaQueryMatcher = MediaQueryMatcher::create(*this);
     return *m_mediaQueryMatcher;
 }
 
 void Document::mediaQueryAffectingValueChanged()
 {
     m_evaluateMediaQueriesOnStyleRecalc = true;
-    styleEngine().clearMediaQueryRuleSetStyleSheets();
+    styleEngine().mediaQueryAffectingValueChanged();
     InspectorInstrumentation::mediaQueryResultChanged(this);
 }
 
 void Document::setCompatibilityMode(CompatibilityMode mode)
 {
     if (m_compatibilityModeLocked || mode == m_compatibilityMode)
         return;
     m_compatibilityMode = mode;
     selectorQueryCache().invalidate();
 }
 
 String Document::compatMode() const
 {
     return inQuirksMode() ? "BackCompat" : "CSS1Compat";
 }
 
 void Document::setDoctype(DocumentType* docType)
 {
     // This should never be called more than once.
     DCHECK(!m_docType || !docType);
     m_docType = docType;
     if (m_docType) {
         this->adoptIfNeeded(*m_docType);
-        if (m_docType->publicId().startsWith("-//wapforum//dtd xhtml mobile 1.", TextCaseInsensitive))
+        if (m_docType->publicId().startsWith("-//wapforum//dtd xhtml mobile 1.", TextCaseInsensitive)) {
             m_isMobileDocument = true;
+            styleEngine().setNeedsActiveStyleUpdate(*this);
+        }
     }
     // Doctype affects the interpretation of the stylesheets.
+    // TODO(rune@opera.com): Is this necessary? Smaller cannon?
     styleEngine().clearResolver();
 }
 
 DOMImplementation& Document::implementation()
 {
     if (!m_implementation)
         m_implementation = DOMImplementation::create(*this);
     return *m_implementation;
 }
 
@@ skipping 898 matching lines @@
         return true;
     if (!m_layerUpdateSVGFilterElements.isEmpty())
         return true;
     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 (m_styleEngine->needsActiveStyleUpdate())
+        return true;
     if (DocumentAnimations::needsAnimationTimingUpdate(*this))
         return true;
     return false;
 }
 
 bool Document::shouldScheduleLayoutTreeUpdate() const
 {
     if (!isActive())
         return false;
     if (inStyleRecalc())
@@ skipping 20 matching lines @@
     InspectorInstrumentation::didScheduleStyleRecalculation(this);
 
     ++m_styleVersion;
 }
 
 bool Document::hasPendingForcedStyleRecalc() const
 {
     return hasPendingVisualUpdate() && !inStyleRecalc() && getStyleChangeType() >= SubtreeStyleChange;
 }
 
-void Document::updateStyleInvalidationIfNeeded()
+void Document::updateStyleInvalidation()
 {
     ScriptForbiddenScope forbidScript;
 
-    if (!isActive())
-        return;
+    DCHECK(isActive());
     if (!childNeedsStyleInvalidation())
         return;
-    TRACE_EVENT0("blink", "Document::updateStyleInvalidationIfNeeded");
+    TRACE_EVENT0("blink", "Document::updateStyleInvalidation");
     styleEngine().styleInvalidator().invalidate(*this);
 }
 
 void Document::setupFontBuilder(ComputedStyle& documentStyle)
 {
     FontBuilder fontBuilder(*this);
     CSSFontSelector* selector = styleEngine().fontSelector();
     fontBuilder.createFontForDocument(selector, documentStyle);
 }
 
@@ skipping 197 matching lines @@
     TRACE_EVENT_SCOPED_SAMPLING_STATE("blink", "UpdateLayoutTree");
 
     unsigned startElementCount = styleEngine().styleForElementCount();
 
     InspectorInstrumentation::StyleRecalc instrumentation(this);
 
     DocumentAnimations::updateAnimationTimingIfNeeded(*this);
     evaluateMediaQueryListIfNeeded();
     updateUseShadowTreesIfNeeded();
     updateDistribution();
-    updateStyleInvalidationIfNeeded();
+    styleEngine().updateActiveStyle();
+    updateStyleInvalidation();
 
     // 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.
 
     updateStyle();
 
@@ skipping 227 matching lines @@
         // FIXME: We are willing to attempt to suppress painting with outdated style info only once.
         // Our assumption is that it would be dangerous to try to stop it a second time, after page
         // content has already been loaded and displayed with accurate style information. (Our
         // suppression involves blanking the whole page at the moment. If it were more refined, we
         // might be able to do something better.) It's worth noting though that this entire method
         // is a hack, since what we really want to do is suspend JS instead of doing a layout with
         // inaccurate information.
         HTMLElement* bodyElement = body();
         if (bodyElement && !bodyElement->layoutObject() && m_pendingSheetLayout == NoLayoutWithPendingSheets) {
             m_pendingSheetLayout = DidLayoutWithPendingSheets;
-            styleEngine().resolverChanged(FullStyleUpdate);
+            styleEngine().markAllTreeScopesDirty();
+            setNeedsStyleRecalc(SubtreeStyleChange, StyleChangeReasonForTracing::create(StyleChangeReason::CleanupPlaceholderStyles));
         } else if (m_hasNodesWithPlaceholderStyle) {
             // If new nodes have been added or style recalc has been done with style sheets still
             // pending, some nodes may not have had their real style calculated yet. Normally this
             // gets cleaned when style sheets arrive but here we need up-to-date style immediately.
             setNeedsStyleRecalc(SubtreeStyleChange, StyleChangeReasonForTracing::create(StyleChangeReason::CleanupPlaceholderStyles));
         }
     }
     updateStyleAndLayoutTree();
 }
 
@@ skipping 1438 matching lines @@
     if (m_mediaQueryMatcher)
         m_mediaQueryMatcher->viewportChanged();
     if (!hasViewportUnits())
         return;
     ensureStyleResolver().notifyResizeForViewportUnits();
     setNeedsStyleRecalcForViewportUnits();
 }
 
 void Document::styleResolverMayHaveChanged()
 {
-    styleEngine().resolverChanged(hasNodesWithPlaceholderStyle() ? FullStyleUpdate : AnalyzedStyleUpdate);
+    if (hasNodesWithPlaceholderStyle()) {
+        styleEngine().markAllTreeScopesDirty();
+        setNeedsStyleRecalc(SubtreeStyleChange, StyleChangeReasonForTracing::create(StyleChangeReason::CleanupPlaceholderStyles));
+    }
 
     if (didLayoutWithPendingStylesheets() && !styleEngine().hasPendingScriptBlockingSheets()) {
         // We need to manually repaint because we avoid doing all repaints in layout or style
         // recalc while sheets are still loading to avoid FOUC.
         m_pendingSheetLayout = IgnoreLayoutWithPendingSheets;
 
         DCHECK(layoutView() || importsController());
         if (layoutView())
             layoutView()->invalidatePaintForViewAndCompositedLayers();
     }
@@ skipping 2567 matching lines @@
 #ifndef NDEBUG
 using namespace blink;
 void showLiveDocumentInstances()
 {
     Document::WeakDocumentSet& set = Document::liveDocumentSet();
     fprintf(stderr, "There are %u documents currently alive:\n", set.size());
     for (Document* document : set)
         fprintf(stderr, "- Document %p URL: %s\n", document, document->url().getString().utf8().data());
 }
 #endif