OLD | NEW |
---|---|
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 | 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011, 2012 Apple Inc. All |
7 * rights reserved. | 7 * rights reserved. |
8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. | 8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. |
9 * (http://www.torchmobile.com/) | 9 * (http://www.torchmobile.com/) |
10 * Copyright (C) 2008, 2009, 2011, 2012 Google Inc. All rights reserved. | 10 * Copyright (C) 2008, 2009, 2011, 2012 Google Inc. All rights reserved. |
(...skipping 2643 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2654 if (parser->isParsing()) { | 2654 if (parser->isParsing()) { |
2655 // FIXME: HTML5 doesn't tell us to check this, it might not be correct. | 2655 // FIXME: HTML5 doesn't tell us to check this, it might not be correct. |
2656 if (parser->isExecutingScript()) | 2656 if (parser->isExecutingScript()) |
2657 return; | 2657 return; |
2658 | 2658 |
2659 if (!parser->wasCreatedByScript() && parser->hasInsertionPoint()) | 2659 if (!parser->wasCreatedByScript() && parser->hasInsertionPoint()) |
2660 return; | 2660 return; |
2661 } | 2661 } |
2662 } | 2662 } |
2663 | 2663 |
2664 if (m_frame->loader().provisionalDocumentLoader()) | 2664 // PlzNavigate: We should abort ongoing navigations handled by the client. |
2665 if (m_frame->loader().provisionalDocumentLoader() || | |
2666 (m_frame->settings()->getBrowserSideNavigationEnabled() && | |
2667 m_frame->loader().navigationHandledByClient())) { | |
Nate Chapin
2017/01/12 19:59:26
Do you have any sense how many other callers of pr
ananta
2017/01/12 20:36:55
Added the function and called it from here and fro
| |
2665 m_frame->loader().stopAllLoaders(); | 2668 m_frame->loader().stopAllLoaders(); |
2669 } | |
2666 } | 2670 } |
2667 | 2671 |
2668 removeAllEventListenersRecursively(); | 2672 removeAllEventListenersRecursively(); |
2669 implicitOpen(ForceSynchronousParsing); | 2673 implicitOpen(ForceSynchronousParsing); |
2670 if (ScriptableDocumentParser* parser = scriptableDocumentParser()) | 2674 if (ScriptableDocumentParser* parser = scriptableDocumentParser()) |
2671 parser->setWasCreatedByScript(true); | 2675 parser->setWasCreatedByScript(true); |
2672 | 2676 |
2673 if (m_frame) | 2677 if (m_frame) |
2674 m_frame->loader().didExplicitOpen(); | 2678 m_frame->loader().didExplicitOpen(); |
2675 if (m_loadEventProgress != LoadEventInProgress && | 2679 if (m_loadEventProgress != LoadEventInProgress && |
(...skipping 3907 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
6583 } | 6587 } |
6584 | 6588 |
6585 void showLiveDocumentInstances() { | 6589 void showLiveDocumentInstances() { |
6586 WeakDocumentSet& set = liveDocumentSet(); | 6590 WeakDocumentSet& set = liveDocumentSet(); |
6587 fprintf(stderr, "There are %u documents currently alive:\n", set.size()); | 6591 fprintf(stderr, "There are %u documents currently alive:\n", set.size()); |
6588 for (Document* document : set) | 6592 for (Document* document : set) |
6589 fprintf(stderr, "- Document %p URL: %s\n", document, | 6593 fprintf(stderr, "- Document %p URL: %s\n", document, |
6590 document->url().getString().utf8().data()); | 6594 document->url().getString().utf8().data()); |
6591 } | 6595 } |
6592 #endif | 6596 #endif |
OLD | NEW |