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

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

Issue 1163583005: Add "registerable domain" support to OriginAccessEntry. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Test. Created 5 years, 6 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
« no previous file with comments | « no previous file | Source/platform/weborigin/OriginAccessEntry.h » ('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 3963 matching lines...) Expand 10 before | Expand all | Expand 10 after
3974 if (!foundDate) 3974 if (!foundDate)
3975 date.setMillisecondsSinceEpochForDateTime(convertToLocalTime(currentTime MS())); 3975 date.setMillisecondsSinceEpochForDateTime(convertToLocalTime(currentTime MS()));
3976 return String::format("%02d/%02d/%04d %02d:%02d:%02d", date.month() + 1, dat e.monthDay(), date.fullYear(), date.hour(), date.minute(), date.second()); 3976 return String::format("%02d/%02d/%04d %02d:%02d:%02d", date.month() + 1, dat e.monthDay(), date.fullYear(), date.hour(), date.minute(), date.second());
3977 } 3977 }
3978 3978
3979 const KURL& Document::firstPartyForCookies() const 3979 const KURL& Document::firstPartyForCookies() const
3980 { 3980 {
3981 // We're intentionally using the URL of each document rather than the docume nt's SecurityOrigin. 3981 // We're intentionally using the URL of each document rather than the docume nt's SecurityOrigin.
3982 // Sandboxing a document into a unique origin shouldn't effect first-/third- party status for 3982 // Sandboxing a document into a unique origin shouldn't effect first-/third- party status for
3983 // cookies and site data. 3983 // cookies and site data.
3984 OriginAccessEntry accessEntry(topDocument().url().protocol(), topDocument(). url().host(), OriginAccessEntry::AllowSubdomains); 3984 OriginAccessEntry accessEntry(topDocument().url().protocol(), topDocument(). url().host(), OriginAccessEntry::AllowRegisterableDomains);
3985 const Document* currentDocument = this; 3985 const Document* currentDocument = this;
3986 while (currentDocument) { 3986 while (currentDocument) {
3987 // Skip over srcdoc documents, as they are always same-origin with their closest non-srcdoc parent. 3987 // Skip over srcdoc documents, as they are always same-origin with their closest non-srcdoc parent.
3988 while (currentDocument->isSrcdocDocument()) 3988 while (currentDocument->isSrcdocDocument())
3989 currentDocument = currentDocument->parentDocument(); 3989 currentDocument = currentDocument->parentDocument();
3990 ASSERT(currentDocument); 3990 ASSERT(currentDocument);
3991 3991
3992 if (accessEntry.matchesOrigin(*currentDocument->securityOrigin()) == Ori ginAccessEntry::DoesNotMatchOrigin) 3992 if (accessEntry.matchesOrigin(*currentDocument->securityOrigin()) == Ori ginAccessEntry::DoesNotMatchOrigin)
3993 return SecurityOrigin::urlWithUniqueSecurityOrigin(); 3993 return SecurityOrigin::urlWithUniqueSecurityOrigin();
3994 3994
(...skipping 1685 matching lines...) Expand 10 before | Expand all | Expand 10 after
5680 #ifndef NDEBUG 5680 #ifndef NDEBUG
5681 using namespace blink; 5681 using namespace blink;
5682 void showLiveDocumentInstances() 5682 void showLiveDocumentInstances()
5683 { 5683 {
5684 WeakDocumentSet& set = liveDocumentSet(); 5684 WeakDocumentSet& set = liveDocumentSet();
5685 fprintf(stderr, "There are %u documents currently alive:\n", set.size()); 5685 fprintf(stderr, "There are %u documents currently alive:\n", set.size());
5686 for (Document* document : set) 5686 for (Document* document : set)
5687 fprintf(stderr, "- Document %p URL: %s\n", document, document->url().str ing().utf8().data()); 5687 fprintf(stderr, "- Document %p URL: %s\n", document, document->url().str ing().utf8().data());
5688 } 5688 }
5689 #endif 5689 #endif
OLDNEW
« no previous file with comments | « no previous file | Source/platform/weborigin/OriginAccessEntry.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698