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

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

Issue 1743623002: [Experimental Framework] Make the OriginTrialContext a member of ExecutionContext (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix nullptr crash, test that an error message was set Created 4 years, 9 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 165 matching lines...) Expand 10 before | Expand all | Expand 10 after
176 #include "core/layout/TextAutosizer.h" 176 #include "core/layout/TextAutosizer.h"
177 #include "core/layout/compositing/PaintLayerCompositor.h" 177 #include "core/layout/compositing/PaintLayerCompositor.h"
178 #include "core/loader/CookieJar.h" 178 #include "core/loader/CookieJar.h"
179 #include "core/loader/DocumentLoader.h" 179 #include "core/loader/DocumentLoader.h"
180 #include "core/loader/FrameFetchContext.h" 180 #include "core/loader/FrameFetchContext.h"
181 #include "core/loader/FrameLoader.h" 181 #include "core/loader/FrameLoader.h"
182 #include "core/loader/FrameLoaderClient.h" 182 #include "core/loader/FrameLoaderClient.h"
183 #include "core/loader/ImageLoader.h" 183 #include "core/loader/ImageLoader.h"
184 #include "core/loader/NavigationScheduler.h" 184 #include "core/loader/NavigationScheduler.h"
185 #include "core/loader/appcache/ApplicationCacheHost.h" 185 #include "core/loader/appcache/ApplicationCacheHost.h"
186 #include "core/origin_trials/DocumentOriginTrialContext.h"
186 #include "core/page/ChromeClient.h" 187 #include "core/page/ChromeClient.h"
187 #include "core/page/EventWithHitTestResults.h" 188 #include "core/page/EventWithHitTestResults.h"
188 #include "core/page/FocusController.h" 189 #include "core/page/FocusController.h"
189 #include "core/page/FrameTree.h" 190 #include "core/page/FrameTree.h"
190 #include "core/page/Page.h" 191 #include "core/page/Page.h"
191 #include "core/page/PointerLockController.h" 192 #include "core/page/PointerLockController.h"
192 #include "core/page/scrolling/ScrollingCoordinator.h" 193 #include "core/page/scrolling/ScrollingCoordinator.h"
193 #include "core/svg/SVGDocumentExtensions.h" 194 #include "core/svg/SVGDocumentExtensions.h"
194 #include "core/svg/SVGTitleElement.h" 195 #include "core/svg/SVGTitleElement.h"
195 #include "core/svg/SVGUseElement.h" 196 #include "core/svg/SVGUseElement.h"
(...skipping 5718 matching lines...) Expand 10 before | Expand all | Expand 10 after
5914 return Platform::current()->currentThread()->scheduler()->timerTaskRunner(); 5915 return Platform::current()->currentThread()->scheduler()->timerTaskRunner();
5915 } 5916 }
5916 5917
5917 void Document::enforceStrictMixedContentChecking() 5918 void Document::enforceStrictMixedContentChecking()
5918 { 5919 {
5919 securityContext().setShouldEnforceStrictMixedContentChecking(true); 5920 securityContext().setShouldEnforceStrictMixedContentChecking(true);
5920 if (frame()) 5921 if (frame())
5921 frame()->loader().client()->didEnforceStrictMixedContentChecking(); 5922 frame()->loader().client()->didEnforceStrictMixedContentChecking();
5922 } 5923 }
5923 5924
5925 OriginTrialContext* Document::originTrialContext()
5926 {
5927 if (!m_originTrialContext) {
5928 m_originTrialContext = adoptPtr(new DocumentOriginTrialContext(this));
5929 }
5930 return m_originTrialContext.get();
5931 }
5932
5924 DEFINE_TRACE(Document) 5933 DEFINE_TRACE(Document)
5925 { 5934 {
5926 #if ENABLE(OILPAN) 5935 #if ENABLE(OILPAN)
5927 visitor->trace(m_importsController); 5936 visitor->trace(m_importsController);
5928 visitor->trace(m_docType); 5937 visitor->trace(m_docType);
5929 visitor->trace(m_implementation); 5938 visitor->trace(m_implementation);
5930 visitor->trace(m_autofocusElement); 5939 visitor->trace(m_autofocusElement);
5931 visitor->trace(m_focusedElement); 5940 visitor->trace(m_focusedElement);
5932 visitor->trace(m_sequentialFocusNavigationStartingPoint); 5941 visitor->trace(m_sequentialFocusNavigationStartingPoint);
5933 visitor->trace(m_hoverNode); 5942 visitor->trace(m_hoverNode);
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
5995 #ifndef NDEBUG 6004 #ifndef NDEBUG
5996 using namespace blink; 6005 using namespace blink;
5997 void showLiveDocumentInstances() 6006 void showLiveDocumentInstances()
5998 { 6007 {
5999 Document::WeakDocumentSet& set = Document::liveDocumentSet(); 6008 Document::WeakDocumentSet& set = Document::liveDocumentSet();
6000 fprintf(stderr, "There are %u documents currently alive:\n", set.size()); 6009 fprintf(stderr, "There are %u documents currently alive:\n", set.size());
6001 for (Document* document : set) 6010 for (Document* document : set)
6002 fprintf(stderr, "- Document %p URL: %s\n", document, document->url().str ing().utf8().data()); 6011 fprintf(stderr, "- Document %p URL: %s\n", document, document->url().str ing().utf8().data());
6003 } 6012 }
6004 #endif 6013 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698