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

Side by Side Diff: media/blink/test_response_generator.cc

Issue 1220963004: Check the response URL origin in BufferedDataSource to avoid mixing cross-origin responses. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: incorporated hubbe's comment Created 5 years, 5 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 | « media/blink/test_response_generator.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 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "media/blink/test_response_generator.h" 5 #include "media/blink/test_response_generator.h"
6 6
7 #include "base/format_macros.h" 7 #include "base/format_macros.h"
8 #include "base/strings/string_number_conversions.h" 8 #include "base/strings/string_number_conversions.h"
9 #include "base/strings/stringprintf.h" 9 #include "base/strings/stringprintf.h"
10 #include "net/base/net_errors.h" 10 #include "net/base/net_errors.h"
(...skipping 23 matching lines...) Expand all
34 response.setHTTPStatusCode(200); 34 response.setHTTPStatusCode(200);
35 35
36 response.setHTTPHeaderField( 36 response.setHTTPHeaderField(
37 WebString::fromUTF8("Content-Length"), 37 WebString::fromUTF8("Content-Length"),
38 WebString::fromUTF8(base::Int64ToString(content_length_))); 38 WebString::fromUTF8(base::Int64ToString(content_length_)));
39 response.setExpectedContentLength(content_length_); 39 response.setExpectedContentLength(content_length_);
40 return response; 40 return response;
41 } 41 }
42 42
43 WebURLResponse TestResponseGenerator::Generate206(int64 first_byte_offset) { 43 WebURLResponse TestResponseGenerator::Generate206(int64 first_byte_offset) {
44 return Generate206(first_byte_offset, kNormal); 44 return GeneratePartial206(first_byte_offset, content_length_ - 1, kNormal);
45 } 45 }
46 46
47 WebURLResponse TestResponseGenerator::Generate206(int64 first_byte_offset, 47 WebURLResponse TestResponseGenerator::Generate206(int64 first_byte_offset,
48 Flags flags) { 48 Flags flags) {
49 return GeneratePartial206(first_byte_offset, content_length_ - 1, flags);
50 }
51
52 WebURLResponse TestResponseGenerator::GeneratePartial206(
53 int64 first_byte_offset,
54 int64 last_byte_offset) {
55 return GeneratePartial206(first_byte_offset, last_byte_offset, kNormal);
56 }
57
58 WebURLResponse TestResponseGenerator::GeneratePartial206(
59 int64 first_byte_offset,
60 int64 last_byte_offset,
61 Flags flags) {
49 int64 range_content_length = content_length_ - first_byte_offset; 62 int64 range_content_length = content_length_ - first_byte_offset;
50 int64 last_byte_offset = content_length_ - 1;
51 63
52 WebURLResponse response(gurl_); 64 WebURLResponse response(gurl_);
53 response.setHTTPStatusCode(206); 65 response.setHTTPStatusCode(206);
54 66
55 if ((flags & kNoAcceptRanges) == 0) { 67 if ((flags & kNoAcceptRanges) == 0) {
56 response.setHTTPHeaderField(WebString::fromUTF8("Accept-Ranges"), 68 response.setHTTPHeaderField(WebString::fromUTF8("Accept-Ranges"),
57 WebString::fromUTF8("bytes")); 69 WebString::fromUTF8("bytes"));
58 } 70 }
59 71
60 if ((flags & kNoContentRange) == 0) { 72 if ((flags & kNoContentRange) == 0) {
(...skipping 30 matching lines...) Expand all
91 103
92 if (first_byte_offset >= 0) { 104 if (first_byte_offset >= 0) {
93 response.setExpectedContentLength(content_length_ - first_byte_offset); 105 response.setExpectedContentLength(content_length_ - first_byte_offset);
94 } else { 106 } else {
95 response.setExpectedContentLength(-1); 107 response.setExpectedContentLength(-1);
96 } 108 }
97 return response; 109 return response;
98 } 110 }
99 111
100 } // namespace media 112 } // namespace media
OLDNEW
« no previous file with comments | « media/blink/test_response_generator.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698