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

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: 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, 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 1027 matching lines...) Expand 10 before | Expand all | Expand 10 after
1038 m_nodeCount--; 1038 m_nodeCount--;
1039 } 1039 }
1040 int nodeCount() const { return m_nodeCount; } 1040 int nodeCount() const { return m_nodeCount; }
1041 1041
1042 using WeakDocumentSet = WillBeHeapHashSet<RawPtrWillBeWeakMember<Document>>; 1042 using WeakDocumentSet = WillBeHeapHashSet<RawPtrWillBeWeakMember<Document>>;
1043 static WeakDocumentSet& liveDocumentSet(); 1043 static WeakDocumentSet& liveDocumentSet();
1044 1044
1045 WebTaskRunner* loadingTaskRunner() const; 1045 WebTaskRunner* loadingTaskRunner() const;
1046 WebTaskRunner* timerTaskRunner() const; 1046 WebTaskRunner* timerTaskRunner() const;
1047 1047
1048 void enforceStrictMixedContentChecking();
1049 bool shouldEnforceStrictMixedContentChecking() const { return m_strictMixedC ontentCheckingEnforced; }
1050
1048 protected: 1051 protected:
1049 Document(const DocumentInit&, DocumentClassFlags = DefaultDocumentClass); 1052 Document(const DocumentInit&, DocumentClassFlags = DefaultDocumentClass);
1050 1053
1051 void didUpdateSecurityOrigin() final; 1054 void didUpdateSecurityOrigin() final;
1052 1055
1053 void clearXMLVersion() { m_xmlVersion = String(); } 1056 void clearXMLVersion() { m_xmlVersion = String(); }
1054 1057
1055 #if !ENABLE(OILPAN) 1058 #if !ENABLE(OILPAN)
1056 void dispose() override; 1059 void dispose() override;
1057 #endif 1060 #endif
(...skipping 323 matching lines...) Expand 10 before | Expand all | Expand 10 after
1381 1384
1382 ParserSynchronizationPolicy m_parserSyncPolicy; 1385 ParserSynchronizationPolicy m_parserSyncPolicy;
1383 1386
1384 OriginsUsingFeatures::Value m_originsUsingFeaturesValue; 1387 OriginsUsingFeatures::Value m_originsUsingFeaturesValue;
1385 1388
1386 ClientHintsPreferences m_clientHintsPreferences; 1389 ClientHintsPreferences m_clientHintsPreferences;
1387 1390
1388 PersistentWillBeMember<CanvasFontCache> m_canvasFontCache; 1391 PersistentWillBeMember<CanvasFontCache> m_canvasFontCache;
1389 1392
1390 int m_nodeCount; 1393 int m_nodeCount;
1394
1395 bool m_strictMixedContentCheckingEnforced;
1391 }; 1396 };
1392 1397
1393 extern template class CORE_EXTERN_TEMPLATE_EXPORT WillBeHeapSupplement<Document> ; 1398 extern template class CORE_EXTERN_TEMPLATE_EXPORT WillBeHeapSupplement<Document> ;
1394 1399
1395 inline bool Document::shouldOverrideLegacyDescription(ViewportDescription::Type origin) 1400 inline bool Document::shouldOverrideLegacyDescription(ViewportDescription::Type origin)
1396 { 1401 {
1397 // The different (legacy) meta tags have different priorities based on the t ype 1402 // The different (legacy) meta tags have different priorities based on the t ype
1398 // regardless of which order they appear in the DOM. The priority is given b y the 1403 // regardless of which order they appear in the DOM. The priority is given b y the
1399 // ViewportDescription::Type enum. 1404 // ViewportDescription::Type enum.
1400 return origin >= m_legacyViewportDescription.type; 1405 return origin >= m_legacyViewportDescription.type;
(...skipping 29 matching lines...) Expand all
1430 DEFINE_TYPE_CASTS(TreeScope, Document, document, true, true); 1435 DEFINE_TYPE_CASTS(TreeScope, Document, document, true, true);
1431 1436
1432 } // namespace blink 1437 } // namespace blink
1433 1438
1434 #ifndef NDEBUG 1439 #ifndef NDEBUG
1435 // Outside the WebCore namespace for ease of invocation from gdb. 1440 // Outside the WebCore namespace for ease of invocation from gdb.
1436 CORE_EXPORT void showLiveDocumentInstances(); 1441 CORE_EXPORT void showLiveDocumentInstances();
1437 #endif 1442 #endif
1438 1443
1439 #endif // Document_h 1444 #endif // Document_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698