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

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

Issue 1156663003: Adjust FrameFetchContext clearing logic when clearing HTMLImportsController (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 7 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
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 802 matching lines...) Expand 10 before | Expand all | Expand 10 after
813 { 813 {
814 if (!m_customElementMicrotaskRunQueue) 814 if (!m_customElementMicrotaskRunQueue)
815 m_customElementMicrotaskRunQueue = CustomElementMicrotaskRunQueue::creat e(); 815 m_customElementMicrotaskRunQueue = CustomElementMicrotaskRunQueue::creat e();
816 return m_customElementMicrotaskRunQueue.get(); 816 return m_customElementMicrotaskRunQueue.get();
817 } 817 }
818 818
819 void Document::setImportsController(HTMLImportsController* controller) 819 void Document::setImportsController(HTMLImportsController* controller)
820 { 820 {
821 ASSERT(!m_importsController || !controller); 821 ASSERT(!m_importsController || !controller);
822 m_importsController = controller; 822 m_importsController = controller;
823 if (!m_importsController) 823 if (!m_importsController && !loader())
824 m_fetcher->clearContext(); 824 m_fetcher->clearContext();
825 } 825 }
826 826
827 HTMLImportLoader* Document::importLoader() const 827 HTMLImportLoader* Document::importLoader() const
828 { 828 {
829 if (!m_importsController) 829 if (!m_importsController)
830 return 0; 830 return 0;
831 return m_importsController->loaderFor(*this); 831 return m_importsController->loaderFor(*this);
832 } 832 }
833 833
(...skipping 4853 matching lines...) Expand 10 before | Expand all | Expand 10 after
5687 #ifndef NDEBUG 5687 #ifndef NDEBUG
5688 using namespace blink; 5688 using namespace blink;
5689 void showLiveDocumentInstances() 5689 void showLiveDocumentInstances()
5690 { 5690 {
5691 WeakDocumentSet& set = liveDocumentSet(); 5691 WeakDocumentSet& set = liveDocumentSet();
5692 fprintf(stderr, "There are %u documents currently alive:\n", set.size()); 5692 fprintf(stderr, "There are %u documents currently alive:\n", set.size());
5693 for (Document* document : set) 5693 for (Document* document : set)
5694 fprintf(stderr, "- Document %p URL: %s\n", document, document->url().str ing().utf8().data()); 5694 fprintf(stderr, "- Document %p URL: %s\n", document, document->url().str ing().utf8().data());
5695 } 5695 }
5696 #endif 5696 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698