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