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

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: fix 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 429 matching lines...) Expand 10 before | Expand all | Expand 10 after
440 , m_registrationContext(initializer.registrationContext(this)) 440 , m_registrationContext(initializer.registrationContext(this))
441 , m_elementDataCacheClearTimer(this, &Document::elementDataCacheClearTimerFi red) 441 , m_elementDataCacheClearTimer(this, &Document::elementDataCacheClearTimerFi red)
442 , m_timeline(AnimationTimeline::create(this)) 442 , m_timeline(AnimationTimeline::create(this))
443 , m_templateDocumentHost(nullptr) 443 , m_templateDocumentHost(nullptr)
444 , m_didAssociateFormControlsTimer(this, &Document::didAssociateFormControlsT imerFired) 444 , m_didAssociateFormControlsTimer(this, &Document::didAssociateFormControlsT imerFired)
445 , m_timers(timerTaskRunner()->adoptClone()) 445 , m_timers(timerTaskRunner()->adoptClone())
446 , m_hasViewportUnits(false) 446 , m_hasViewportUnits(false)
447 , m_styleRecalcElementCounter(0) 447 , m_styleRecalcElementCounter(0)
448 , m_parserSyncPolicy(AllowAsynchronousParsing) 448 , m_parserSyncPolicy(AllowAsynchronousParsing)
449 , m_nodeCount(0) 449 , m_nodeCount(0)
450 , m_strictMixedContentCheckingEnforced(false)
450 { 451 {
451 if (m_frame) { 452 if (m_frame) {
452 ASSERT(m_frame->page()); 453 ASSERT(m_frame->page());
453 provideContextFeaturesToDocumentFrom(*this, *m_frame->page()); 454 provideContextFeaturesToDocumentFrom(*this, *m_frame->page());
454 455
455 m_fetcher = m_frame->loader().documentLoader()->fetcher(); 456 m_fetcher = m_frame->loader().documentLoader()->fetcher();
456 FrameFetchContext::provideDocumentToContext(m_fetcher->context(), this); 457 FrameFetchContext::provideDocumentToContext(m_fetcher->context(), this);
457 } else if (m_importsController) { 458 } else if (m_importsController) {
458 m_fetcher = FrameFetchContext::createContextAndFetcher(nullptr); 459 m_fetcher = FrameFetchContext::createContextAndFetcher(nullptr);
459 FrameFetchContext::provideDocumentToContext(m_fetcher->context(), this); 460 FrameFetchContext::provideDocumentToContext(m_fetcher->context(), this);
(...skipping 5282 matching lines...) Expand 10 before | Expand all | Expand 10 after
5742 return Platform::current()->currentThread()->scheduler()->loadingTaskRunner( ); 5743 return Platform::current()->currentThread()->scheduler()->loadingTaskRunner( );
5743 } 5744 }
5744 5745
5745 WebTaskRunner* Document::timerTaskRunner() const 5746 WebTaskRunner* Document::timerTaskRunner() const
5746 { 5747 {
5747 if (frame()) 5748 if (frame())
5748 return m_frame->frameScheduler()->timerTaskRunner(); 5749 return m_frame->frameScheduler()->timerTaskRunner();
5749 return Platform::current()->currentThread()->scheduler()->timerTaskRunner(); 5750 return Platform::current()->currentThread()->scheduler()->timerTaskRunner();
5750 } 5751 }
5751 5752
5753 void Document::enforceStrictMixedContentChecking()
5754 {
5755 m_strictMixedContentCheckingEnforced = true;
5756 if (frame())
5757 frame()->loader().client()->didChangeShouldEnforceStrictMixedContentChec king(true);
alexmos 2015/12/03 20:43:26 It seems that Blink only ever flips the bit from f
estark 2015/12/04 00:19:31 Done for the render frame -> browser API. The brow
alexmos 2015/12/04 23:41:11 Acknowledged.
5758 }
5759
5752 DEFINE_TRACE(Document) 5760 DEFINE_TRACE(Document)
5753 { 5761 {
5754 #if ENABLE(OILPAN) 5762 #if ENABLE(OILPAN)
5755 visitor->trace(m_importsController); 5763 visitor->trace(m_importsController);
5756 visitor->trace(m_docType); 5764 visitor->trace(m_docType);
5757 visitor->trace(m_implementation); 5765 visitor->trace(m_implementation);
5758 visitor->trace(m_autofocusElement); 5766 visitor->trace(m_autofocusElement);
5759 visitor->trace(m_focusedElement); 5767 visitor->trace(m_focusedElement);
5760 visitor->trace(m_hoverNode); 5768 visitor->trace(m_hoverNode);
5761 visitor->trace(m_activeHoverElement); 5769 visitor->trace(m_activeHoverElement);
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
5820 #ifndef NDEBUG 5828 #ifndef NDEBUG
5821 using namespace blink; 5829 using namespace blink;
5822 void showLiveDocumentInstances() 5830 void showLiveDocumentInstances()
5823 { 5831 {
5824 Document::WeakDocumentSet& set = Document::liveDocumentSet(); 5832 Document::WeakDocumentSet& set = Document::liveDocumentSet();
5825 fprintf(stderr, "There are %u documents currently alive:\n", set.size()); 5833 fprintf(stderr, "There are %u documents currently alive:\n", set.size());
5826 for (Document* document : set) 5834 for (Document* document : set)
5827 fprintf(stderr, "- Document %p URL: %s\n", document, document->url().str ing().utf8().data()); 5835 fprintf(stderr, "- Document %p URL: %s\n", document, document->url().str ing().utf8().data());
5828 } 5836 }
5829 #endif 5837 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698