Setting preferred stylesheet simplified.

third_party/WebKit/Source/core/dom/StyleEngine.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 536 matching lines @@
     DCHECK(contents);
     DCHECK(contents->isCacheableForStyleElement());
     DCHECK(contents->hasSingleOwnerDocument());
     contents->setIsUsedFromTextCache();
     styleSheet = CSSStyleSheet::createInline(contents, element, startPosition);
   }
 
   DCHECK(styleSheet);
   if (!element.isInShadowTree()) {
     styleSheet->setTitle(element.title());
-    setPreferredStylesheetSetNameIfNotSet(element.title(),
-                                          DontUpdateActiveSheets);
+    setPreferredStylesheetSetNameIfNotSet(element.title());
   }
   return styleSheet;
 }
 
 CSSStyleSheet* StyleEngine::parseSheet(Element& element,
                                        const String& text,
                                        TextPosition startPosition) {
   CSSStyleSheet* styleSheet = nullptr;
   styleSheet = CSSStyleSheet::createInline(element, KURL(), startPosition,
                                            document().characterSet());
@@ skipping 348 matching lines @@
   if (!enabled) {
     m_styleResolverStats = nullptr;
     return;
   }
   if (!m_styleResolverStats)
     m_styleResolverStats = StyleResolverStats::create();
   else
     m_styleResolverStats->reset();
 }
 
-void StyleEngine::setPreferredStylesheetSetNameIfNotSet(
-    const String& name,
-    ActiveSheetsUpdate activeSheetsUpdate) {
+void StyleEngine::setPreferredStylesheetSetNameIfNotSet(const String& name) {
   if (!m_preferredStylesheetSetName.isEmpty())
     return;
   m_preferredStylesheetSetName = name;
   // TODO(rune@opera.com): Setting the selected set here is wrong if the set
   // has been previously set by through Document.selectedStylesheetSet. Our
   // current implementation ignores the effect of Document.selectedStylesheetSet
   // and either only collects persistent style, or additionally preferred
   // style when present.
   m_selectedStylesheetSetName = name;
-
-  // TODO(rune@opera.com): For async stylesheet update, we should always mark
-  // the TreeScope dirty here, and the synchronous active stylesheet update
-  // (resolverChanged) should go away.
-  if (activeSheetsUpdate == UpdateActiveSheets) {
-    markDocumentDirty();
-    resolverChanged(AnalyzedStyleUpdate);
-  }
+  markDocumentDirty();
 }
 
 void StyleEngine::setSelectedStylesheetSetName(const String& name) {
   m_selectedStylesheetSetName = name;
   // TODO(rune@opera.com): Setting Document.selectedStylesheetSet currently
   // has no other effect than the ability to read back the set value using
   // the same api. If it did have an effect, we should have marked the
   // document scope dirty and triggered an update of the active stylesheets
   // from here.
 }
 
 void StyleEngine::setHttpDefaultStyle(const String& content) {
-  setPreferredStylesheetSetNameIfNotSet(content, UpdateActiveSheets);
+  setPreferredStylesheetSetNameIfNotSet(content);
 }
 
 void StyleEngine::ensureUAStyleForFullscreen() {
   if (m_globalRuleSet.hasFullscreenUAStyle())
     return;
   CSSDefaultStyleSheets::instance().ensureDefaultStyleSheetForFullscreen();
   m_globalRuleSet.markDirty();
   m_globalRuleSet.update(document());
 }
 
@@ skipping 207 matching lines @@
 }
 
 DEFINE_TRACE_WRAPPERS(StyleEngine) {
   for (auto sheet : m_injectedAuthorStyleSheets) {
     visitor->traceWrappers(sheet);
   }
   visitor->traceWrappers(m_documentStyleSheetCollection);
 }
 
 }  // namespace blink