Setting preferred stylesheet simplified.

third_party/WebKit/Source/core/dom/StyleEngine.cpp

Index: third_party/WebKit/Source/core/dom/StyleEngine.cpp
diff --git a/third_party/WebKit/Source/core/dom/StyleEngine.cpp b/third_party/WebKit/Source/core/dom/StyleEngine.cpp
index 82e9aae40c61d1999b8464dd24799f9147abb2db..3cd7785477ec9fa55318af2fd59c01549fd1176f 100644
--- a/third_party/WebKit/Source/core/dom/StyleEngine.cpp
+++ b/third_party/WebKit/Source/core/dom/StyleEngine.cpp
@@ -554,8 +554,7 @@ CSSStyleSheet* StyleEngine::createSheet(Element& element,
   DCHECK(styleSheet);
   if (!element.isInShadowTree()) {
     styleSheet->setTitle(element.title());
-    setPreferredStylesheetSetNameIfNotSet(element.title(),
-                                          DontUpdateActiveSheets);
+    setPreferredStylesheetSetNameIfNotSet(element.title());
   }
   return styleSheet;
 }
@@ -924,9 +923,7 @@ void StyleEngine::setStatsEnabled(bool enabled) {
     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;
@@ -936,14 +933,7 @@ void StyleEngine::setPreferredStylesheetSetNameIfNotSet(
   // 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) {
@@ -956,7 +946,7 @@ void StyleEngine::setSelectedStylesheetSetName(const String& name) {
 }
 
 void StyleEngine::setHttpDefaultStyle(const String& content) {
-  setPreferredStylesheetSetNameIfNotSet(content, UpdateActiveSheets);
+  setPreferredStylesheetSetNameIfNotSet(content);
 }
 
 void StyleEngine::ensureUAStyleForFullscreen() {