| 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 1498 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1509 | 1509 |
| 1510 bool RenderViewImpl::isSelectTrailingWhitespaceEnabled() { | 1510 bool RenderViewImpl::isSelectTrailingWhitespaceEnabled() { |
| 1511 #if defined(OS_WIN) | 1511 #if defined(OS_WIN) |
| 1512 return true; | 1512 return true; |
| 1513 #else | 1513 #else |
| 1514 return false; | 1514 return false; |
| 1515 #endif | 1515 #endif |
| 1516 } | 1516 } |
| 1517 | 1517 |
| 1518 void RenderViewImpl::didChangeSelection(bool is_empty_selection) { | 1518 void RenderViewImpl::didChangeSelection(bool is_empty_selection) { |
| 1519 // TODO(penghuang): Enable this on Window to support IME reconversion. | |
| 1520 // http://crbug.com/100220 | |
| 1521 #if defined(OS_POSIX) | |
| 1522 if (!handling_input_event_ && !handling_select_range_) | 1519 if (!handling_input_event_ && !handling_select_range_) |
| 1523 return; | 1520 return; |
| 1524 handling_select_range_ = false; | 1521 handling_select_range_ = false; |
| 1525 | 1522 |
| 1526 SyncSelectionIfRequired(); | 1523 SyncSelectionIfRequired(); |
| 1527 #endif // defined(OS_POSIX) | |
| 1528 } | 1524 } |
| 1529 | 1525 |
| 1530 void RenderViewImpl::didExecuteCommand(const WebString& command_name) { | 1526 void RenderViewImpl::didExecuteCommand(const WebString& command_name) { |
| 1531 const std::string& name = UTF16ToUTF8(command_name); | 1527 const std::string& name = UTF16ToUTF8(command_name); |
| 1532 if (StartsWithASCII(name, "Move", true) || | 1528 if (StartsWithASCII(name, "Move", true) || |
| 1533 StartsWithASCII(name, "Insert", true) || | 1529 StartsWithASCII(name, "Insert", true) || |
| 1534 StartsWithASCII(name, "Delete", true)) | 1530 StartsWithASCII(name, "Delete", true)) |
| 1535 return; | 1531 return; |
| 1536 RenderThreadImpl::current()->RecordUserMetrics(name); | 1532 RenderThreadImpl::current()->RecordUserMetrics(name); |
| 1537 } | 1533 } |
| (...skipping 3129 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4667 return webview()->settings()->useThreadedCompositor(); | 4663 return webview()->settings()->useThreadedCompositor(); |
| 4668 } | 4664 } |
| 4669 | 4665 |
| 4670 void RenderViewImpl::OnJavaBridgeInit( | 4666 void RenderViewImpl::OnJavaBridgeInit( |
| 4671 const IPC::ChannelHandle& channel_handle) { | 4667 const IPC::ChannelHandle& channel_handle) { |
| 4672 DCHECK(!java_bridge_dispatcher_.get()); | 4668 DCHECK(!java_bridge_dispatcher_.get()); |
| 4673 #if defined(ENABLE_JAVA_BRIDGE) | 4669 #if defined(ENABLE_JAVA_BRIDGE) |
| 4674 java_bridge_dispatcher_.reset(new JavaBridgeDispatcher(this, channel_handle)); | 4670 java_bridge_dispatcher_.reset(new JavaBridgeDispatcher(this, channel_handle)); |
| 4675 #endif | 4671 #endif |
| 4676 } | 4672 } |
| OLD | NEW |