OLD | NEW |
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 3603 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3614 } | 3614 } |
3615 | 3615 |
3616 #if defined(USE_AURA) | 3616 #if defined(USE_AURA) |
3617 return NULL; | 3617 return NULL; |
3618 #else | 3618 #else |
3619 return new webkit::npapi::WebPluginImpl( | 3619 return new webkit::npapi::WebPluginImpl( |
3620 frame, params, info.path, AsWeakPtr()); | 3620 frame, params, info.path, AsWeakPtr()); |
3621 #endif | 3621 #endif |
3622 } | 3622 } |
3623 | 3623 |
| 3624 void RenderViewImpl::CreatePepperHostDispatcher( |
| 3625 const FilePath& plugin_path, |
| 3626 int plugin_child_id, |
| 3627 base::ProcessHandle plugin_process_handle, |
| 3628 const IPC::ChannelHandle& channel_handle) { |
| 3629 pepper_delegate_.CreatePepperHostDispatcher(plugin_path, |
| 3630 plugin_child_id, |
| 3631 plugin_process_handle, |
| 3632 channel_handle); |
| 3633 } |
| 3634 |
3624 void RenderViewImpl::EvaluateScript(const string16& frame_xpath, | 3635 void RenderViewImpl::EvaluateScript(const string16& frame_xpath, |
3625 const string16& jscript, | 3636 const string16& jscript, |
3626 int id, | 3637 int id, |
3627 bool notify_result) { | 3638 bool notify_result) { |
3628 v8::Handle<v8::Value> result; | 3639 v8::Handle<v8::Value> result; |
3629 WebFrame* web_frame = GetChildFrame(frame_xpath); | 3640 WebFrame* web_frame = GetChildFrame(frame_xpath); |
3630 if (web_frame) | 3641 if (web_frame) |
3631 result = web_frame->executeScriptAndReturnValue(WebScriptSource(jscript)); | 3642 result = web_frame->executeScriptAndReturnValue(WebScriptSource(jscript)); |
3632 if (notify_result) { | 3643 if (notify_result) { |
3633 ListValue list; | 3644 ListValue list; |
(...skipping 1674 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
5308 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const { | 5319 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const { |
5309 return !!RenderThreadImpl::current()->compositor_thread(); | 5320 return !!RenderThreadImpl::current()->compositor_thread(); |
5310 } | 5321 } |
5311 | 5322 |
5312 void RenderViewImpl::OnJavaBridgeInit() { | 5323 void RenderViewImpl::OnJavaBridgeInit() { |
5313 DCHECK(!java_bridge_dispatcher_.get()); | 5324 DCHECK(!java_bridge_dispatcher_.get()); |
5314 #if defined(ENABLE_JAVA_BRIDGE) | 5325 #if defined(ENABLE_JAVA_BRIDGE) |
5315 java_bridge_dispatcher_.reset(new JavaBridgeDispatcher(this)); | 5326 java_bridge_dispatcher_.reset(new JavaBridgeDispatcher(this)); |
5316 #endif | 5327 #endif |
5317 } | 5328 } |
OLD | NEW |