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

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

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 test comments 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, 2010, 2012 Apple Inc. All r ights reserved. 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 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) 2010 Nokia Corporation and/or its subsidiary(-ies) 8 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
9 * Copyright (C) 2011 Google Inc. All rights reserved. 9 * Copyright (C) 2011 Google Inc. All rights reserved.
10 * 10 *
(...skipping 1030 matching lines...) Expand 10 before | Expand all | Expand 10 after
1041 m_nodeCount--; 1041 m_nodeCount--;
1042 } 1042 }
1043 int nodeCount() const { return m_nodeCount; } 1043 int nodeCount() const { return m_nodeCount; }
1044 1044
1045 using WeakDocumentSet = WillBeHeapHashSet<RawPtrWillBeWeakMember<Document>>; 1045 using WeakDocumentSet = WillBeHeapHashSet<RawPtrWillBeWeakMember<Document>>;
1046 static WeakDocumentSet& liveDocumentSet(); 1046 static WeakDocumentSet& liveDocumentSet();
1047 1047
1048 WebTaskRunner* loadingTaskRunner() const; 1048 WebTaskRunner* loadingTaskRunner() const;
1049 WebTaskRunner* timerTaskRunner() const; 1049 WebTaskRunner* timerTaskRunner() const;
1050 1050
1051 void enforceStrictMixedContentChecking();
1052 bool shouldEnforceStrictMixedContentChecking() const { return m_strictMixedC ontentCheckingEnforced; }
alexmos 2015/12/15 17:49:17 This isn't needed anymore, right? A Document can
estark 2015/12/15 21:28:50 Done.
1053
1051 protected: 1054 protected:
1052 Document(const DocumentInit&, DocumentClassFlags = DefaultDocumentClass); 1055 Document(const DocumentInit&, DocumentClassFlags = DefaultDocumentClass);
1053 1056
1054 void didUpdateSecurityOrigin() final; 1057 void didUpdateSecurityOrigin() final;
1055 1058
1056 void clearXMLVersion() { m_xmlVersion = String(); } 1059 void clearXMLVersion() { m_xmlVersion = String(); }
1057 1060
1058 #if !ENABLE(OILPAN) 1061 #if !ENABLE(OILPAN)
1059 void dispose() override; 1062 void dispose() override;
1060 #endif 1063 #endif
(...skipping 323 matching lines...) Expand 10 before | Expand all | Expand 10 after
1384 1387
1385 ParserSynchronizationPolicy m_parserSyncPolicy; 1388 ParserSynchronizationPolicy m_parserSyncPolicy;
1386 1389
1387 OriginsUsingFeatures::Value m_originsUsingFeaturesValue; 1390 OriginsUsingFeatures::Value m_originsUsingFeaturesValue;
1388 1391
1389 ClientHintsPreferences m_clientHintsPreferences; 1392 ClientHintsPreferences m_clientHintsPreferences;
1390 1393
1391 PersistentWillBeMember<CanvasFontCache> m_canvasFontCache; 1394 PersistentWillBeMember<CanvasFontCache> m_canvasFontCache;
1392 1395
1393 int m_nodeCount; 1396 int m_nodeCount;
1397
1398 bool m_strictMixedContentCheckingEnforced;
alexmos 2015/12/15 17:49:17 ditto
estark 2015/12/15 21:28:50 Done.
1394 }; 1399 };
1395 1400
1396 extern template class CORE_EXTERN_TEMPLATE_EXPORT WillBeHeapSupplement<Document> ; 1401 extern template class CORE_EXTERN_TEMPLATE_EXPORT WillBeHeapSupplement<Document> ;
1397 1402
1398 inline bool Document::shouldOverrideLegacyDescription(ViewportDescription::Type origin) 1403 inline bool Document::shouldOverrideLegacyDescription(ViewportDescription::Type origin)
1399 { 1404 {
1400 // The different (legacy) meta tags have different priorities based on the t ype 1405 // The different (legacy) meta tags have different priorities based on the t ype
1401 // regardless of which order they appear in the DOM. The priority is given b y the 1406 // regardless of which order they appear in the DOM. The priority is given b y the
1402 // ViewportDescription::Type enum. 1407 // ViewportDescription::Type enum.
1403 return origin >= m_legacyViewportDescription.type; 1408 return origin >= m_legacyViewportDescription.type;
(...skipping 29 matching lines...) Expand all
1433 DEFINE_TYPE_CASTS(TreeScope, Document, document, true, true); 1438 DEFINE_TYPE_CASTS(TreeScope, Document, document, true, true);
1434 1439
1435 } // namespace blink 1440 } // namespace blink
1436 1441
1437 #ifndef NDEBUG 1442 #ifndef NDEBUG
1438 // Outside the WebCore namespace for ease of invocation from gdb. 1443 // Outside the WebCore namespace for ease of invocation from gdb.
1439 CORE_EXPORT void showLiveDocumentInstances(); 1444 CORE_EXPORT void showLiveDocumentInstances();
1440 #endif 1445 #endif
1441 1446
1442 #endif // Document_h 1447 #endif // Document_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698