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

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

Issue 1402933002: Revert "Post loading tasks on the appropriate WebFrameScheduler's queue." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix bad merge 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 5675 matching lines...) Expand 10 before | Expand all | Expand 10 after
5686 if (!context->securityOrigin()->isPotentiallyTrustworthy(err orMessage)) 5686 if (!context->securityOrigin()->isPotentiallyTrustworthy(err orMessage))
5687 return false; 5687 return false;
5688 } 5688 }
5689 } 5689 }
5690 context = context->parentDocument(); 5690 context = context->parentDocument();
5691 } 5691 }
5692 } 5692 }
5693 return true; 5693 return true;
5694 } 5694 }
5695 5695
5696 WebTaskRunner* Document::loadingTaskRunner() const
5697 {
5698 if (frame())
5699 return frame()->frameScheduler()->loadingTaskRunner();
5700 return Platform::current()->currentThread()->scheduler()->loadingTaskRunner( );
5701 }
5702
5703 DEFINE_TRACE(Document) 5696 DEFINE_TRACE(Document)
5704 { 5697 {
5705 #if ENABLE(OILPAN) 5698 #if ENABLE(OILPAN)
5706 visitor->trace(m_importsController); 5699 visitor->trace(m_importsController);
5707 visitor->trace(m_docType); 5700 visitor->trace(m_docType);
5708 visitor->trace(m_implementation); 5701 visitor->trace(m_implementation);
5709 visitor->trace(m_autofocusElement); 5702 visitor->trace(m_autofocusElement);
5710 visitor->trace(m_focusedElement); 5703 visitor->trace(m_focusedElement);
5711 visitor->trace(m_hoverNode); 5704 visitor->trace(m_hoverNode);
5712 visitor->trace(m_activeHoverElement); 5705 visitor->trace(m_activeHoverElement);
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
5772 #ifndef NDEBUG 5765 #ifndef NDEBUG
5773 using namespace blink; 5766 using namespace blink;
5774 void showLiveDocumentInstances() 5767 void showLiveDocumentInstances()
5775 { 5768 {
5776 Document::WeakDocumentSet& set = Document::liveDocumentSet(); 5769 Document::WeakDocumentSet& set = Document::liveDocumentSet();
5777 fprintf(stderr, "There are %u documents currently alive:\n", set.size()); 5770 fprintf(stderr, "There are %u documents currently alive:\n", set.size());
5778 for (Document* document : set) 5771 for (Document* document : set)
5779 fprintf(stderr, "- Document %p URL: %s\n", document, document->url().str ing().utf8().data()); 5772 fprintf(stderr, "- Document %p URL: %s\n", document, document->url().str ing().utf8().data());
5780 } 5773 }
5781 #endif 5774 #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