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

Side by Side Diff: Source/WebCore/dom/Document.cpp

Issue 14089003: Remove storageBlockingPolicy (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 8 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 | Annotate | Revision Log
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 4007 matching lines...) Expand 10 before | Expand all | Expand 10 after
4018 void Document::registerForMediaVolumeCallbacks(Element* e) 4018 void Document::registerForMediaVolumeCallbacks(Element* e)
4019 { 4019 {
4020 m_mediaVolumeCallbackElements.add(e); 4020 m_mediaVolumeCallbackElements.add(e);
4021 } 4021 }
4022 4022
4023 void Document::unregisterForMediaVolumeCallbacks(Element* e) 4023 void Document::unregisterForMediaVolumeCallbacks(Element* e)
4024 { 4024 {
4025 m_mediaVolumeCallbackElements.remove(e); 4025 m_mediaVolumeCallbackElements.remove(e);
4026 } 4026 }
4027 4027
4028 void Document::storageBlockingStateDidChange()
4029 {
4030 if (Settings* settings = this->settings())
4031 securityOrigin()->setStorageBlockingPolicy(settings->storageBlockingPoli cy());
4032 }
4033
4034 #if ENABLE(VIDEO_TRACK) 4028 #if ENABLE(VIDEO_TRACK)
4035 void Document::registerForCaptionPreferencesChangedCallbacks(Element* e) 4029 void Document::registerForCaptionPreferencesChangedCallbacks(Element* e)
4036 { 4030 {
4037 if (page()) 4031 if (page())
4038 page()->group().captionPreferences()->setInterestedInCaptionPreferenceCh anges(); 4032 page()->group().captionPreferences()->setInterestedInCaptionPreferenceCh anges();
4039 4033
4040 m_captionPreferencesChangedElements.add(e); 4034 m_captionPreferencesChangedElements.add(e);
4041 } 4035 }
4042 4036
4043 void Document::unregisterForCaptionPreferencesChangedCallbacks(Element* e) 4037 void Document::unregisterForCaptionPreferencesChangedCallbacks(Element* e)
(...skipping 454 matching lines...) Expand 10 before | Expand all | Expand 10 after
4498 if (settings->allowUniversalAccessFromFileURLs()) { 4492 if (settings->allowUniversalAccessFromFileURLs()) {
4499 // Some clients want local URLs to have universal access, but th at setting is dangerous for other clients. 4493 // Some clients want local URLs to have universal access, but th at setting is dangerous for other clients.
4500 securityOrigin()->grantUniversalAccess(); 4494 securityOrigin()->grantUniversalAccess();
4501 } else if (!settings->allowFileAccessFromFileURLs()) { 4495 } else if (!settings->allowFileAccessFromFileURLs()) {
4502 // Some clients want local URLs to have even tighter restriction s by default, and not be able to access other local files. 4496 // Some clients want local URLs to have even tighter restriction s by default, and not be able to access other local files.
4503 // FIXME 81578: The naming of this is confusing. Files with rest ricted access to other local files 4497 // FIXME 81578: The naming of this is confusing. Files with rest ricted access to other local files
4504 // still can have other privileges that can be remembered, there by not making them unique origins. 4498 // still can have other privileges that can be remembered, there by not making them unique origins.
4505 securityOrigin()->enforceFilePathSeparation(); 4499 securityOrigin()->enforceFilePathSeparation();
4506 } 4500 }
4507 } 4501 }
4508 securityOrigin()->setStorageBlockingPolicy(settings->storageBlockingPoli cy());
4509 } 4502 }
4510 4503
4511 Document* parentDocument = ownerElement() ? ownerElement()->document() : 0; 4504 Document* parentDocument = ownerElement() ? ownerElement()->document() : 0;
4512 if (parentDocument && m_frame->loader()->shouldTreatURLAsSrcdocDocument(url( ))) { 4505 if (parentDocument && m_frame->loader()->shouldTreatURLAsSrcdocDocument(url( ))) {
4513 m_isSrcdocDocument = true; 4506 m_isSrcdocDocument = true;
4514 setBaseURLOverride(parentDocument->baseURL()); 4507 setBaseURLOverride(parentDocument->baseURL());
4515 } 4508 }
4516 4509
4517 // FIXME: What happens if we inherit the security origin? This check may nee d to be later. 4510 // FIXME: What happens if we inherit the security origin? This check may nee d to be later.
4518 // <iframe seamless src="about:blank"> likely won't work as-is. 4511 // <iframe seamless src="about:blank"> likely won't work as-is.
(...skipping 1429 matching lines...) Expand 10 before | Expand all | Expand 10 after
5948 return; 5941 return;
5949 5942
5950 Vector<RefPtr<Element> > associatedFormControls; 5943 Vector<RefPtr<Element> > associatedFormControls;
5951 copyToVector(m_associatedFormControls, associatedFormControls); 5944 copyToVector(m_associatedFormControls, associatedFormControls);
5952 5945
5953 frame()->page()->chrome()->client()->didAssociateFormControls(associatedForm Controls); 5946 frame()->page()->chrome()->client()->didAssociateFormControls(associatedForm Controls);
5954 m_associatedFormControls.clear(); 5947 m_associatedFormControls.clear();
5955 } 5948 }
5956 5949
5957 } // namespace WebCore 5950 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698