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