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

Side by Side Diff: Source/platform/weborigin/SecurityOrigin.cpp

Issue 594803002: Transfer SecurityOrigin overrides to Workers. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Add tests Created 6 years, 3 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) 2007 Apple Inc. All rights reserved. 2 * Copyright (C) 2007 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 513 matching lines...) Expand 10 before | Expand all | Expand 10 after
524 return true; 524 return true;
525 } 525 }
526 526
527 const String& SecurityOrigin::urlWithUniqueSecurityOrigin() 527 const String& SecurityOrigin::urlWithUniqueSecurityOrigin()
528 { 528 {
529 ASSERT(isMainThread()); 529 ASSERT(isMainThread());
530 DEFINE_STATIC_LOCAL(const String, uniqueSecurityOriginURL, ("data:,")); 530 DEFINE_STATIC_LOCAL(const String, uniqueSecurityOriginURL, ("data:,"));
531 return uniqueSecurityOriginURL; 531 return uniqueSecurityOriginURL;
532 } 532 }
533 533
534 SecurityOrigin::PolicyOverrides SecurityOrigin::policyOverrides() const
535 {
536 return PolicyOverrides(m_universalAccess, m_enforceFilePathSeparation);
537 }
538
539 void SecurityOrigin::applyPolicyOverrides(const SecurityOrigin::PolicyOverrides& policyOverrides)
540 {
541 // Individual overrides does not have does-not-apply value;
Mike West 2014/09/26 11:29:10 Nit: I think you can drop this clause: "The policy
542 // the policy will be transferred/applied in its entirety.
543 m_universalAccess = policyOverrides.grantUniversalAccess();
544 m_enforceFilePathSeparation = policyOverrides.enforceFilePathSeparation();
545 }
546
534 } // namespace blink 547 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698