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 2708 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2719 if (parser->isParsing()) { | 2719 if (parser->isParsing()) { |
2720 // FIXME: HTML5 doesn't tell us to check this, it might not be correct. | 2720 // FIXME: HTML5 doesn't tell us to check this, it might not be correct. |
2721 if (parser->isExecutingScript()) | 2721 if (parser->isExecutingScript()) |
2722 return; | 2722 return; |
2723 | 2723 |
2724 if (!parser->wasCreatedByScript() && parser->hasInsertionPoint()) | 2724 if (!parser->wasCreatedByScript() && parser->hasInsertionPoint()) |
2725 return; | 2725 return; |
2726 } | 2726 } |
2727 } | 2727 } |
2728 | 2728 |
2729 // PlzNavigate: We should abort ongoing navigations handled by the client. | 2729 if (m_frame->loader().hasProvisionalNavigation()) { |
2730 if (m_frame->loader().hasProvisionalNavigation()) | |
2731 m_frame->loader().stopAllLoaders(); | 2730 m_frame->loader().stopAllLoaders(); |
| 2731 // PlzNavigate: navigations handled by the client should also be |
| 2732 // cancelled. |
| 2733 if (m_frame->loader().client() && |
| 2734 m_frame->settings()->getBrowserSideNavigationEnabled()) { |
| 2735 m_frame->loader().client()->abortClientNavigation(); |
| 2736 } |
| 2737 } |
2732 } | 2738 } |
2733 | 2739 |
2734 removeAllEventListenersRecursively(); | 2740 removeAllEventListenersRecursively(); |
2735 resetTreeScope(); | 2741 resetTreeScope(); |
2736 if (m_frame) | 2742 if (m_frame) |
2737 m_frame->selection().clear(); | 2743 m_frame->selection().clear(); |
2738 implicitOpen(ForceSynchronousParsing); | 2744 implicitOpen(ForceSynchronousParsing); |
2739 if (ScriptableDocumentParser* parser = scriptableDocumentParser()) | 2745 if (ScriptableDocumentParser* parser = scriptableDocumentParser()) |
2740 parser->setWasCreatedByScript(true); | 2746 parser->setWasCreatedByScript(true); |
2741 | 2747 |
(...skipping 3915 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
6657 } | 6663 } |
6658 | 6664 |
6659 void showLiveDocumentInstances() { | 6665 void showLiveDocumentInstances() { |
6660 WeakDocumentSet& set = liveDocumentSet(); | 6666 WeakDocumentSet& set = liveDocumentSet(); |
6661 fprintf(stderr, "There are %u documents currently alive:\n", set.size()); | 6667 fprintf(stderr, "There are %u documents currently alive:\n", set.size()); |
6662 for (blink::Document* document : set) | 6668 for (blink::Document* document : set) |
6663 fprintf(stderr, "- Document %p URL: %s\n", document, | 6669 fprintf(stderr, "- Document %p URL: %s\n", document, |
6664 document->url().getString().utf8().data()); | 6670 document->url().getString().utf8().data()); |
6665 } | 6671 } |
6666 #endif | 6672 #endif |
OLD | NEW |