OLD | NEW |
---|---|
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 2808 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2819 // but media/ can't depend on cc/, so for now, just keep a reference in the | 2819 // but media/ can't depend on cc/, so for now, just keep a reference in the |
2820 // callback. | 2820 // callback. |
2821 // TODO(piman): replace media::Context3D to scoped_refptr<ContextProvider> in | 2821 // TODO(piman): replace media::Context3D to scoped_refptr<ContextProvider> in |
2822 // media/ once ContextProvider is in gpu/. | 2822 // media/ once ContextProvider is in gpu/. |
2823 media::WebMediaPlayerParams::Context3DCB context_3d_cb = base::Bind( | 2823 media::WebMediaPlayerParams::Context3DCB context_3d_cb = base::Bind( |
2824 &GetSharedMainThreadContext3D, | 2824 &GetSharedMainThreadContext3D, |
2825 RenderThreadImpl::current()->SharedMainThreadContextProvider()); | 2825 RenderThreadImpl::current()->SharedMainThreadContextProvider()); |
2826 | 2826 |
2827 scoped_refptr<media::MediaLog> media_log( | 2827 scoped_refptr<media::MediaLog> media_log( |
2828 new RenderMediaLog(url::Origin(frame_->getSecurityOrigin()).GetURL())); | 2828 new RenderMediaLog(url::Origin(frame_->getSecurityOrigin()).GetURL())); |
2829 media_log->SetStringProperty("ui_title", frame_->document().title().utf8()); | |
wolenetz
2017/03/21 00:21:26
Are these two lines integral to the new MEDIALOG_C
| |
2830 media_log->SetStringProperty("ui_description", frame_->document().url().string ().utf8()); | |
sandersd (OOO until July 31)
2017/03/21 00:07:22
Looks like .utf8() can return a string referencing
| |
2829 | 2831 |
2830 bool embedded_media_experience_enabled = false; | 2832 bool embedded_media_experience_enabled = false; |
2831 #if defined(OS_ANDROID) | 2833 #if defined(OS_ANDROID) |
2832 if (!UseMediaPlayerRenderer(url) && !media_surface_manager_) | 2834 if (!UseMediaPlayerRenderer(url) && !media_surface_manager_) |
2833 media_surface_manager_ = new RendererSurfaceViewManager(this); | 2835 media_surface_manager_ = new RendererSurfaceViewManager(this); |
2834 embedded_media_experience_enabled = | 2836 embedded_media_experience_enabled = |
2835 GetWebkitPreferences().embedded_media_experience_enabled; | 2837 GetWebkitPreferences().embedded_media_experience_enabled; |
2836 #endif // defined(OS_ANDROID) | 2838 #endif // defined(OS_ANDROID) |
2837 | 2839 |
2838 #if BUILDFLAG(ENABLE_MEDIA_REMOTING) | 2840 #if BUILDFLAG(ENABLE_MEDIA_REMOTING) |
(...skipping 4093 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
6932 policy(info.defaultPolicy), | 6934 policy(info.defaultPolicy), |
6933 replaces_current_history_item(info.replacesCurrentHistoryItem), | 6935 replaces_current_history_item(info.replacesCurrentHistoryItem), |
6934 history_navigation_in_new_child_frame( | 6936 history_navigation_in_new_child_frame( |
6935 info.isHistoryNavigationInNewChildFrame), | 6937 info.isHistoryNavigationInNewChildFrame), |
6936 client_redirect(info.isClientRedirect), | 6938 client_redirect(info.isClientRedirect), |
6937 cache_disabled(info.isCacheDisabled), | 6939 cache_disabled(info.isCacheDisabled), |
6938 form(info.form), | 6940 form(info.form), |
6939 source_location(info.sourceLocation) {} | 6941 source_location(info.sourceLocation) {} |
6940 | 6942 |
6941 } // namespace content | 6943 } // namespace content |
OLD | NEW |