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

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

Issue 11414138: Encrypted Media: No NeedKey if --enable-encrypted-media is not set. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: resolve comments Created 8 years 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
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 // Represents the browser side of the browser <--> renderer communication 5 // Represents the browser side of the browser <--> renderer communication
6 // channel. There will be one RenderProcessHost per renderer process. 6 // channel. There will be one RenderProcessHost per renderer process.
7 7
8 #include "content/browser/renderer_host/render_process_host_impl.h" 8 #include "content/browser/renderer_host/render_process_host_impl.h"
9 9
10 #include <algorithm> 10 #include <algorithm>
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
109 #include "ipc/ipc_platform_file.h" 109 #include "ipc/ipc_platform_file.h"
110 #include "ipc/ipc_switches.h" 110 #include "ipc/ipc_switches.h"
111 #include "ipc/ipc_sync_channel.h" 111 #include "ipc/ipc_sync_channel.h"
112 #include "media/base/media_switches.h" 112 #include "media/base/media_switches.h"
113 #include "net/url_request/url_request_context_getter.h" 113 #include "net/url_request/url_request_context_getter.h"
114 #include "ppapi/shared_impl/ppapi_switches.h" 114 #include "ppapi/shared_impl/ppapi_switches.h"
115 #include "ui/base/ui_base_switches.h" 115 #include "ui/base/ui_base_switches.h"
116 #include "ui/gl/gl_switches.h" 116 #include "ui/gl/gl_switches.h"
117 #include "webkit/fileapi/sandbox_mount_point_provider.h" 117 #include "webkit/fileapi/sandbox_mount_point_provider.h"
118 #include "webkit/glue/resource_type.h" 118 #include "webkit/glue/resource_type.h"
119 #include "webkit/media/media_switches.h"
119 #include "webkit/plugins/plugin_switches.h" 120 #include "webkit/plugins/plugin_switches.h"
120 121
121 #if defined(OS_WIN) 122 #if defined(OS_WIN)
122 #include "base/win/scoped_com_initializer.h" 123 #include "base/win/scoped_com_initializer.h"
123 #include "content/common/font_cache_dispatcher_win.h" 124 #include "content/common/font_cache_dispatcher_win.h"
124 #endif 125 #endif
125 126
126 #include "third_party/skia/include/core/SkBitmap.h" 127 #include "third_party/skia/include/core/SkBitmap.h"
127 128
128 extern bool g_exited_main_message_loop; 129 extern bool g_exited_main_message_loop;
(...skipping 1473 matching lines...) Expand 10 before | Expand all | Expand 10 after
1602 int32 gpu_process_host_id) { 1603 int32 gpu_process_host_id) {
1603 TRACE_EVENT0("renderer_host", 1604 TRACE_EVENT0("renderer_host",
1604 "RenderWidgetHostImpl::OnCompositorSurfaceBuffersSwappedNoHost"); 1605 "RenderWidgetHostImpl::OnCompositorSurfaceBuffersSwappedNoHost");
1605 RenderWidgetHostImpl::AcknowledgeBufferPresent(route_id, 1606 RenderWidgetHostImpl::AcknowledgeBufferPresent(route_id,
1606 gpu_process_host_id, 1607 gpu_process_host_id,
1607 false, 1608 false,
1608 0); 1609 0);
1609 } 1610 }
1610 1611
1611 } // namespace content 1612 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698