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

Side by Side Diff: content/renderer/render_view_impl.h

Issue 10919075: Move android mediaplayer from render process to browser process. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: addressing comments Created 8 years, 3 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 #ifndef CONTENT_RENDERER_RENDER_VIEW_IMPL_H_ 5 #ifndef CONTENT_RENDERER_RENDER_VIEW_IMPL_H_
6 #define CONTENT_RENDERER_RENDER_VIEW_IMPL_H_ 6 #define CONTENT_RENDERER_RENDER_VIEW_IMPL_H_
7 7
8 #include <deque> 8 #include <deque>
9 #include <map> 9 #include <map>
10 #include <set> 10 #include <set>
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 class WebUIBindings; 96 class WebUIBindings;
97 97
98 namespace content { 98 namespace content {
99 class DocumentState; 99 class DocumentState;
100 class NavigationState; 100 class NavigationState;
101 class P2PSocketDispatcher; 101 class P2PSocketDispatcher;
102 class RenderViewObserver; 102 class RenderViewObserver;
103 class RenderViewTest; 103 class RenderViewTest;
104 class RendererAccessibility; 104 class RendererAccessibility;
105 class RendererPpapiHost; 105 class RendererPpapiHost;
106 #if defined(OS_ANDROID)
107 class WebMediaPlayerProxyImplAndroid;
108 #endif
106 struct CustomContextMenuContext; 109 struct CustomContextMenuContext;
107 struct FileChooserParams; 110 struct FileChooserParams;
108 111
109 namespace old { 112 namespace old {
110 class GuestToEmbedderChannel; 113 class GuestToEmbedderChannel;
111 } 114 }
112 115
113 } // namespace content 116 } // namespace content
114 117
115 namespace gfx { 118 namespace gfx {
(...skipping 14 matching lines...) Expand all
130 133
131 } // namespace webkit 134 } // namespace webkit
132 135
133 namespace webkit_glue { 136 namespace webkit_glue {
134 class ImageResourceFetcher; 137 class ImageResourceFetcher;
135 class ResourceFetcher; 138 class ResourceFetcher;
136 } 139 }
137 140
138 #if defined(OS_ANDROID) 141 #if defined(OS_ANDROID)
139 namespace webkit_media { 142 namespace webkit_media {
143 class MediaPlayerBridgeManagerImpl;
140 class WebMediaPlayerManagerAndroid; 144 class WebMediaPlayerManagerAndroid;
141 } 145 }
142 #endif 146 #endif
143 147
144 namespace WebKit { 148 namespace WebKit {
145 class WebApplicationCacheHost; 149 class WebApplicationCacheHost;
146 class WebApplicationCacheHostClient; 150 class WebApplicationCacheHostClient;
147 class WebCompositorOutputSurface; 151 class WebCompositorOutputSurface;
148 class WebDOMMessageEvent; 152 class WebDOMMessageEvent;
149 class WebDataSource; 153 class WebDataSource;
(...skipping 1245 matching lines...) Expand 10 before | Expand all | Expand 10 after
1395 // Android Specific --------------------------------------------------------- 1399 // Android Specific ---------------------------------------------------------
1396 1400
1397 // Expected id of the next content intent launched. Used to prevent scheduled 1401 // Expected id of the next content intent launched. Used to prevent scheduled
1398 // intents to be launched if aborted. 1402 // intents to be launched if aborted.
1399 size_t expected_content_intent_id_; 1403 size_t expected_content_intent_id_;
1400 1404
1401 // List of click-based content detectors. 1405 // List of click-based content detectors.
1402 typedef std::vector< linked_ptr<content::ContentDetector> > 1406 typedef std::vector< linked_ptr<content::ContentDetector> >
1403 ContentDetectorList; 1407 ContentDetectorList;
1404 ContentDetectorList content_detectors_; 1408 ContentDetectorList content_detectors_;
1409
1410 // Proxy class for WebMediaPlayer to communicate with the real mediaplayer
1411 // objects in browser process. This object is lazily initialized.
1412 content::WebMediaPlayerProxyImplAndroid* media_player_proxy_;
scherkus (not reviewing) 2012/09/07 13:17:35 who owns this object? are we leaking it?
qinmin 2012/09/07 22:48:27 This object is inherited from RenderViewObserver.
1413
1414 // The media player manager for managing all the media players on this view.
1415 scoped_ptr<webkit_media::WebMediaPlayerManagerAndroid> media_player_manager_;
1416
1417 // Resource manager for all the android mediaplayer objects if they are
1418 // created in the renderer process. This object is lazily initialized.
1419 scoped_ptr<webkit_media::MediaPlayerBridgeManagerImpl> media_bridge_manager_;
1405 #endif 1420 #endif
1406 1421
1407 // Misc ---------------------------------------------------------------------- 1422 // Misc ----------------------------------------------------------------------
1408 1423
1409 // The current and pending file chooser completion objects. If the queue is 1424 // The current and pending file chooser completion objects. If the queue is
1410 // nonempty, the first item represents the currently running file chooser 1425 // nonempty, the first item represents the currently running file chooser
1411 // callback, and the remaining elements are the other file chooser completion 1426 // callback, and the remaining elements are the other file chooser completion
1412 // still waiting to be run (in order). 1427 // still waiting to be run (in order).
1413 struct PendingFileChooser; 1428 struct PendingFileChooser;
1414 std::deque< linked_ptr<PendingFileChooser> > file_chooser_completions_; 1429 std::deque< linked_ptr<PendingFileChooser> > file_chooser_completions_;
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
1453 // is fine. 1468 // is fine.
1454 ObserverList<content::RenderViewObserver> observers_; 1469 ObserverList<content::RenderViewObserver> observers_;
1455 1470
1456 // Used to inform didChangeSelection() when it is called in the context 1471 // Used to inform didChangeSelection() when it is called in the context
1457 // of handling a ViewMsg_SelectRange IPC. 1472 // of handling a ViewMsg_SelectRange IPC.
1458 bool handling_select_range_; 1473 bool handling_select_range_;
1459 1474
1460 // Wraps the |webwidget_| as a MouseLockDispatcher::LockTarget interface. 1475 // Wraps the |webwidget_| as a MouseLockDispatcher::LockTarget interface.
1461 scoped_ptr<MouseLockDispatcher::LockTarget> webwidget_mouse_lock_target_; 1476 scoped_ptr<MouseLockDispatcher::LockTarget> webwidget_mouse_lock_target_;
1462 1477
1463 #if defined(OS_ANDROID)
1464 // The media player manager for managing all the media players on this view.
1465 scoped_ptr<webkit_media::WebMediaPlayerManagerAndroid> media_player_manager_;
1466 #endif
1467
1468 // Plugins ------------------------------------------------------------------- 1478 // Plugins -------------------------------------------------------------------
1469 1479
1470 // All the currently active plugin delegates for this RenderView; kept so 1480 // All the currently active plugin delegates for this RenderView; kept so
1471 // that we can enumerate them to send updates about things like window 1481 // that we can enumerate them to send updates about things like window
1472 // location or tab focus and visibily. These are non-owning references. 1482 // location or tab focus and visibily. These are non-owning references.
1473 std::set<WebPluginDelegateProxy*> plugin_delegates_; 1483 std::set<WebPluginDelegateProxy*> plugin_delegates_;
1474 1484
1475 #if defined(OS_WIN) 1485 #if defined(OS_WIN)
1476 // The ID of the focused NPAPI plug-in. 1486 // The ID of the focused NPAPI plug-in.
1477 int focused_plugin_id_; 1487 int focused_plugin_id_;
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
1537 // bunch of stuff, you should probably create a helper class and put your 1547 // bunch of stuff, you should probably create a helper class and put your
1538 // data and methods on that to avoid bloating RenderView more. You can 1548 // data and methods on that to avoid bloating RenderView more. You can
1539 // use the Observer interface to filter IPC messages and receive frame change 1549 // use the Observer interface to filter IPC messages and receive frame change
1540 // notifications. 1550 // notifications.
1541 // --------------------------------------------------------------------------- 1551 // ---------------------------------------------------------------------------
1542 1552
1543 DISALLOW_COPY_AND_ASSIGN(RenderViewImpl); 1553 DISALLOW_COPY_AND_ASSIGN(RenderViewImpl);
1544 }; 1554 };
1545 1555
1546 #endif // CONTENT_RENDERER_RENDER_VIEW_IMPL_H_ 1556 #endif // CONTENT_RENDERER_RENDER_VIEW_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698