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

Side by Side Diff: content/browser/renderer_host/render_widget_host_view_android.cc

Issue 278353003: Make RendererMediaPlayerManager a RenderFrameObserver. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Minor fix. Created 6 years, 7 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/browser/renderer_host/render_widget_host_view_android.h" 5 #include "content/browser/renderer_host/render_widget_host_view_android.h"
6 6
7 #include <android/bitmap.h> 7 #include <android/bitmap.h>
8 8
9 #include "base/android/sys_utils.h" 9 #include "base/android/sys_utils.h"
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 17 matching lines...) Expand all
28 #include "cc/trees/layer_tree_host.h" 28 #include "cc/trees/layer_tree_host.h"
29 #include "content/browser/accessibility/browser_accessibility_manager_android.h" 29 #include "content/browser/accessibility/browser_accessibility_manager_android.h"
30 #include "content/browser/android/content_view_core_impl.h" 30 #include "content/browser/android/content_view_core_impl.h"
31 #include "content/browser/android/in_process/synchronous_compositor_impl.h" 31 #include "content/browser/android/in_process/synchronous_compositor_impl.h"
32 #include "content/browser/android/overscroll_glow.h" 32 #include "content/browser/android/overscroll_glow.h"
33 #include "content/browser/devtools/render_view_devtools_agent_host.h" 33 #include "content/browser/devtools/render_view_devtools_agent_host.h"
34 #include "content/browser/gpu/compositor_util.h" 34 #include "content/browser/gpu/compositor_util.h"
35 #include "content/browser/gpu/gpu_data_manager_impl.h" 35 #include "content/browser/gpu/gpu_data_manager_impl.h"
36 #include "content/browser/gpu/gpu_process_host_ui_shim.h" 36 #include "content/browser/gpu/gpu_process_host_ui_shim.h"
37 #include "content/browser/gpu/gpu_surface_tracker.h" 37 #include "content/browser/gpu/gpu_surface_tracker.h"
38 #include "content/browser/media/android/browser_media_player_manager.h" 38 #include "content/browser/media/android/media_web_contents_observer.h"
39 #include "content/browser/renderer_host/compositor_impl_android.h" 39 #include "content/browser/renderer_host/compositor_impl_android.h"
40 #include "content/browser/renderer_host/dip_util.h" 40 #include "content/browser/renderer_host/dip_util.h"
41 #include "content/browser/renderer_host/image_transport_factory_android.h" 41 #include "content/browser/renderer_host/image_transport_factory_android.h"
42 #include "content/browser/renderer_host/input/synthetic_gesture_target_android.h " 42 #include "content/browser/renderer_host/input/synthetic_gesture_target_android.h "
43 #include "content/browser/renderer_host/input/web_input_event_util.h" 43 #include "content/browser/renderer_host/input/web_input_event_util.h"
44 #include "content/browser/renderer_host/render_process_host_impl.h" 44 #include "content/browser/renderer_host/render_process_host_impl.h"
45 #include "content/browser/renderer_host/render_view_host_impl.h" 45 #include "content/browser/renderer_host/render_view_host_impl.h"
46 #include "content/browser/renderer_host/render_widget_host_impl.h" 46 #include "content/browser/renderer_host/render_widget_host_impl.h"
47 #include "content/common/gpu/client/gl_helper.h" 47 #include "content/common/gpu/client/gl_helper.h"
48 #include "content/common/gpu/gpu_messages.h" 48 #include "content/common/gpu/gpu_messages.h"
(...skipping 937 matching lines...) Expand 10 before | Expand all | Expand 10 after
986 frame_metadata.max_page_scale_factor), 986 frame_metadata.max_page_scale_factor),
987 frame_metadata.root_layer_size, 987 frame_metadata.root_layer_size,
988 frame_metadata.viewport_size, 988 frame_metadata.viewport_size,
989 frame_metadata.location_bar_offset, 989 frame_metadata.location_bar_offset,
990 frame_metadata.location_bar_content_translation, 990 frame_metadata.location_bar_content_translation,
991 frame_metadata.overdraw_bottom_height); 991 frame_metadata.overdraw_bottom_height);
992 #if defined(VIDEO_HOLE) 992 #if defined(VIDEO_HOLE)
993 if (host_ && host_->IsRenderView()) { 993 if (host_ && host_->IsRenderView()) {
994 RenderViewHostImpl* rvhi = static_cast<RenderViewHostImpl*>( 994 RenderViewHostImpl* rvhi = static_cast<RenderViewHostImpl*>(
995 RenderViewHost::From(host_)); 995 RenderViewHost::From(host_));
996 rvhi->media_player_manager()->OnFrameInfoUpdated(); 996 rvhi->media_web_contents_observer()->OnFrameInfoUpdated();
997 } 997 }
998 #endif // defined(VIDEO_HOLE) 998 #endif // defined(VIDEO_HOLE)
999 } 999 }
1000 1000
1001 void RenderWidgetHostViewAndroid::AcceleratedSurfaceInitialized(int host_id, 1001 void RenderWidgetHostViewAndroid::AcceleratedSurfaceInitialized(int host_id,
1002 int route_id) { 1002 int route_id) {
1003 accelerated_surface_route_id_ = route_id; 1003 accelerated_surface_route_id_ = route_id;
1004 } 1004 }
1005 1005
1006 void RenderWidgetHostViewAndroid::AcceleratedSurfaceBuffersSwapped( 1006 void RenderWidgetHostViewAndroid::AcceleratedSurfaceBuffersSwapped(
(...skipping 444 matching lines...) Expand 10 before | Expand all | Expand 10 after
1451 results->availableRect = display.work_area(); 1451 results->availableRect = display.work_area();
1452 results->deviceScaleFactor = display.device_scale_factor(); 1452 results->deviceScaleFactor = display.device_scale_factor();
1453 results->orientationAngle = display.RotationAsDegree(); 1453 results->orientationAngle = display.RotationAsDegree();
1454 gfx::DeviceDisplayInfo info; 1454 gfx::DeviceDisplayInfo info;
1455 results->depth = info.GetBitsPerPixel(); 1455 results->depth = info.GetBitsPerPixel();
1456 results->depthPerComponent = info.GetBitsPerComponent(); 1456 results->depthPerComponent = info.GetBitsPerComponent();
1457 results->isMonochrome = (results->depthPerComponent == 0); 1457 results->isMonochrome = (results->depthPerComponent == 0);
1458 } 1458 }
1459 1459
1460 } // namespace content 1460 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698