Make updateStyleAndLayoutTree ready for async stylesheet update.

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.
@@ skipping 588 matching lines @@
   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))
+                                         TextCaseInsensitive)) {
       m_isMobileDocument = true;
+      m_styleEngine->viewportRulesChanged();
+    }
   }
-  // Doctype affects the interpretation of the stylesheets.
-  styleEngine().clearResolver();
 }
 
 DOMImplementation& Document::implementation() {
   if (!m_implementation)
     m_implementation = DOMImplementation::create(*this);
   return *m_implementation;
 }
 
 bool Document::hasAppCacheManifest() const {
   return isHTMLHtmlElement(documentElement()) &&
@@ skipping 935 matching lines @@
   if (childNeedsStyleInvalidation())
     return true;
   if (layoutViewItem().wasNotifiedOfSubtreeChange())
     return true;
   return false;
 }
 
 bool Document::needsFullLayoutTreeUpdate() const {
   if (!isActive() || !view())
     return false;
+  if (m_styleEngine->needsActiveStyleUpdate())
+    return true;
   if (!m_useElementsNeedingUpdate.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;
@@ skipping 32 matching lines @@
 
   ++m_styleVersion;
 }
 
 bool Document::hasPendingForcedStyleRecalc() const {
   return hasPendingVisualUpdate() && !inStyleRecalc() &&
          getStyleChangeType() >= SubtreeStyleChange;
 }
 
 void Document::updateStyleInvalidationIfNeeded() {
+  DCHECK(isActive());
   ScriptForbiddenScope forbidScript;
 
-  if (!isActive())
-    return;
   if (!childNeedsStyleInvalidation())
     return;
   TRACE_EVENT0("blink", "Document::updateStyleInvalidationIfNeeded");
   styleEngine().styleInvalidator().invalidate(*this);
 }
 
 void Document::setupFontBuilder(ComputedStyle& documentStyle) {
   FontBuilder fontBuilder(*this);
   CSSFontSelector* selector = styleEngine().fontSelector();
   fontBuilder.createFontForDocument(selector, documentStyle);
@@ skipping 233 matching lines @@
 
   unsigned startElementCount = styleEngine().styleForElementCount();
 
   InspectorInstrumentation::willRecalculateStyle(this);
   PerformanceMonitor::willRecalculateStyle(this);
 
   DocumentAnimations::updateAnimationTimingIfNeeded(*this);
   evaluateMediaQueryListIfNeeded();
   updateUseShadowTreesIfNeeded();
   updateDistribution();
+  updateActiveStyle();
   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
@@ skipping 22 matching lines @@
   TRACE_EVENT_END1("blink,devtools.timeline", "UpdateLayoutTree",
                    "elementCount", elementCount);
 
 #if DCHECK_IS_ON()
   assertLayoutTreeUpdated(*this);
 #endif
   InspectorInstrumentation::didRecalculateStyle(this);
   PerformanceMonitor::didRecalculateStyle(this);
 }
 
+void Document::updateActiveStyle() {
+  DCHECK(isActive());
+  DCHECK(isMainThread());
+  TRACE_EVENT0("blink", "Document::updateActiveStyle");
+  styleEngine().updateActiveStyle();
+}
+
 void Document::updateStyle() {
   DCHECK(!view()->shouldThrottleRendering());
   TRACE_EVENT_BEGIN0("blink,blink_style", "Document::updateStyle");
   SCOPED_BLINK_UMA_HISTOGRAM_TIMER("Style.UpdateTime");
 
   unsigned initialElementCount = styleEngine().styleForElementCount();
 
   HTMLFrameOwnerElement::UpdateSuspendScope suspendWidgetHierarchyUpdates;
   m_lifecycle.advanceTo(DocumentLifecycle::InStyleRecalc);
 
@@ skipping 4510 matching lines @@
 }
 
 void showLiveDocumentInstances() {
   WeakDocumentSet& set = 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