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

Side by Side Diff: WebCore/dom/Document.cpp

Issue 3776004: Revert 66670 - 2010-09-01 Tony Gentilcore <tonyg@chromium.org>... (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/517/
Patch Set: Created 10 years, 2 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
« no previous file with comments | « LayoutTests/http/tests/misc/script-defer-expected.txt ('k') | WebCore/dom/DocumentParser.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 Apple Inc. All rights reserv ed. 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserv ed.
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 Google Inc. All rights reserved. 8 * Copyright (C) 2008, 2009 Google Inc. All rights reserved.
9 * 9 *
10 * This library is free software; you can redistribute it and/or 10 * This library is free software; you can redistribute it and/or
(...skipping 1813 matching lines...) Expand 10 before | Expand all | Expand 10 after
1824 void Document::open(Document* ownerDocument) 1824 void Document::open(Document* ownerDocument)
1825 { 1825 {
1826 if (ownerDocument) { 1826 if (ownerDocument) {
1827 setURL(ownerDocument->url()); 1827 setURL(ownerDocument->url());
1828 m_cookieURL = ownerDocument->cookieURL(); 1828 m_cookieURL = ownerDocument->cookieURL();
1829 ScriptExecutionContext::setSecurityOrigin(ownerDocument->securityOrigin( )); 1829 ScriptExecutionContext::setSecurityOrigin(ownerDocument->securityOrigin( ));
1830 } 1830 }
1831 1831
1832 if (m_frame) { 1832 if (m_frame) {
1833 ScriptableDocumentParser* parser = scriptableDocumentParser(); 1833 ScriptableDocumentParser* parser = scriptableDocumentParser();
1834 if (m_frame->loader()->isLoadingMainResource() || (parser && parser->isP arsing() && parser->isExecutingScript())) 1834 if (m_frame->loader()->isLoadingMainResource() || (parser && parser->isE xecutingScript()))
1835 return; 1835 return;
1836 1836
1837 if (m_frame->loader()->state() == FrameStateProvisional) 1837 if (m_frame->loader()->state() == FrameStateProvisional)
1838 m_frame->loader()->stopAllLoaders(); 1838 m_frame->loader()->stopAllLoaders();
1839 } 1839 }
1840 1840
1841 implicitOpen(); 1841 implicitOpen();
1842 1842
1843 if (DOMWindow* domWindow = this->domWindow()) 1843 if (DOMWindow* domWindow = this->domWindow())
1844 domWindow->removeAllEventListeners(); 1844 domWindow->removeAllEventListeners();
(...skipping 2935 matching lines...) Expand 10 before | Expand all | Expand 10 after
4780 m_loadEventDelayTimer.startOneShot(0); 4780 m_loadEventDelayTimer.startOneShot(0);
4781 } 4781 }
4782 4782
4783 void Document::loadEventDelayTimerFired(Timer<Document>*) 4783 void Document::loadEventDelayTimerFired(Timer<Document>*)
4784 { 4784 {
4785 if (frame()) 4785 if (frame())
4786 frame()->loader()->checkCompleted(); 4786 frame()->loader()->checkCompleted();
4787 } 4787 }
4788 4788
4789 } // namespace WebCore 4789 } // namespace WebCore
OLDNEW
« no previous file with comments | « LayoutTests/http/tests/misc/script-defer-expected.txt ('k') | WebCore/dom/DocumentParser.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698