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

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: Updated to ToT 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
« no previous file with comments | « Source/core/core.gypi ('k') | Source/core/html/HTMLImport.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 778 matching lines...) Expand 10 before | Expand all | Expand 10 after
789 m_import = import; 789 m_import = import;
790 } 790 }
791 791
792 void Document::didLoadAllImports() 792 void Document::didLoadAllImports()
793 { 793 {
794 executeScriptsWaitingForResourcesIfNeeded(); 794 executeScriptsWaitingForResourcesIfNeeded();
795 } 795 }
796 796
797 bool Document::haveImportsLoaded() const 797 bool Document::haveImportsLoaded() const
798 { 798 {
799 return !m_import || !m_import->isBlockedFromRunningScript(); 799 return !m_import || !m_import->isStateBlockedFromRunningScript();
800 } 800 }
801 801
802 DOMWindow* Document::executingWindow() 802 DOMWindow* Document::executingWindow()
803 { 803 {
804 if (DOMWindow* owningWindow = domWindow()) 804 if (DOMWindow* owningWindow = domWindow())
805 return owningWindow; 805 return owningWindow;
806 if (HTMLImport* import = this->import()) 806 if (HTMLImport* import = this->import())
807 return import->master()->domWindow(); 807 return import->master()->domWindow();
808 return 0; 808 return 0;
809 } 809 }
(...skipping 4530 matching lines...) Expand 10 before | Expand all | Expand 10 after
5340 if (!page->focusController().isActive() || !page->focusController().isFocuse d()) 5340 if (!page->focusController().isActive() || !page->focusController().isFocuse d())
5341 return false; 5341 return false;
5342 if (Frame* focusedFrame = page->focusController().focusedFrame()) { 5342 if (Frame* focusedFrame = page->focusController().focusedFrame()) {
5343 if (focusedFrame->tree().isDescendantOf(frame())) 5343 if (focusedFrame->tree().isDescendantOf(frame()))
5344 return true; 5344 return true;
5345 } 5345 }
5346 return false; 5346 return false;
5347 } 5347 }
5348 5348
5349 } // namespace WebCore 5349 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/core.gypi ('k') | Source/core/html/HTMLImport.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698