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

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

Issue 12892010: Remove WebMediaPlayerInProcessAndroid (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 9 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/renderer/render_view_impl.h" 5 #include "content/renderer/render_view_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <cmath> 8 #include <cmath>
9 9
10 #include "base/auto_reset.h" 10 #include "base/auto_reset.h"
(...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after
217 #include "content/renderer/android/phone_number_detector.h" 217 #include "content/renderer/android/phone_number_detector.h"
218 #include "content/renderer/media/stream_texture_factory_impl_android.h" 218 #include "content/renderer/media/stream_texture_factory_impl_android.h"
219 #include "content/renderer/media/webmediaplayer_proxy_impl_android.h" 219 #include "content/renderer/media/webmediaplayer_proxy_impl_android.h"
220 #include "third_party/WebKit/Source/Platform/chromium/public/WebFloatPoint.h" 220 #include "third_party/WebKit/Source/Platform/chromium/public/WebFloatPoint.h"
221 #include "third_party/WebKit/Source/Platform/chromium/public/WebFloatRect.h" 221 #include "third_party/WebKit/Source/Platform/chromium/public/WebFloatRect.h"
222 #include "third_party/WebKit/Source/WebKit/chromium/public/WebHitTestResult.h" 222 #include "third_party/WebKit/Source/WebKit/chromium/public/WebHitTestResult.h"
223 #include "ui/gfx/rect_f.h" 223 #include "ui/gfx/rect_f.h"
224 #include "webkit/media/android/media_player_bridge_manager_impl.h" 224 #include "webkit/media/android/media_player_bridge_manager_impl.h"
225 #include "webkit/media/android/webmediaplayer_android.h" 225 #include "webkit/media/android/webmediaplayer_android.h"
226 #include "webkit/media/android/webmediaplayer_impl_android.h" 226 #include "webkit/media/android/webmediaplayer_impl_android.h"
227 #include "webkit/media/android/webmediaplayer_in_process_android.h"
228 #include "webkit/media/android/webmediaplayer_manager_android.h" 227 #include "webkit/media/android/webmediaplayer_manager_android.h"
229 #elif defined(OS_WIN) 228 #elif defined(OS_WIN)
230 // TODO(port): these files are currently Windows only because they concern: 229 // TODO(port): these files are currently Windows only because they concern:
231 // * theming 230 // * theming
232 #include "ui/native_theme/native_theme_win.h" 231 #include "ui/native_theme/native_theme_win.h"
233 #elif defined(USE_X11) 232 #elif defined(USE_X11)
234 #include "ui/native_theme/native_theme.h" 233 #include "ui/native_theme/native_theme.h"
235 #elif defined(OS_MACOSX) 234 #elif defined(OS_MACOSX)
236 #include "skia/ext/skia_utils_mac.h" 235 #include "skia/ext/skia_utils_mac.h"
237 #endif 236 #endif
(...skipping 6284 matching lines...) Expand 10 before | Expand all | Expand 10 after
6522 TransportDIB* dib = TransportDIB::CreateWithHandle(dib_handle); 6521 TransportDIB* dib = TransportDIB::CreateWithHandle(dib_handle);
6523 RenderProcess::current()->ReleaseTransportDIB(dib); 6522 RenderProcess::current()->ReleaseTransportDIB(dib);
6524 } 6523 }
6525 6524
6526 void RenderViewImpl::DidCommitCompositorFrame() { 6525 void RenderViewImpl::DidCommitCompositorFrame() {
6527 RenderWidget::DidCommitCompositorFrame(); 6526 RenderWidget::DidCommitCompositorFrame();
6528 FOR_EACH_OBSERVER(RenderViewObserver, observers_, DidCommitCompositorFrame()); 6527 FOR_EACH_OBSERVER(RenderViewObserver, observers_, DidCommitCompositorFrame());
6529 } 6528 }
6530 6529
6531 } // namespace content 6530 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698