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 653 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
664 IPC_MESSAGE_HANDLER(PepperMsg_ConnectTcpACK, OnConnectTcpACK) | 664 IPC_MESSAGE_HANDLER(PepperMsg_ConnectTcpACK, OnConnectTcpACK) |
665 #endif | 665 #endif |
666 #if defined(OS_MACOSX) | 666 #if defined(OS_MACOSX) |
667 IPC_MESSAGE_HANDLER(ViewMsg_SetInLiveResize, OnSetInLiveResize) | 667 IPC_MESSAGE_HANDLER(ViewMsg_SetInLiveResize, OnSetInLiveResize) |
668 #endif | 668 #endif |
669 IPC_MESSAGE_HANDLER(ViewMsg_SetHistoryLengthAndPrune, | 669 IPC_MESSAGE_HANDLER(ViewMsg_SetHistoryLengthAndPrune, |
670 OnSetHistoryLengthAndPrune) | 670 OnSetHistoryLengthAndPrune) |
671 IPC_MESSAGE_HANDLER(ViewMsg_EnableViewSourceMode, OnEnableViewSourceMode) | 671 IPC_MESSAGE_HANDLER(ViewMsg_EnableViewSourceMode, OnEnableViewSourceMode) |
672 IPC_MESSAGE_HANDLER(ViewMsg_LockMouse_ACK, OnLockMouseACK) | 672 IPC_MESSAGE_HANDLER(ViewMsg_LockMouse_ACK, OnLockMouseACK) |
673 IPC_MESSAGE_HANDLER(ViewMsg_MouseLockLost, OnMouseLockLost) | 673 IPC_MESSAGE_HANDLER(ViewMsg_MouseLockLost, OnMouseLockLost) |
674 #if defined(ENABLE_JAVA_BRIDGE) | |
jam
2011/10/24 17:43:21
ditto
| |
674 IPC_MESSAGE_HANDLER(JavaBridgeMsg_Init, OnJavaBridgeInit) | 675 IPC_MESSAGE_HANDLER(JavaBridgeMsg_Init, OnJavaBridgeInit) |
676 #endif | |
675 | 677 |
676 // Have the super handle all other messages. | 678 // Have the super handle all other messages. |
677 IPC_MESSAGE_UNHANDLED(handled = RenderWidget::OnMessageReceived(message)) | 679 IPC_MESSAGE_UNHANDLED(handled = RenderWidget::OnMessageReceived(message)) |
678 IPC_END_MESSAGE_MAP() | 680 IPC_END_MESSAGE_MAP() |
679 | 681 |
680 if (!msg_is_ok) { | 682 if (!msg_is_ok) { |
681 // The message had a handler, but its deserialization failed. | 683 // The message had a handler, but its deserialization failed. |
682 // Kill the renderer to avoid potential spoofing attacks. | 684 // Kill the renderer to avoid potential spoofing attacks. |
683 CHECK(false) << "Unable to deserialize message in RenderViewImpl."; | 685 CHECK(false) << "Unable to deserialize message in RenderViewImpl."; |
684 } | 686 } |
(...skipping 3961 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
4646 } | 4648 } |
4647 | 4649 |
4648 void RenderViewImpl::OnMouseLockLost() { | 4650 void RenderViewImpl::OnMouseLockLost() { |
4649 pepper_delegate_.OnMouseLockLost(); | 4651 pepper_delegate_.OnMouseLockLost(); |
4650 } | 4652 } |
4651 | 4653 |
4652 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const { | 4654 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const { |
4653 return webview()->settings()->useThreadedCompositor(); | 4655 return webview()->settings()->useThreadedCompositor(); |
4654 } | 4656 } |
4655 | 4657 |
4658 #if defined(ENABLE_JAVA_BRIDGE) | |
jam
2011/10/24 17:43:21
this can just be around line 4662
| |
4656 void RenderViewImpl::OnJavaBridgeInit( | 4659 void RenderViewImpl::OnJavaBridgeInit( |
4657 const IPC::ChannelHandle& channel_handle) { | 4660 const IPC::ChannelHandle& channel_handle) { |
4658 DCHECK(!java_bridge_dispatcher_.get()); | 4661 DCHECK(!java_bridge_dispatcher_.get()); |
4659 java_bridge_dispatcher_.reset(new JavaBridgeDispatcher(this, channel_handle)); | 4662 java_bridge_dispatcher_.reset(new JavaBridgeDispatcher(this, channel_handle)); |
4660 } | 4663 } |
4664 #endif | |
OLD | NEW |