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

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

Issue 356903002: Revert "Revert 279650 "Add VaapiVideoEncodeAccelerator for HW-accelerate..."" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 6 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 // 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 1238 matching lines...) Expand 10 before | Expand all | Expand 10 after
1249 switches::kDisableWebAudio, 1249 switches::kDisableWebAudio,
1250 #endif 1250 #endif
1251 #if defined(OS_MACOSX) 1251 #if defined(OS_MACOSX)
1252 // Allow this to be set when invoking the browser and relayed along. 1252 // Allow this to be set when invoking the browser and relayed along.
1253 switches::kEnableSandboxLogging, 1253 switches::kEnableSandboxLogging,
1254 #endif 1254 #endif
1255 #if defined(OS_WIN) 1255 #if defined(OS_WIN)
1256 switches::kDisableDirectWrite, 1256 switches::kDisableDirectWrite,
1257 switches::kEnableHighResolutionTime, 1257 switches::kEnableHighResolutionTime,
1258 #endif 1258 #endif
1259 #if defined(OS_CHROMEOS)
1260 switches::kEnableVaapiAcceleratedVideoEncode,
1261 #endif
1259 }; 1262 };
1260 renderer_cmd->CopySwitchesFrom(browser_cmd, kSwitchNames, 1263 renderer_cmd->CopySwitchesFrom(browser_cmd, kSwitchNames,
1261 arraysize(kSwitchNames)); 1264 arraysize(kSwitchNames));
1262 1265
1263 if (browser_cmd.HasSwitch(switches::kTraceStartup) && 1266 if (browser_cmd.HasSwitch(switches::kTraceStartup) &&
1264 BrowserMainLoop::GetInstance()->is_tracing_startup()) { 1267 BrowserMainLoop::GetInstance()->is_tracing_startup()) {
1265 // Pass kTraceStartup switch to renderer only if startup tracing has not 1268 // Pass kTraceStartup switch to renderer only if startup tracing has not
1266 // finished. 1269 // finished.
1267 renderer_cmd->AppendSwitchASCII( 1270 renderer_cmd->AppendSwitchASCII(
1268 switches::kTraceStartup, 1271 switches::kTraceStartup,
(...skipping 1089 matching lines...) Expand 10 before | Expand all | Expand 10 after
2358 void RenderProcessHostImpl::GpuMemoryBufferAllocated( 2361 void RenderProcessHostImpl::GpuMemoryBufferAllocated(
2359 IPC::Message* reply, 2362 IPC::Message* reply,
2360 const gfx::GpuMemoryBufferHandle& handle) { 2363 const gfx::GpuMemoryBufferHandle& handle) {
2361 DCHECK_CURRENTLY_ON(BrowserThread::UI); 2364 DCHECK_CURRENTLY_ON(BrowserThread::UI);
2362 ChildProcessHostMsg_SyncAllocateGpuMemoryBuffer::WriteReplyParams(reply, 2365 ChildProcessHostMsg_SyncAllocateGpuMemoryBuffer::WriteReplyParams(reply,
2363 handle); 2366 handle);
2364 Send(reply); 2367 Send(reply);
2365 } 2368 }
2366 2369
2367 } // namespace content 2370 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/gpu/gpu_process_host.cc ('k') | content/common/gpu/media/gpu_video_encode_accelerator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698