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

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

Issue 367002: Added Pepper 3D render context that instantiates the GPU plugin.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 10 years, 12 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
« no previous file with comments | « chrome/renderer/command_buffer_proxy.cc ('k') | chrome/renderer/webplugin_delegate_pepper.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 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 2644 matching lines...) Expand 10 before | Expand all | Expand 10 after
2655 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kInternalNaCl)) { 2655 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kInternalNaCl)) {
2656 if (mime_type == "application/x-nacl-srpc") { 2656 if (mime_type == "application/x-nacl-srpc") {
2657 in_process_plugin = true; 2657 in_process_plugin = true;
2658 use_pepper_host = true; 2658 use_pepper_host = true;
2659 } 2659 }
2660 } 2660 }
2661 if (in_process_plugin) { 2661 if (in_process_plugin) {
2662 #if defined(OS_WIN) // In-proc plugins aren't supported on Linux or Mac. 2662 #if defined(OS_WIN) // In-proc plugins aren't supported on Linux or Mac.
2663 if (use_pepper_host) { 2663 if (use_pepper_host) {
2664 return WebPluginDelegatePepper::Create( 2664 return WebPluginDelegatePepper::Create(
2665 path, *mime_type_to_use, gfx::NativeViewFromId(host_window_)); 2665 path,
2666 *mime_type_to_use,
2667 AsWeakPtr(),
2668 gfx::NativeViewFromId(host_window_));
2666 } else { 2669 } else {
2667 return WebPluginDelegateImpl::Create( 2670 return WebPluginDelegateImpl::Create(
2668 path, *mime_type_to_use, gfx::NativeViewFromId(host_window_)); 2671 path, *mime_type_to_use, gfx::NativeViewFromId(host_window_));
2669 } 2672 }
2670 #else 2673 #else
2671 NOTIMPLEMENTED(); 2674 NOTIMPLEMENTED();
2672 return NULL; 2675 return NULL;
2673 #endif 2676 #endif
2674 } 2677 }
2675 2678
(...skipping 1212 matching lines...) Expand 10 before | Expand all | Expand 10 after
3888 new PluginMsg_SignalModalDialogEvent(host_window_)); 3891 new PluginMsg_SignalModalDialogEvent(host_window_));
3889 3892
3890 message->EnableMessagePumping(); // Runs a nested message loop. 3893 message->EnableMessagePumping(); // Runs a nested message loop.
3891 bool rv = Send(message); 3894 bool rv = Send(message);
3892 3895
3893 PluginChannelHost::Broadcast( 3896 PluginChannelHost::Broadcast(
3894 new PluginMsg_ResetModalDialogEvent(host_window_)); 3897 new PluginMsg_ResetModalDialogEvent(host_window_));
3895 3898
3896 return rv; 3899 return rv;
3897 } 3900 }
OLDNEW
« no previous file with comments | « chrome/renderer/command_buffer_proxy.cc ('k') | chrome/renderer/webplugin_delegate_pepper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698