| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 4638 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4649 pepper_delegate_.OnMouseLockLost(); | 4649 pepper_delegate_.OnMouseLockLost(); |
| 4650 } | 4650 } |
| 4651 | 4651 |
| 4652 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const { | 4652 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const { |
| 4653 return webview()->settings()->useThreadedCompositor(); | 4653 return webview()->settings()->useThreadedCompositor(); |
| 4654 } | 4654 } |
| 4655 | 4655 |
| 4656 void RenderViewImpl::OnJavaBridgeInit( | 4656 void RenderViewImpl::OnJavaBridgeInit( |
| 4657 const IPC::ChannelHandle& channel_handle) { | 4657 const IPC::ChannelHandle& channel_handle) { |
| 4658 DCHECK(!java_bridge_dispatcher_.get()); | 4658 DCHECK(!java_bridge_dispatcher_.get()); |
| 4659 #if defined(ENABLE_JAVA_BRIDGE) |
| 4659 java_bridge_dispatcher_.reset(new JavaBridgeDispatcher(this, channel_handle)); | 4660 java_bridge_dispatcher_.reset(new JavaBridgeDispatcher(this, channel_handle)); |
| 4661 #endif |
| 4660 } | 4662 } |
| OLD | NEW |