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

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: Fix. 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
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 3971 matching lines...) Expand 10 before | Expand all | Expand 10 after
3982 if (!foundDate) 3982 if (!foundDate)
3983 date.setMillisecondsSinceEpochForDateTime(convertToLocalTime(currentTime MS())); 3983 date.setMillisecondsSinceEpochForDateTime(convertToLocalTime(currentTime MS()));
3984 return String::format("%02d/%02d/%04d %02d:%02d:%02d", date.month() + 1, dat e.monthDay(), date.fullYear(), date.hour(), date.minute(), date.second()); 3984 return String::format("%02d/%02d/%04d %02d:%02d:%02d", date.month() + 1, dat e.monthDay(), date.fullYear(), date.hour(), date.minute(), date.second());
3985 } 3985 }
3986 3986
3987 const KURL& Document::firstPartyForCookies() const 3987 const KURL& Document::firstPartyForCookies() const
3988 { 3988 {
3989 // We're intentionally using the URL of each document rather than the docume nt's SecurityOrigin. 3989 // We're intentionally using the URL of each document rather than the docume nt's SecurityOrigin.
3990 // Sandboxing a document into a unique origin shouldn't effect first-/third- party status for 3990 // Sandboxing a document into a unique origin shouldn't effect first-/third- party status for
3991 // cookies and site data. 3991 // cookies and site data.
3992 OriginAccessEntry accessEntry(topDocument().url().protocol(), topDocument(). url().host(), OriginAccessEntry::AllowSubdomains); 3992 OriginAccessEntry accessEntry(topDocument().url().protocol(), topDocument(). url().host(), OriginAccessEntry::AllowRegisterableDomains);
3993 const Document* currentDocument = this; 3993 const Document* currentDocument = this;
3994 while (currentDocument) { 3994 while (currentDocument) {
3995 // Skip over srcdoc documents, as they are always same-origin with their closest non-srcdoc parent. 3995 // Skip over srcdoc documents, as they are always same-origin with their closest non-srcdoc parent.
3996 while (currentDocument->isSrcdocDocument()) 3996 while (currentDocument->isSrcdocDocument())
3997 currentDocument = currentDocument->parentDocument(); 3997 currentDocument = currentDocument->parentDocument();
3998 ASSERT(currentDocument); 3998 ASSERT(currentDocument);
3999 3999
4000 if (accessEntry.matchesOrigin(*currentDocument->securityOrigin()) == Ori ginAccessEntry::DoesNotMatchOrigin) 4000 if (accessEntry.matchesOrigin(*currentDocument->securityOrigin()) == Ori ginAccessEntry::DoesNotMatchOrigin)
4001 return SecurityOrigin::urlWithUniqueSecurityOrigin(); 4001 return SecurityOrigin::urlWithUniqueSecurityOrigin();
4002 4002
(...skipping 1685 matching lines...) Expand 10 before | Expand all | Expand 10 after
5688 #ifndef NDEBUG 5688 #ifndef NDEBUG
5689 using namespace blink; 5689 using namespace blink;
5690 void showLiveDocumentInstances() 5690 void showLiveDocumentInstances()
5691 { 5691 {
5692 WeakDocumentSet& set = liveDocumentSet(); 5692 WeakDocumentSet& set = liveDocumentSet();
5693 fprintf(stderr, "There are %u documents currently alive:\n", set.size()); 5693 fprintf(stderr, "There are %u documents currently alive:\n", set.size());
5694 for (Document* document : set) 5694 for (Document* document : set)
5695 fprintf(stderr, "- Document %p URL: %s\n", document, document->url().str ing().utf8().data()); 5695 fprintf(stderr, "- Document %p URL: %s\n", document, document->url().str ing().utf8().data());
5696 } 5696 }
5697 #endif 5697 #endif
OLDNEW
« no previous file with comments | « no previous file | Source/platform/weborigin/OriginAccessEntry.h » ('j') | Source/platform/weborigin/OriginAccessEntry.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698