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

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: Rebase 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 166 matching lines...) Expand 10 before | Expand all | Expand 10 after
177 #include "core/layout/TextAutosizer.h" 177 #include "core/layout/TextAutosizer.h"
178 #include "core/layout/compositing/PaintLayerCompositor.h" 178 #include "core/layout/compositing/PaintLayerCompositor.h"
179 #include "core/loader/CookieJar.h" 179 #include "core/loader/CookieJar.h"
180 #include "core/loader/DocumentLoader.h" 180 #include "core/loader/DocumentLoader.h"
181 #include "core/loader/FrameFetchContext.h" 181 #include "core/loader/FrameFetchContext.h"
182 #include "core/loader/FrameLoader.h" 182 #include "core/loader/FrameLoader.h"
183 #include "core/loader/FrameLoaderClient.h" 183 #include "core/loader/FrameLoaderClient.h"
184 #include "core/loader/ImageLoader.h" 184 #include "core/loader/ImageLoader.h"
185 #include "core/loader/NavigationScheduler.h" 185 #include "core/loader/NavigationScheduler.h"
186 #include "core/loader/appcache/ApplicationCacheHost.h" 186 #include "core/loader/appcache/ApplicationCacheHost.h"
187 #include "core/origin_trials/DocumentOriginTrialContext.h"
187 #include "core/page/ChromeClient.h" 188 #include "core/page/ChromeClient.h"
188 #include "core/page/EventWithHitTestResults.h" 189 #include "core/page/EventWithHitTestResults.h"
189 #include "core/page/FocusController.h" 190 #include "core/page/FocusController.h"
190 #include "core/page/FrameTree.h" 191 #include "core/page/FrameTree.h"
191 #include "core/page/Page.h" 192 #include "core/page/Page.h"
192 #include "core/page/PointerLockController.h" 193 #include "core/page/PointerLockController.h"
193 #include "core/page/scrolling/ScrollingCoordinator.h" 194 #include "core/page/scrolling/ScrollingCoordinator.h"
194 #include "core/svg/SVGDocumentExtensions.h" 195 #include "core/svg/SVGDocumentExtensions.h"
195 #include "core/svg/SVGTitleElement.h" 196 #include "core/svg/SVGTitleElement.h"
196 #include "core/svg/SVGUseElement.h" 197 #include "core/svg/SVGUseElement.h"
(...skipping 5712 matching lines...) Expand 10 before | Expand all | Expand 10 after
5909 return Platform::current()->currentThread()->scheduler()->timerTaskRunner(); 5910 return Platform::current()->currentThread()->scheduler()->timerTaskRunner();
5910 } 5911 }
5911 5912
5912 void Document::enforceStrictMixedContentChecking() 5913 void Document::enforceStrictMixedContentChecking()
5913 { 5914 {
5914 securityContext().setShouldEnforceStrictMixedContentChecking(true); 5915 securityContext().setShouldEnforceStrictMixedContentChecking(true);
5915 if (frame()) 5916 if (frame())
5916 frame()->loader().client()->didEnforceStrictMixedContentChecking(); 5917 frame()->loader().client()->didEnforceStrictMixedContentChecking();
5917 } 5918 }
5918 5919
5920 PassOwnPtrWillBeRawPtr<OriginTrialContext> Document::createOriginTrialContext()
5921 {
5922 return adoptPtrWillBeNoop(new DocumentOriginTrialContext(this));
5923 }
5924
5919 DEFINE_TRACE(Document) 5925 DEFINE_TRACE(Document)
5920 { 5926 {
5921 #if ENABLE(OILPAN) 5927 #if ENABLE(OILPAN)
5922 visitor->trace(m_importsController); 5928 visitor->trace(m_importsController);
5923 visitor->trace(m_docType); 5929 visitor->trace(m_docType);
5924 visitor->trace(m_implementation); 5930 visitor->trace(m_implementation);
5925 visitor->trace(m_autofocusElement); 5931 visitor->trace(m_autofocusElement);
5926 visitor->trace(m_focusedElement); 5932 visitor->trace(m_focusedElement);
5927 visitor->trace(m_sequentialFocusNavigationStartingPoint); 5933 visitor->trace(m_sequentialFocusNavigationStartingPoint);
5928 visitor->trace(m_hoverNode); 5934 visitor->trace(m_hoverNode);
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
5990 #ifndef NDEBUG 5996 #ifndef NDEBUG
5991 using namespace blink; 5997 using namespace blink;
5992 void showLiveDocumentInstances() 5998 void showLiveDocumentInstances()
5993 { 5999 {
5994 Document::WeakDocumentSet& set = Document::liveDocumentSet(); 6000 Document::WeakDocumentSet& set = Document::liveDocumentSet();
5995 fprintf(stderr, "There are %u documents currently alive:\n", set.size()); 6001 fprintf(stderr, "There are %u documents currently alive:\n", set.size());
5996 for (Document* document : set) 6002 for (Document* document : set)
5997 fprintf(stderr, "- Document %p URL: %s\n", document, document->url().get String().utf8().data()); 6003 fprintf(stderr, "- Document %p URL: %s\n", document, document->url().get String().utf8().data());
5998 } 6004 }
5999 #endif 6005 #endif
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/dom/Document.h ('k') | third_party/WebKit/Source/core/dom/ExecutionContext.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698