Index: third_party/WebKit/Source/core/dom/Document.cpp |
diff --git a/third_party/WebKit/Source/core/dom/Document.cpp b/third_party/WebKit/Source/core/dom/Document.cpp |
index a7bf22a4c371fcd510f3d50cc64269699440b230..13592b8dd011d632a121a4b22f2d8c46fe615557 100644 |
--- a/third_party/WebKit/Source/core/dom/Document.cpp |
+++ b/third_party/WebKit/Source/core/dom/Document.cpp |
@@ -570,11 +570,8 @@ |
} |
void Document::mediaQueryAffectingValueChanged() { |
+ m_evaluateMediaQueriesOnStyleRecalc = true; |
styleEngine().mediaQueryAffectingValueChanged(); |
- if (needsLayoutTreeUpdate()) |
- m_evaluateMediaQueriesOnStyleRecalc = true; |
- else |
- evaluateMediaQueryList(); |
InspectorInstrumentation::mediaQueryResultChanged(this); |
} |
@@ -2230,9 +2227,8 @@ |
if (bodyElement && !bodyElement->layoutObject() && |
m_pendingSheetLayout == NoLayoutWithPendingSheets) { |
m_pendingSheetLayout = DidLayoutWithPendingSheets; |
- styleEngine().markAllTreeScopesDirty(); |
- } |
- if (m_hasNodesWithPlaceholderStyle) { |
+ styleEngine().resolverChanged(FullStyleUpdate); |
+ } 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 |