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

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

Issue 1489253002: Plumb document's strict mixed content checking for RemoteFrames (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: alexmos nits Created 5 years 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 5749 matching lines...) Expand 10 before | Expand all | Expand 10 after
5760 { 5760 {
5761 if (frame()) 5761 if (frame())
5762 return m_frame->frameScheduler()->timerTaskRunner(); 5762 return m_frame->frameScheduler()->timerTaskRunner();
5763 if (m_importsController) 5763 if (m_importsController)
5764 return m_importsController->master()->timerTaskRunner(); 5764 return m_importsController->master()->timerTaskRunner();
5765 if (m_contextDocument) 5765 if (m_contextDocument)
5766 return m_contextDocument->timerTaskRunner(); 5766 return m_contextDocument->timerTaskRunner();
5767 return Platform::current()->currentThread()->scheduler()->timerTaskRunner(); 5767 return Platform::current()->currentThread()->scheduler()->timerTaskRunner();
5768 } 5768 }
5769 5769
5770 void Document::enforceStrictMixedContentChecking()
5771 {
5772 securityContext().setShouldEnforceStrictMixedContentChecking(true);
5773 if (frame())
dcheng 2015/12/16 10:18:19 So I have a dumb question. It looks like the only
estark 2015/12/16 21:01:18 Hmmm... I have no idea. Mike, do you know the answ
5774 frame()->loader().client()->didEnforceStrictMixedContentChecking();
5775 }
5776
5770 DEFINE_TRACE(Document) 5777 DEFINE_TRACE(Document)
5771 { 5778 {
5772 #if ENABLE(OILPAN) 5779 #if ENABLE(OILPAN)
5773 visitor->trace(m_importsController); 5780 visitor->trace(m_importsController);
5774 visitor->trace(m_docType); 5781 visitor->trace(m_docType);
5775 visitor->trace(m_implementation); 5782 visitor->trace(m_implementation);
5776 visitor->trace(m_autofocusElement); 5783 visitor->trace(m_autofocusElement);
5777 visitor->trace(m_focusedElement); 5784 visitor->trace(m_focusedElement);
5778 visitor->trace(m_hoverNode); 5785 visitor->trace(m_hoverNode);
5779 visitor->trace(m_activeHoverElement); 5786 visitor->trace(m_activeHoverElement);
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
5838 #ifndef NDEBUG 5845 #ifndef NDEBUG
5839 using namespace blink; 5846 using namespace blink;
5840 void showLiveDocumentInstances() 5847 void showLiveDocumentInstances()
5841 { 5848 {
5842 Document::WeakDocumentSet& set = Document::liveDocumentSet(); 5849 Document::WeakDocumentSet& set = Document::liveDocumentSet();
5843 fprintf(stderr, "There are %u documents currently alive:\n", set.size()); 5850 fprintf(stderr, "There are %u documents currently alive:\n", set.size());
5844 for (Document* document : set) 5851 for (Document* document : set)
5845 fprintf(stderr, "- Document %p URL: %s\n", document, document->url().str ing().utf8().data()); 5852 fprintf(stderr, "- Document %p URL: %s\n", document, document->url().str ing().utf8().data());
5846 } 5853 }
5847 #endif 5854 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698