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

Side by Side Diff: Source/core/loader/FrameFetchContext.cpp

Issue 1136843011: Revert of Add CSP header for resources with an active policy (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: 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
« no previous file with comments | « Source/core/loader/FrameFetchContext.h ('k') | no next file » | 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) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google 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 are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * 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 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 644 matching lines...) Expand 10 before | Expand all | Expand 10 after
655 return; 655 return;
656 656
657 if (frame()->shouldSendDPRHint()) 657 if (frame()->shouldSendDPRHint())
658 fetchRequest.mutableResourceRequest().addHTTPHeaderField("DPR", AtomicSt ring(String::number(m_document->devicePixelRatio()))); 658 fetchRequest.mutableResourceRequest().addHTTPHeaderField("DPR", AtomicSt ring(String::number(m_document->devicePixelRatio())));
659 659
660 // FIXME: Send the RW hint based on the actual resource width, when we have it. 660 // FIXME: Send the RW hint based on the actual resource width, when we have it.
661 if (frame()->shouldSendRWHint() && frame()->view()) 661 if (frame()->shouldSendRWHint() && frame()->view())
662 fetchRequest.mutableResourceRequest().addHTTPHeaderField("RW", AtomicStr ing(String::number(frame()->view()->viewportWidth()))); 662 fetchRequest.mutableResourceRequest().addHTTPHeaderField("RW", AtomicStr ing(String::number(frame()->view()->viewportWidth())));
663 } 663 }
664 664
665 void FrameFetchContext::addCSPHeaderIfNecessary(Resource::Type type, FetchReques t& fetchRequest)
666 {
667 if (!document() || !frame())
668 return;
669
670 const ContentSecurityPolicy* csp = document()->contentSecurityPolicy();
671 if (csp->shouldSendCSPHeader(type))
672 fetchRequest.mutableResourceRequest().addHTTPHeaderField("CSP", "active" );
673 }
674
675 DEFINE_TRACE(FrameFetchContext) 665 DEFINE_TRACE(FrameFetchContext)
676 { 666 {
677 visitor->trace(m_document); 667 visitor->trace(m_document);
678 FetchContext::trace(visitor); 668 FetchContext::trace(visitor);
679 } 669 }
680 670
681 } // namespace blink 671 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/loader/FrameFetchContext.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698