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

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

Issue 1141303002: Ship the ancestor restriction to 'first-party'. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fix. Created 5 years, 7 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
« no previous file with comments | « no previous file | Source/platform/RuntimeEnabledFeatures.in » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 3983 matching lines...) Expand 10 before | Expand all | Expand 10 after
3994 // FIXME: If this document came from the file system, the HTML5 3994 // FIXME: If this document came from the file system, the HTML5
3995 // specificiation tells us to read the last modification date from the file 3995 // specificiation tells us to read the last modification date from the file
3996 // system. 3996 // system.
3997 if (!foundDate) 3997 if (!foundDate)
3998 date.setMillisecondsSinceEpochForDateTime(convertToLocalTime(currentTime MS())); 3998 date.setMillisecondsSinceEpochForDateTime(convertToLocalTime(currentTime MS()));
3999 return String::format("%02d/%02d/%04d %02d:%02d:%02d", date.month() + 1, dat e.monthDay(), date.fullYear(), date.hour(), date.minute(), date.second()); 3999 return String::format("%02d/%02d/%04d %02d:%02d:%02d", date.month() + 1, dat e.monthDay(), date.fullYear(), date.hour(), date.minute(), date.second());
4000 } 4000 }
4001 4001
4002 const KURL& Document::firstPartyForCookies() const 4002 const KURL& Document::firstPartyForCookies() const
4003 { 4003 {
4004 if (!RuntimeEnabledFeatures::firstPartyIncludesAncestorsEnabled())
4005 return topDocument().url();
4006
4007 // We're intentionally using the URL of each document rather than the docume nt's SecurityOrigin. 4004 // We're intentionally using the URL of each document rather than the docume nt's SecurityOrigin.
4008 // Sandboxing a document into a unique origin shouldn't effect first-/third- party status for 4005 // Sandboxing a document into a unique origin shouldn't effect first-/third- party status for
4009 // cookies and site data. 4006 // cookies and site data.
4010 OriginAccessEntry accessEntry(topDocument().url().protocol(), topDocument(). url().host(), OriginAccessEntry::AllowSubdomains, OriginAccessEntry::TreatIPAddr essAsIPAddress); 4007 OriginAccessEntry accessEntry(topDocument().url().protocol(), topDocument(). url().host(), OriginAccessEntry::AllowSubdomains, OriginAccessEntry::TreatIPAddr essAsIPAddress);
4011 const Document* currentDocument = this; 4008 const Document* currentDocument = this;
4012 while (currentDocument) { 4009 while (currentDocument) {
4013 // Skip over srcdoc documents, as they are always same-origin with their closest non-srcdoc parent. 4010 // Skip over srcdoc documents, as they are always same-origin with their closest non-srcdoc parent.
4014 while (currentDocument->isSrcdocDocument()) 4011 while (currentDocument->isSrcdocDocument())
4015 currentDocument = currentDocument->parentDocument(); 4012 currentDocument = currentDocument->parentDocument();
4016 ASSERT(currentDocument); 4013 ASSERT(currentDocument);
(...skipping 1758 matching lines...) Expand 10 before | Expand all | Expand 10 after
5775 #ifndef NDEBUG 5772 #ifndef NDEBUG
5776 using namespace blink; 5773 using namespace blink;
5777 void showLiveDocumentInstances() 5774 void showLiveDocumentInstances()
5778 { 5775 {
5779 WeakDocumentSet& set = liveDocumentSet(); 5776 WeakDocumentSet& set = liveDocumentSet();
5780 fprintf(stderr, "There are %u documents currently alive:\n", set.size()); 5777 fprintf(stderr, "There are %u documents currently alive:\n", set.size());
5781 for (Document* document : set) 5778 for (Document* document : set)
5782 fprintf(stderr, "- Document %p URL: %s\n", document, document->url().str ing().utf8().data()); 5779 fprintf(stderr, "- Document %p URL: %s\n", document, document->url().str ing().utf8().data());
5783 } 5780 }
5784 #endif 5781 #endif
OLDNEW
« no previous file with comments | « no previous file | Source/platform/RuntimeEnabledFeatures.in » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698