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

Side by Side Diff: chrome/renderer/render_view.cc

Issue 3333019: Back out r58711. It appears to have caused video/media-related ui_tests... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 "chrome/renderer/render_view.h" 5 #include "chrome/renderer/render_view.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 2419 matching lines...) Expand 10 before | Expand all | Expand 10 after
2430 new media::FilterFactoryCollection(); 2430 new media::FilterFactoryCollection();
2431 // Add in any custom filter factories first. 2431 // Add in any custom filter factories first.
2432 const CommandLine* cmd_line = CommandLine::ForCurrentProcess(); 2432 const CommandLine* cmd_line = CommandLine::ForCurrentProcess();
2433 if (!cmd_line->HasSwitch(switches::kDisableAudio)) { 2433 if (!cmd_line->HasSwitch(switches::kDisableAudio)) {
2434 // Add the chrome specific audio renderer. 2434 // Add the chrome specific audio renderer.
2435 factory->AddFactory( 2435 factory->AddFactory(
2436 AudioRendererImpl::CreateFactory(audio_message_filter())); 2436 AudioRendererImpl::CreateFactory(audio_message_filter()));
2437 } 2437 }
2438 2438
2439 if (cmd_line->HasSwitch(switches::kEnableAcceleratedDecoding) && 2439 if (cmd_line->HasSwitch(switches::kEnableAcceleratedDecoding) &&
2440 !cmd_line->HasSwitch(switches::kDisableAcceleratedCompositing)) { 2440 cmd_line->HasSwitch(switches::kEnableAcceleratedCompositing)) {
2441 // Add the hardware video decoder factory. 2441 // Add the hardware video decoder factory.
2442 factory->AddFactory(IpcVideoDecoder::CreateFactory( 2442 factory->AddFactory(IpcVideoDecoder::CreateFactory(
2443 MessageLoop::current(), 2443 MessageLoop::current(),
2444 reinterpret_cast<WebGLES2ContextImpl*>( 2444 reinterpret_cast<WebGLES2ContextImpl*>(
2445 webview()->gles2Context())->context())); 2445 webview()->gles2Context())->context()));
2446 } 2446 }
2447 2447
2448 WebApplicationCacheHostImpl* appcache_host = 2448 WebApplicationCacheHostImpl* appcache_host =
2449 WebApplicationCacheHostImpl::FromFrame(frame); 2449 WebApplicationCacheHostImpl::FromFrame(frame);
2450 2450
(...skipping 3227 matching lines...) Expand 10 before | Expand all | Expand 10 after
5678 PendingOpenFileSystem* request = pending_file_system_requests_.Lookup( 5678 PendingOpenFileSystem* request = pending_file_system_requests_.Lookup(
5679 request_id); 5679 request_id);
5680 DCHECK(request); 5680 DCHECK(request);
5681 if (accepted) 5681 if (accepted)
5682 request->callbacks->didOpenFileSystem(name, root_path); 5682 request->callbacks->didOpenFileSystem(name, root_path);
5683 else 5683 else
5684 request->callbacks->didFail(WebKit::WebFileErrorSecurity); 5684 request->callbacks->didFail(WebKit::WebFileErrorSecurity);
5685 request->callbacks = NULL; 5685 request->callbacks = NULL;
5686 pending_file_system_requests_.Remove(request_id); 5686 pending_file_system_requests_.Remove(request_id);
5687 } 5687 }
OLDNEW
« no previous file with comments | « chrome/renderer/render_thread.cc ('k') | chrome/renderer/webgraphicscontext3d_command_buffer_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698