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

Side by Side Diff: content/renderer/render_frame_impl.cc

Issue 1409123005: Add methods for telling V8 how much memory audio/video is using. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix html viewer. Created 5 years, 1 month 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 | « components/html_viewer/media_factory.cc ('k') | media/base/demuxer.h » ('j') | 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 "content/renderer/render_frame_impl.h" 5 #include "content/renderer/render_frame_impl.h"
6 6
7 #include <map> 7 #include <map>
8 #include <string> 8 #include <string>
9 9
10 #include "base/auto_reset.h" 10 #include "base/auto_reset.h"
(...skipping 2149 matching lines...) Expand 10 before | Expand all | Expand 10 after
2160 #endif // defined(OS_ANDROID) && !defined(ENABLE_MEDIA_PIPELINE_ON_ANDROID) 2160 #endif // defined(OS_ANDROID) && !defined(ENABLE_MEDIA_PIPELINE_ON_ANDROID)
2161 2161
2162 scoped_refptr<media::MediaLog> media_log(new RenderMediaLog()); 2162 scoped_refptr<media::MediaLog> media_log(new RenderMediaLog());
2163 media::WebMediaPlayerParams params( 2163 media::WebMediaPlayerParams params(
2164 base::Bind(&ContentRendererClient::DeferMediaLoad, 2164 base::Bind(&ContentRendererClient::DeferMediaLoad,
2165 base::Unretained(GetContentClient()->renderer()), 2165 base::Unretained(GetContentClient()->renderer()),
2166 static_cast<RenderFrame*>(this), has_played_media_), 2166 static_cast<RenderFrame*>(this), has_played_media_),
2167 audio_renderer_sink, media_log, render_thread->GetMediaThreadTaskRunner(), 2167 audio_renderer_sink, media_log, render_thread->GetMediaThreadTaskRunner(),
2168 render_thread->GetWorkerTaskRunner(), 2168 render_thread->GetWorkerTaskRunner(),
2169 render_thread->compositor_task_runner(), context_3d_cb, 2169 render_thread->compositor_task_runner(), context_3d_cb,
2170 base::Bind(&v8::Isolate::AdjustAmountOfExternalAllocatedMemory,
2171 base::Unretained(blink::mainThreadIsolate())),
2170 GetMediaPermission(), initial_cdm); 2172 GetMediaPermission(), initial_cdm);
2171 2173
2172 // TODO(xhwang, watk): Find a better way to specify these ifdef conditions. 2174 // TODO(xhwang, watk): Find a better way to specify these ifdef conditions.
2173 #if defined(OS_ANDROID) && !defined(ENABLE_MEDIA_PIPELINE_ON_ANDROID) 2175 #if defined(OS_ANDROID) && !defined(ENABLE_MEDIA_PIPELINE_ON_ANDROID)
2174 return CreateAndroidWebMediaPlayer(client, encrypted_client, params); 2176 return CreateAndroidWebMediaPlayer(client, encrypted_client, params);
2175 #else 2177 #else
2176 #if defined(ENABLE_MOJO_MEDIA) && !defined(ENABLE_MEDIA_PIPELINE_ON_ANDROID) 2178 #if defined(ENABLE_MOJO_MEDIA) && !defined(ENABLE_MEDIA_PIPELINE_ON_ANDROID)
2177 scoped_ptr<media::RendererFactory> media_renderer_factory( 2179 scoped_ptr<media::RendererFactory> media_renderer_factory(
2178 new media::MojoRendererFactory(GetMediaServiceFactory())); 2180 new media::MojoRendererFactory(GetMediaServiceFactory()));
2179 #else 2181 #else
(...skipping 3107 matching lines...) Expand 10 before | Expand all | Expand 10 after
5287 mojo::ServiceProviderPtr service_provider; 5289 mojo::ServiceProviderPtr service_provider;
5288 mojo::URLRequestPtr request(mojo::URLRequest::New()); 5290 mojo::URLRequestPtr request(mojo::URLRequest::New());
5289 request->url = mojo::String::From(url); 5291 request->url = mojo::String::From(url);
5290 mojo_shell_->ConnectToApplication(request.Pass(), GetProxy(&service_provider), 5292 mojo_shell_->ConnectToApplication(request.Pass(), GetProxy(&service_provider),
5291 nullptr, nullptr, 5293 nullptr, nullptr,
5292 base::Bind(&OnGotContentHandlerID)); 5294 base::Bind(&OnGotContentHandlerID));
5293 return service_provider.Pass(); 5295 return service_provider.Pass();
5294 } 5296 }
5295 5297
5296 } // namespace content 5298 } // namespace content
OLDNEW
« no previous file with comments | « components/html_viewer/media_factory.cc ('k') | media/base/demuxer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698