| OLD | NEW |
| 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 654 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 665 } | 665 } |
| 666 | 666 |
| 667 void FrameFetchContext::addClientHintsIfNecessary(FetchRequest& fetchRequest) | 667 void FrameFetchContext::addClientHintsIfNecessary(FetchRequest& fetchRequest) |
| 668 { | 668 { |
| 669 if (!frame() || !RuntimeEnabledFeatures::clientHintsEnabled() || !m_document
) | 669 if (!frame() || !RuntimeEnabledFeatures::clientHintsEnabled() || !m_document
) |
| 670 return; | 670 return; |
| 671 | 671 |
| 672 if (frame()->shouldSendDPRHint()) | 672 if (frame()->shouldSendDPRHint()) |
| 673 fetchRequest.mutableResourceRequest().addHTTPHeaderField("DPR", AtomicSt
ring(String::number(m_document->devicePixelRatio()))); | 673 fetchRequest.mutableResourceRequest().addHTTPHeaderField("DPR", AtomicSt
ring(String::number(m_document->devicePixelRatio()))); |
| 674 | 674 |
| 675 // FIXME: Send the RW hint based on the actual resource width, when we have
it. | 675 if (frame()->shouldSendRWHint() && frame()->view()) { |
| 676 if (frame()->shouldSendRWHint() && frame()->view()) | 676 FetchRequest::ResourceWidth resourceWidth = fetchRequest.resourceWidth()
; |
| 677 fetchRequest.mutableResourceRequest().addHTTPHeaderField("RW", AtomicStr
ing(String::number(frame()->view()->viewportWidth()))); | 677 float usedResourceWidth = resourceWidth.isSet ? resourceWidth.width : fr
ame()->view()->viewportWidth(); |
| 678 fetchRequest.mutableResourceRequest().addHTTPHeaderField("RW", AtomicStr
ing(String::number(usedResourceWidth))); |
| 679 } |
| 678 } | 680 } |
| 679 | 681 |
| 680 void FrameFetchContext::addCSPHeaderIfNecessary(Resource::Type type, FetchReques
t& fetchRequest) | 682 void FrameFetchContext::addCSPHeaderIfNecessary(Resource::Type type, FetchReques
t& fetchRequest) |
| 681 { | 683 { |
| 682 if (!document() || !frame()) | 684 if (!document() || !frame()) |
| 683 return; | 685 return; |
| 684 | 686 |
| 685 const ContentSecurityPolicy* csp = document()->contentSecurityPolicy(); | 687 const ContentSecurityPolicy* csp = document()->contentSecurityPolicy(); |
| 686 if (csp->shouldSendCSPHeader(type)) | 688 if (csp->shouldSendCSPHeader(type)) |
| 687 fetchRequest.mutableResourceRequest().addHTTPHeaderField("CSP", "active"
); | 689 fetchRequest.mutableResourceRequest().addHTTPHeaderField("CSP", "active"
); |
| 688 } | 690 } |
| 689 | 691 |
| 690 DEFINE_TRACE(FrameFetchContext) | 692 DEFINE_TRACE(FrameFetchContext) |
| 691 { | 693 { |
| 692 visitor->trace(m_document); | 694 visitor->trace(m_document); |
| 693 FetchContext::trace(visitor); | 695 FetchContext::trace(visitor); |
| 694 } | 696 } |
| 695 | 697 |
| 696 } // namespace blink | 698 } // namespace blink |
| OLD | NEW |