diff options
| author | abarth@chromium.org <abarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-28 07:13:19 +0000 |
|---|---|---|
| committer | abarth@chromium.org <abarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-28 07:13:19 +0000 |
| commit | e53db4462779be3af76c63404314afe7a1464657 (patch) | |
| tree | 9c90fa8655cf542bdc35a4819fea2327804a84ef /chrome/renderer | |
| parent | 06294933c1ae46a2c6aa22bb0b6eac48582330f6 (diff) | |
| download | chromium_src-e53db4462779be3af76c63404314afe7a1464657.zip chromium_src-e53db4462779be3af76c63404314afe7a1464657.tar.gz chromium_src-e53db4462779be3af76c63404314afe7a1464657.tar.bz2 | |
Add the ability to specify a default MIME type when loading a resource. We'll need this to correctly load stylesheets that lack a Content-Type header in standards mode.
We're waiting on https://bugs.webkit.org/show_bug.cgi?id=24904 upstream before this works fully. This change, as it stands, is a no-op.
R=wtc
BUG=7448
Review URL: http://codereview.chromium.org/55049
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12739 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer')
| -rw-r--r-- | chrome/renderer/media/data_source_impl.cc | 1 | ||||
| -rw-r--r-- | chrome/renderer/renderer_glue.cc | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/chrome/renderer/media/data_source_impl.cc b/chrome/renderer/media/data_source_impl.cc index 93a4f5c..ba78743 100644 --- a/chrome/renderer/media/data_source_impl.cc +++ b/chrome/renderer/media/data_source_impl.cc @@ -200,6 +200,7 @@ void DataSourceImpl::OnInitialize(std::string uri) { "null", // TODO(abarth): provide frame_origin "null", // TODO(abarth): provide main_frame_origin std::string(), // Provide no header. + "", // default_mime_type // Prefer to load from cache, also enable downloading the file, the // resource will be saved to a single response data file if it's possible. net::LOAD_PREFERRING_CACHE | net::LOAD_ENABLE_DOWNLOAD_FILE, diff --git a/chrome/renderer/renderer_glue.cc b/chrome/renderer/renderer_glue.cc index b6a1a11..e8d3c53 100644 --- a/chrome/renderer/renderer_glue.cc +++ b/chrome/renderer/renderer_glue.cc @@ -235,6 +235,7 @@ ResourceLoaderBridge* ResourceLoaderBridge::Create( const std::string& frame_origin, const std::string& main_frame_origin, const std::string& headers, + const std::string& default_mime_type, int load_flags, int origin_pid, ResourceType::Type resource_type, @@ -242,8 +243,8 @@ ResourceLoaderBridge* ResourceLoaderBridge::Create( ResourceDispatcher* dispatch = RenderThread::current()->resource_dispatcher(); return dispatch->CreateBridge(method, url, policy_url, referrer, frame_origin, main_frame_origin, headers, - load_flags, origin_pid, resource_type, - 0, routing_id); + default_mime_type, load_flags, origin_pid, + resource_type, 0, routing_id); } void NotifyCacheStats() { |