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

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

Issue 1373113002: Don't change Document load progress in any page dismissal events. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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 | « third_party/WebKit/LayoutTests/fast/events/alert-in-beforeunload-document-write-expected.txt ('k') | no next file » | 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 2355 matching lines...) Expand 10 before | Expand all | Expand 10 after
2366 m_frame->loader().stopAllLoaders(); 2366 m_frame->loader().stopAllLoaders();
2367 } 2367 }
2368 2368
2369 removeAllEventListenersRecursively(); 2369 removeAllEventListenersRecursively();
2370 implicitOpen(ForceSynchronousParsing); 2370 implicitOpen(ForceSynchronousParsing);
2371 if (ScriptableDocumentParser* parser = scriptableDocumentParser()) 2371 if (ScriptableDocumentParser* parser = scriptableDocumentParser())
2372 parser->setWasCreatedByScript(true); 2372 parser->setWasCreatedByScript(true);
2373 2373
2374 if (m_frame) 2374 if (m_frame)
2375 m_frame->loader().didExplicitOpen(); 2375 m_frame->loader().didExplicitOpen();
2376 if (m_loadEventProgress != LoadEventInProgress && m_loadEventProgress != Unl oadEventInProgress) 2376 if (m_loadEventProgress != LoadEventInProgress && pageDismissalEventBeingDis patched() == NoDismissal)
2377 m_loadEventProgress = LoadEventNotRun; 2377 m_loadEventProgress = LoadEventNotRun;
2378 } 2378 }
2379 2379
2380 void Document::detachParser() 2380 void Document::detachParser()
2381 { 2381 {
2382 if (!m_parser) 2382 if (!m_parser)
2383 return; 2383 return;
2384 m_parser->detach(); 2384 m_parser->detach();
2385 m_parser.clear(); 2385 m_parser.clear();
2386 } 2386 }
(...skipping 3367 matching lines...) Expand 10 before | Expand all | Expand 10 after
5754 #ifndef NDEBUG 5754 #ifndef NDEBUG
5755 using namespace blink; 5755 using namespace blink;
5756 void showLiveDocumentInstances() 5756 void showLiveDocumentInstances()
5757 { 5757 {
5758 Document::WeakDocumentSet& set = Document::liveDocumentSet(); 5758 Document::WeakDocumentSet& set = Document::liveDocumentSet();
5759 fprintf(stderr, "There are %u documents currently alive:\n", set.size()); 5759 fprintf(stderr, "There are %u documents currently alive:\n", set.size());
5760 for (Document* document : set) 5760 for (Document* document : set)
5761 fprintf(stderr, "- Document %p URL: %s\n", document, document->url().str ing().utf8().data()); 5761 fprintf(stderr, "- Document %p URL: %s\n", document, document->url().str ing().utf8().data());
5762 } 5762 }
5763 #endif 5763 #endif
OLDNEW
« no previous file with comments | « third_party/WebKit/LayoutTests/fast/events/alert-in-beforeunload-document-write-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698