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

Side by Side Diff: content/child/web_url_loader_impl.cc

Issue 401523002: Move media related mimetype functionality out of net/ and into media/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase and add content/common/mime_util.h for realz Created 6 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 | Annotate | Revision Log
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 // An implementation of WebURLLoader in terms of ResourceLoaderBridge. 5 // An implementation of WebURLLoader in terms of ResourceLoaderBridge.
6 6
7 #include "content/child/web_url_loader_impl.h" 7 #include "content/child/web_url_loader_impl.h"
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/files/file_path.h" 10 #include "base/files/file_path.h"
11 #include "base/memory/scoped_ptr.h" 11 #include "base/memory/scoped_ptr.h"
12 #include "base/message_loop/message_loop.h" 12 #include "base/message_loop/message_loop.h"
13 #include "base/strings/string_util.h" 13 #include "base/strings/string_util.h"
14 #include "base/time/time.h" 14 #include "base/time/time.h"
15 #include "content/child/ftp_directory_listing_response_delegate.h" 15 #include "content/child/ftp_directory_listing_response_delegate.h"
16 #include "content/child/multipart_response_delegate.h" 16 #include "content/child/multipart_response_delegate.h"
17 #include "content/child/request_extra_data.h" 17 #include "content/child/request_extra_data.h"
18 #include "content/child/request_info.h" 18 #include "content/child/request_info.h"
19 #include "content/child/resource_dispatcher.h" 19 #include "content/child/resource_dispatcher.h"
20 #include "content/child/sync_load_response.h" 20 #include "content/child/sync_load_response.h"
21 #include "content/child/weburlresponse_extradata_impl.h" 21 #include "content/child/weburlresponse_extradata_impl.h"
22 #include "content/common/mime_util.h"
22 #include "content/common/resource_request_body.h" 23 #include "content/common/resource_request_body.h"
23 #include "content/public/child/request_peer.h" 24 #include "content/public/child/request_peer.h"
24 #include "net/base/data_url.h" 25 #include "net/base/data_url.h"
25 #include "net/base/filename_util.h" 26 #include "net/base/filename_util.h"
26 #include "net/base/load_flags.h" 27 #include "net/base/load_flags.h"
27 #include "net/base/mime_util.h"
28 #include "net/base/net_errors.h" 28 #include "net/base/net_errors.h"
29 #include "net/http/http_response_headers.h" 29 #include "net/http/http_response_headers.h"
30 #include "net/http/http_util.h" 30 #include "net/http/http_util.h"
31 #include "net/url_request/url_request.h" 31 #include "net/url_request/url_request.h"
32 #include "third_party/WebKit/public/platform/WebHTTPHeaderVisitor.h" 32 #include "third_party/WebKit/public/platform/WebHTTPHeaderVisitor.h"
33 #include "third_party/WebKit/public/platform/WebHTTPLoadInfo.h" 33 #include "third_party/WebKit/public/platform/WebHTTPLoadInfo.h"
34 #include "third_party/WebKit/public/platform/WebURL.h" 34 #include "third_party/WebKit/public/platform/WebURL.h"
35 #include "third_party/WebKit/public/platform/WebURLError.h" 35 #include "third_party/WebKit/public/platform/WebURLError.h"
36 #include "third_party/WebKit/public/platform/WebURLLoadTiming.h" 36 #include "third_party/WebKit/public/platform/WebURLLoadTiming.h"
37 #include "third_party/WebKit/public/platform/WebURLLoaderClient.h" 37 #include "third_party/WebKit/public/platform/WebURLLoaderClient.h"
(...skipping 641 matching lines...) Expand 10 before | Expand all | Expand 10 after
679 if (request_.frameType() == WebURLRequest::FrameTypeTopLevel) 679 if (request_.frameType() == WebURLRequest::FrameTypeTopLevel)
680 return false; 680 return false;
681 #endif 681 #endif
682 682
683 if (request_.frameType() != WebURLRequest::FrameTypeTopLevel && 683 if (request_.frameType() != WebURLRequest::FrameTypeTopLevel &&
684 request_.frameType() != WebURLRequest::FrameTypeNested) 684 request_.frameType() != WebURLRequest::FrameTypeNested)
685 return true; 685 return true;
686 686
687 std::string mime_type, unused_charset; 687 std::string mime_type, unused_charset;
688 if (net::DataURL::Parse(url, &mime_type, &unused_charset, NULL) && 688 if (net::DataURL::Parse(url, &mime_type, &unused_charset, NULL) &&
689 net::IsSupportedMimeType(mime_type)) 689 content::IsSupportedMimeType(mime_type)) {
690 return true; 690 return true;
691 }
691 692
692 return false; 693 return false;
693 } 694 }
694 695
695 void WebURLLoaderImpl::Context::HandleDataURL() { 696 void WebURLLoaderImpl::Context::HandleDataURL() {
696 ResourceResponseInfo info; 697 ResourceResponseInfo info;
697 int error_code; 698 int error_code;
698 std::string data; 699 std::string data;
699 700
700 if (GetInfoFromDataURL(request_.url(), &info, &data, &error_code)) { 701 if (GetInfoFromDataURL(request_.url(), &info, &data, &error_code)) {
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after
892 int intra_priority_value) { 893 int intra_priority_value) {
893 context_->DidChangePriority(new_priority, intra_priority_value); 894 context_->DidChangePriority(new_priority, intra_priority_value);
894 } 895 }
895 896
896 bool WebURLLoaderImpl::attachThreadedDataReceiver( 897 bool WebURLLoaderImpl::attachThreadedDataReceiver(
897 blink::WebThreadedDataReceiver* threaded_data_receiver) { 898 blink::WebThreadedDataReceiver* threaded_data_receiver) {
898 return context_->AttachThreadedDataReceiver(threaded_data_receiver); 899 return context_->AttachThreadedDataReceiver(threaded_data_receiver);
899 } 900 }
900 901
901 } // namespace content 902 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698