Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(275)

Side by Side Diff: Source/core/dom/Document.cpp

Issue 141143006: [import] Cleanup: get rid of ad-hoc state machine. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Added a test Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2001 Dirk Mueller (mueller@kde.org) 4 * (C) 2001 Dirk Mueller (mueller@kde.org)
5 * (C) 2006 Alexey Proskuryakov (ap@webkit.org) 5 * (C) 2006 Alexey Proskuryakov (ap@webkit.org)
6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011, 2012 Apple Inc. All r ights reserved. 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011, 2012 Apple Inc. All r ights reserved.
7 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/) 7 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)
8 * Copyright (C) 2008, 2009, 2011, 2012 Google Inc. All rights reserved. 8 * Copyright (C) 2008, 2009, 2011, 2012 Google Inc. All rights reserved.
9 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies) 9 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
10 * Copyright (C) Research In Motion Limited 2010-2011. All rights reserved. 10 * Copyright (C) Research In Motion Limited 2010-2011. All rights reserved.
(...skipping 777 matching lines...) Expand 10 before | Expand all | Expand 10 after
788 m_import = import; 788 m_import = import;
789 } 789 }
790 790
791 void Document::didLoadAllImports() 791 void Document::didLoadAllImports()
792 { 792 {
793 executeScriptsWaitingForResourcesIfNeeded(); 793 executeScriptsWaitingForResourcesIfNeeded();
794 } 794 }
795 795
796 bool Document::haveImportsLoaded() const 796 bool Document::haveImportsLoaded() const
797 { 797 {
798 return !m_import || !m_import->isBlockedFromRunningScript(); 798 return !m_import || !m_import->isStateBlockedFromRunningScript();
799 } 799 }
800 800
801 DOMWindow* Document::executingWindow() 801 DOMWindow* Document::executingWindow()
802 { 802 {
803 if (DOMWindow* owningWindow = domWindow()) 803 if (DOMWindow* owningWindow = domWindow())
804 return owningWindow; 804 return owningWindow;
805 if (HTMLImport* import = this->import()) 805 if (HTMLImport* import = this->import())
806 return import->master()->domWindow(); 806 return import->master()->domWindow();
807 return 0; 807 return 0;
808 } 808 }
(...skipping 4508 matching lines...) Expand 10 before | Expand all | Expand 10 after
5317 } 5317 }
5318 if (m_hasAutofocused) 5318 if (m_hasAutofocused)
5319 return; 5319 return;
5320 m_hasAutofocused = true; 5320 m_hasAutofocused = true;
5321 ASSERT(!m_autofocusElement); 5321 ASSERT(!m_autofocusElement);
5322 m_autofocusElement = element; 5322 m_autofocusElement = element;
5323 m_taskRunner->postTask(AutofocusTask::create()); 5323 m_taskRunner->postTask(AutofocusTask::create());
5324 } 5324 }
5325 5325
5326 } // namespace WebCore 5326 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698