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 3560 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3571 } | 3571 } |
3572 | 3572 |
3573 #if defined(USE_AURA) | 3573 #if defined(USE_AURA) |
3574 return NULL; | 3574 return NULL; |
3575 #else | 3575 #else |
3576 return new webkit::npapi::WebPluginImpl( | 3576 return new webkit::npapi::WebPluginImpl( |
3577 frame, params, info.path, AsWeakPtr()); | 3577 frame, params, info.path, AsWeakPtr()); |
3578 #endif | 3578 #endif |
3579 } | 3579 } |
3580 | 3580 |
| 3581 void RenderViewImpl::CreateHostDispatcher( |
| 3582 const FilePath& plugin_path, |
| 3583 int plugin_child_id, |
| 3584 base::ProcessHandle plugin_process_handle, |
| 3585 const std::string& channel_handle_name) { |
| 3586 pepper_delegate_.CreateHostDispatcher(plugin_path, |
| 3587 plugin_child_id, |
| 3588 plugin_process_handle, |
| 3589 channel_handle_name); |
| 3590 } |
| 3591 |
3581 void RenderViewImpl::EvaluateScript(const string16& frame_xpath, | 3592 void RenderViewImpl::EvaluateScript(const string16& frame_xpath, |
3582 const string16& jscript, | 3593 const string16& jscript, |
3583 int id, | 3594 int id, |
3584 bool notify_result) { | 3595 bool notify_result) { |
3585 v8::Handle<v8::Value> result; | 3596 v8::Handle<v8::Value> result; |
3586 WebFrame* web_frame = GetChildFrame(frame_xpath); | 3597 WebFrame* web_frame = GetChildFrame(frame_xpath); |
3587 if (web_frame) | 3598 if (web_frame) |
3588 result = web_frame->executeScriptAndReturnValue(WebScriptSource(jscript)); | 3599 result = web_frame->executeScriptAndReturnValue(WebScriptSource(jscript)); |
3589 if (notify_result) { | 3600 if (notify_result) { |
3590 ListValue list; | 3601 ListValue list; |
(...skipping 1659 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
5250 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const { | 5261 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const { |
5251 return !!RenderThreadImpl::current()->compositor_thread(); | 5262 return !!RenderThreadImpl::current()->compositor_thread(); |
5252 } | 5263 } |
5253 | 5264 |
5254 void RenderViewImpl::OnJavaBridgeInit() { | 5265 void RenderViewImpl::OnJavaBridgeInit() { |
5255 DCHECK(!java_bridge_dispatcher_.get()); | 5266 DCHECK(!java_bridge_dispatcher_.get()); |
5256 #if defined(ENABLE_JAVA_BRIDGE) | 5267 #if defined(ENABLE_JAVA_BRIDGE) |
5257 java_bridge_dispatcher_.reset(new JavaBridgeDispatcher(this)); | 5268 java_bridge_dispatcher_.reset(new JavaBridgeDispatcher(this)); |
5258 #endif | 5269 #endif |
5259 } | 5270 } |
OLD | NEW |