Merge 86976

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 Apple Inc. All rights reserved.
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  * Copyright (C) 2008, 2009 Google Inc. All rights reserved.
  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
  *
@@ skipping 1471 matching lines @@
         // If we didn't update compositing layers because of layout(), we need to do so here.
         if (!layoutPending)
             view()->updateCompositingLayers();
     }
 #endif
 
 bail_out:
     clearNeedsStyleRecalc();
     clearChildNeedsStyleRecalc();
     unscheduleStyleRecalc();
+
+    m_inStyleRecalc = false;
     
     // Pseudo element removal and similar may only work with these flags still set. Reset them after the style recalc.
     if (m_styleSelector) {
         m_usesSiblingRules = m_styleSelector->usesSiblingRules();
         m_usesFirstLineRules = m_styleSelector->usesFirstLineRules();
         m_usesBeforeAfterRules = m_styleSelector->usesBeforeAfterRules();
         m_usesLinkRules = m_styleSelector->usesLinkRules();
     }
 
     if (frameView) {
         frameView->resumeScheduledEvents();
         frameView->endDeferredRepaints();
     }
     RenderWidget::resumeWidgetHierarchyUpdates();
     resumePostAttachCallbacks();
-    m_inStyleRecalc = false;
 
     // If we wanted to call implicitClose() during recalcStyle, do so now that we're finished.
     if (m_closeAfterStyleRecalc) {
         m_closeAfterStyleRecalc = false;
         implicitClose();
     }
 
     InspectorInstrumentation::didRecalculateStyle(cookie);
 }
 
@@ skipping 3453 matching lines @@
     return Touch::create(frame, target, identifier, screenX, screenY, pageX, pageY);
 }
 
 PassRefPtr<TouchList> Document::createTouchList(ExceptionCode&) const
 {
     return TouchList::create();
 }
 #endif
 
 } // namespace WebCore