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

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

Issue 2605993002: Experiment with more aggressive MSE GC on memory pressure (Closed)
Patch Set: rebase/resolve conflicts Created 3 years, 10 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 | « content/public/common/web_preferences.cc ('k') | media/base/media_switches.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 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 2818 matching lines...) Expand 10 before | Expand all | Expand 10 after
2829 GetWebMediaPlayerDelegate()->has_played_media()), 2829 GetWebMediaPlayerDelegate()->has_played_media()),
2830 audio_renderer_sink, media_log, render_thread->GetMediaThreadTaskRunner(), 2830 audio_renderer_sink, media_log, render_thread->GetMediaThreadTaskRunner(),
2831 render_thread->GetWorkerTaskRunner(), 2831 render_thread->GetWorkerTaskRunner(),
2832 render_thread->compositor_task_runner(), context_3d_cb, 2832 render_thread->compositor_task_runner(), context_3d_cb,
2833 base::Bind(&v8::Isolate::AdjustAmountOfExternalAllocatedMemory, 2833 base::Bind(&v8::Isolate::AdjustAmountOfExternalAllocatedMemory,
2834 base::Unretained(blink::mainThreadIsolate())), 2834 base::Unretained(blink::mainThreadIsolate())),
2835 initial_cdm, media_surface_manager_, media_observer, 2835 initial_cdm, media_surface_manager_, media_observer,
2836 // TODO(avayvod, asvitkine): Query the value directly when it is available 2836 // TODO(avayvod, asvitkine): Query the value directly when it is available
2837 // in the renderer process. See https://crbug.com/681160. 2837 // in the renderer process. See https://crbug.com/681160.
2838 GetWebkitPreferences().max_keyframe_distance_to_disable_background_video, 2838 GetWebkitPreferences().max_keyframe_distance_to_disable_background_video,
2839 GetWebkitPreferences().enable_instant_source_buffer_gc,
2839 GetContentClient()->renderer()->AllowMediaSuspend()); 2840 GetContentClient()->renderer()->AllowMediaSuspend());
2840 2841
2841 bool use_fallback_path = false; 2842 bool use_fallback_path = false;
2842 #if defined(OS_ANDROID) 2843 #if defined(OS_ANDROID)
2843 use_fallback_path = !UseWebMediaPlayerImpl(url); 2844 use_fallback_path = !UseWebMediaPlayerImpl(url);
2844 2845
2845 if (use_fallback_path && 2846 if (use_fallback_path &&
2846 !base::FeatureList::IsEnabled(media::kAndroidMediaPlayerRenderer)) { 2847 !base::FeatureList::IsEnabled(media::kAndroidMediaPlayerRenderer)) {
2847 return CreateAndroidWebMediaPlayer(client, encrypted_client, params); 2848 return CreateAndroidWebMediaPlayer(client, encrypted_client, params);
2848 } 2849 }
(...skipping 3947 matching lines...) Expand 10 before | Expand all | Expand 10 after
6796 // event target. Potentially a Pepper plugin will receive the event. 6797 // event target. Potentially a Pepper plugin will receive the event.
6797 // In order to tell whether a plugin gets the last mouse event and which it 6798 // In order to tell whether a plugin gets the last mouse event and which it
6798 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets 6799 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets
6799 // the event, it will notify us via DidReceiveMouseEvent() and set itself as 6800 // the event, it will notify us via DidReceiveMouseEvent() and set itself as
6800 // |pepper_last_mouse_event_target_|. 6801 // |pepper_last_mouse_event_target_|.
6801 pepper_last_mouse_event_target_ = nullptr; 6802 pepper_last_mouse_event_target_ = nullptr;
6802 #endif 6803 #endif
6803 } 6804 }
6804 6805
6805 } // namespace content 6806 } // namespace content
OLDNEW
« no previous file with comments | « content/public/common/web_preferences.cc ('k') | media/base/media_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698