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

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

Issue 10214007: Add an IPC channel between the NaCl loader process and the renderer. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 7 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 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 3577 matching lines...) Expand 10 before | Expand all | Expand 10 after
3588 } 3588 }
3589 3589
3590 #if defined(USE_AURA) 3590 #if defined(USE_AURA)
3591 return NULL; 3591 return NULL;
3592 #else 3592 #else
3593 return new webkit::npapi::WebPluginImpl( 3593 return new webkit::npapi::WebPluginImpl(
3594 frame, params, info.path, AsWeakPtr()); 3594 frame, params, info.path, AsWeakPtr());
3595 #endif 3595 #endif
3596 } 3596 }
3597 3597
3598 void RenderViewImpl::CreatePepperHostDispatcher(
3599 const FilePath& plugin_path,
3600 int plugin_child_id,
3601 base::ProcessHandle plugin_process_handle,
3602 const IPC::ChannelHandle& channel_handle) {
3603 pepper_delegate_.CreatePepperHostDispatcher(plugin_path,
3604 plugin_child_id,
3605 plugin_process_handle,
3606 channel_handle);
3607 }
3608
3598 void RenderViewImpl::EvaluateScript(const string16& frame_xpath, 3609 void RenderViewImpl::EvaluateScript(const string16& frame_xpath,
3599 const string16& jscript, 3610 const string16& jscript,
3600 int id, 3611 int id,
3601 bool notify_result) { 3612 bool notify_result) {
3602 v8::Handle<v8::Value> result; 3613 v8::Handle<v8::Value> result;
3603 WebFrame* web_frame = GetChildFrame(frame_xpath); 3614 WebFrame* web_frame = GetChildFrame(frame_xpath);
3604 if (web_frame) 3615 if (web_frame)
3605 result = web_frame->executeScriptAndReturnValue(WebScriptSource(jscript)); 3616 result = web_frame->executeScriptAndReturnValue(WebScriptSource(jscript));
3606 if (notify_result) { 3617 if (notify_result) {
3607 ListValue list; 3618 ListValue list;
(...skipping 1668 matching lines...) Expand 10 before | Expand all | Expand 10 after
5276 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const { 5287 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const {
5277 return !!RenderThreadImpl::current()->compositor_thread(); 5288 return !!RenderThreadImpl::current()->compositor_thread();
5278 } 5289 }
5279 5290
5280 void RenderViewImpl::OnJavaBridgeInit() { 5291 void RenderViewImpl::OnJavaBridgeInit() {
5281 DCHECK(!java_bridge_dispatcher_.get()); 5292 DCHECK(!java_bridge_dispatcher_.get());
5282 #if defined(ENABLE_JAVA_BRIDGE) 5293 #if defined(ENABLE_JAVA_BRIDGE)
5283 java_bridge_dispatcher_.reset(new JavaBridgeDispatcher(this)); 5294 java_bridge_dispatcher_.reset(new JavaBridgeDispatcher(this));
5284 #endif 5295 #endif
5285 } 5296 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698