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

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

Issue 1379543003: Revert of Post loading tasks on the appropriate WebFrameScheduler's queue (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
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
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 5664 matching lines...) Expand 10 before | Expand all | Expand 10 after
5675 if (!context->securityOrigin()->isPotentiallyTrustworthy(err orMessage)) 5675 if (!context->securityOrigin()->isPotentiallyTrustworthy(err orMessage))
5676 return false; 5676 return false;
5677 } 5677 }
5678 } 5678 }
5679 context = context->parentDocument(); 5679 context = context->parentDocument();
5680 } 5680 }
5681 } 5681 }
5682 return true; 5682 return true;
5683 } 5683 }
5684 5684
5685 WebTaskRunner* Document::loadingTaskRunner() const
5686 {
5687 if (frame())
5688 return frame()->frameScheduler()->loadingTaskRunner();
5689 return Platform::current()->currentThread()->scheduler()->loadingTaskRunner( );
5690 }
5691
5692 DEFINE_TRACE(Document) 5685 DEFINE_TRACE(Document)
5693 { 5686 {
5694 #if ENABLE(OILPAN) 5687 #if ENABLE(OILPAN)
5695 visitor->trace(m_importsController); 5688 visitor->trace(m_importsController);
5696 visitor->trace(m_docType); 5689 visitor->trace(m_docType);
5697 visitor->trace(m_implementation); 5690 visitor->trace(m_implementation);
5698 visitor->trace(m_autofocusElement); 5691 visitor->trace(m_autofocusElement);
5699 visitor->trace(m_focusedElement); 5692 visitor->trace(m_focusedElement);
5700 visitor->trace(m_hoverNode); 5693 visitor->trace(m_hoverNode);
5701 visitor->trace(m_activeHoverElement); 5694 visitor->trace(m_activeHoverElement);
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
5761 #ifndef NDEBUG 5754 #ifndef NDEBUG
5762 using namespace blink; 5755 using namespace blink;
5763 void showLiveDocumentInstances() 5756 void showLiveDocumentInstances()
5764 { 5757 {
5765 Document::WeakDocumentSet& set = Document::liveDocumentSet(); 5758 Document::WeakDocumentSet& set = Document::liveDocumentSet();
5766 fprintf(stderr, "There are %u documents currently alive:\n", set.size()); 5759 fprintf(stderr, "There are %u documents currently alive:\n", set.size());
5767 for (Document* document : set) 5760 for (Document* document : set)
5768 fprintf(stderr, "- Document %p URL: %s\n", document, document->url().str ing().utf8().data()); 5761 fprintf(stderr, "- Document %p URL: %s\n", document, document->url().str ing().utf8().data());
5769 } 5762 }
5770 #endif 5763 #endif
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/dom/Document.h ('k') | third_party/WebKit/Source/core/dom/ScriptLoader.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698