Merge 139100

Source/WebCore/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.
  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
  * Copyright (C) Research In Motion Limited 2010-2011. All rights reserved.
@@ skipping 4449 matching lines @@
     double currentTime = WTF::currentTime();
 
     if (currentTime > m_lastStyleResolverAccessTime + holdOffTimeBeforeReschedulingTimerInSeconds) {
         m_styleResolverThrowawayTimer.startOneShot(timeBeforeThrowingAwayStyleResolverAfterLastUseInSeconds);
         m_lastStyleResolverAccessTime = currentTime;
     }
 }
 
 void Document::styleResolverThrowawayTimerFired(Timer<Document>*)
 {
+    ASSERT(!m_inStyleRecalc);
     clearStyleResolver();
 }
 
 PassRefPtr<XPathExpression> Document::createExpression(const String& expression,
                                                        XPathNSResolver* resolver,
                                                        ExceptionCode& ec)
 {
     if (!m_xpathEvaluator)
         m_xpathEvaluator = XPathEvaluator::create();
     return m_xpathEvaluator->createExpression(expression, resolver, ec);
@@ skipping 1511 matching lines @@
             m_templateContentsOwnerDocument = HTMLDocument::create(0, blankURL());
         else
             m_templateContentsOwnerDocument = Document::create(0, blankURL());
     }
 
     return m_templateContentsOwnerDocument.get();
 }
 #endif
 
 } // namespace WebCore