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

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

Issue 1415773002: Don't change Document load progress in any page dismissal events. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2490
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 2333 matching lines...) Expand 10 before | Expand all | Expand 10 after
2344 m_frame->loader().stopAllLoaders(); 2344 m_frame->loader().stopAllLoaders();
2345 } 2345 }
2346 2346
2347 removeAllEventListenersRecursively(); 2347 removeAllEventListenersRecursively();
2348 implicitOpen(ForceSynchronousParsing); 2348 implicitOpen(ForceSynchronousParsing);
2349 if (ScriptableDocumentParser* parser = scriptableDocumentParser()) 2349 if (ScriptableDocumentParser* parser = scriptableDocumentParser())
2350 parser->setWasCreatedByScript(true); 2350 parser->setWasCreatedByScript(true);
2351 2351
2352 if (m_frame) 2352 if (m_frame)
2353 m_frame->loader().didExplicitOpen(); 2353 m_frame->loader().didExplicitOpen();
2354 if (m_loadEventProgress != LoadEventInProgress && m_loadEventProgress != Unl oadEventInProgress) 2354 if (m_loadEventProgress != LoadEventInProgress && pageDismissalEventBeingDis patched() == NoDismissal)
2355 m_loadEventProgress = LoadEventNotRun; 2355 m_loadEventProgress = LoadEventNotRun;
2356 } 2356 }
2357 2357
2358 void Document::detachParser() 2358 void Document::detachParser()
2359 { 2359 {
2360 if (!m_parser) 2360 if (!m_parser)
2361 return; 2361 return;
2362 m_parser->detach(); 2362 m_parser->detach();
2363 m_parser.clear(); 2363 m_parser.clear();
2364 } 2364 }
(...skipping 3346 matching lines...) Expand 10 before | Expand all | Expand 10 after
5711 #ifndef NDEBUG 5711 #ifndef NDEBUG
5712 using namespace blink; 5712 using namespace blink;
5713 void showLiveDocumentInstances() 5713 void showLiveDocumentInstances()
5714 { 5714 {
5715 Document::WeakDocumentSet& set = Document::liveDocumentSet(); 5715 Document::WeakDocumentSet& set = Document::liveDocumentSet();
5716 fprintf(stderr, "There are %u documents currently alive:\n", set.size()); 5716 fprintf(stderr, "There are %u documents currently alive:\n", set.size());
5717 for (Document* document : set) 5717 for (Document* document : set)
5718 fprintf(stderr, "- Document %p URL: %s\n", document, document->url().str ing().utf8().data()); 5718 fprintf(stderr, "- Document %p URL: %s\n", document, document->url().str ing().utf8().data());
5719 } 5719 }
5720 #endif 5720 #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