Index: Source/core/dom/Document.cpp |
diff --git a/Source/core/dom/Document.cpp b/Source/core/dom/Document.cpp |
index ebac27d8d108f814270530cbbdfd86d5e4da2996..17a996519c05c215ea9cd390557f6baab3b96c78 100644 |
--- a/Source/core/dom/Document.cpp |
+++ b/Source/core/dom/Document.cpp |
@@ -1529,6 +1529,9 @@ PassRefPtr<TreeWalker> Document::createTreeWalker(Node* root, unsigned whatToSho |
void Document::scheduleStyleRecalc() |
{ |
+ if (!isActive()) |
+ return; |
+ |
if (shouldDisplaySeamlesslyWithParent()) { |
// When we're seamless, our parent document manages our style recalcs. |
ownerElement()->setNeedsStyleRecalc(); |
@@ -1536,7 +1539,7 @@ void Document::scheduleStyleRecalc() |
return; |
} |
- if (m_styleRecalcTimer.isActive()) |
+ if (m_styleRecalcTimer.isActive() || !shouldScheduleLayout()) |
return; |
ASSERT(needsStyleRecalc() || childNeedsStyleRecalc() || childNeedsDistributionRecalc() || !m_useElementsNeedingUpdate.isEmpty()); |