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 | 9 |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
(...skipping 4642 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4653 // Sometimes we get repeated didChangeSelection calls from webkit when | 4653 // Sometimes we get repeated didChangeSelection calls from webkit when |
4654 // the selection hasn't actually changed. We don't want to report these | 4654 // the selection hasn't actually changed. We don't want to report these |
4655 // because it will cause us to continually claim the X clipboard. | 4655 // because it will cause us to continually claim the X clipboard. |
4656 if (selection_text_offset_ != offset || | 4656 if (selection_text_offset_ != offset || |
4657 selection_range_ != range || | 4657 selection_range_ != range || |
4658 selection_text_ != text) { | 4658 selection_text_ != text) { |
4659 selection_text_ = text; | 4659 selection_text_ = text; |
4660 selection_text_offset_ = offset; | 4660 selection_text_offset_ = offset; |
4661 selection_range_ = range; | 4661 selection_range_ = range; |
4662 Send(new ViewHostMsg_SelectionChanged(routing_id_, text, offset, range)); | 4662 Send(new ViewHostMsg_SelectionChanged(routing_id_, text, offset, range)); |
| 4663 UpdateTextInputState(SHOW_IME_IF_NEEDED); |
4663 } | 4664 } |
4664 } | 4665 } |
4665 | 4666 |
4666 GURL RenderViewImpl::GetAlternateErrorPageURL(const GURL& failed_url, | 4667 GURL RenderViewImpl::GetAlternateErrorPageURL(const GURL& failed_url, |
4667 ErrorPageType error_type) { | 4668 ErrorPageType error_type) { |
4668 if (failed_url.SchemeIsSecure()) { | 4669 if (failed_url.SchemeIsSecure()) { |
4669 // If the URL that failed was secure, then the embedding web page was not | 4670 // If the URL that failed was secure, then the embedding web page was not |
4670 // expecting a network attacker to be able to manipulate its contents. As | 4671 // expecting a network attacker to be able to manipulate its contents. As |
4671 // we fetch alternate error pages over HTTP, we would be allowing a network | 4672 // we fetch alternate error pages over HTTP, we would be allowing a network |
4672 // attacker to manipulate the contents of the response if we tried to use | 4673 // attacker to manipulate the contents of the response if we tried to use |
(...skipping 1833 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
6506 } | 6507 } |
6507 #endif | 6508 #endif |
6508 | 6509 |
6509 void RenderViewImpl::OnReleaseDisambiguationPopupDIB( | 6510 void RenderViewImpl::OnReleaseDisambiguationPopupDIB( |
6510 TransportDIB::Handle dib_handle) { | 6511 TransportDIB::Handle dib_handle) { |
6511 TransportDIB* dib = TransportDIB::CreateWithHandle(dib_handle); | 6512 TransportDIB* dib = TransportDIB::CreateWithHandle(dib_handle); |
6512 RenderProcess::current()->ReleaseTransportDIB(dib); | 6513 RenderProcess::current()->ReleaseTransportDIB(dib); |
6513 } | 6514 } |
6514 | 6515 |
6515 } // namespace content | 6516 } // namespace content |
OLD | NEW |