| 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/browser/renderer_host/render_widget_host_view_aura.h" | 5 #include "content/browser/renderer_host/render_widget_host_view_aura.h" |
| 6 | 6 |
| 7 #include <set> | 7 #include <set> |
| 8 #include <utility> | 8 #include <utility> |
| 9 | 9 |
| 10 #include "base/auto_reset.h" | 10 #include "base/auto_reset.h" |
| (...skipping 1606 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1617 blink::WebCompositionUnderline(static_cast<unsigned>(it->start_offset), | 1617 blink::WebCompositionUnderline(static_cast<unsigned>(it->start_offset), |
| 1618 static_cast<unsigned>(it->end_offset), | 1618 static_cast<unsigned>(it->end_offset), |
| 1619 it->color, | 1619 it->color, |
| 1620 it->thick, | 1620 it->thick, |
| 1621 it->background_color)); | 1621 it->background_color)); |
| 1622 } | 1622 } |
| 1623 | 1623 |
| 1624 // TODO(suzhe): due to a bug of webkit, we can't use selection range with | 1624 // TODO(suzhe): due to a bug of webkit, we can't use selection range with |
| 1625 // composition string. See: https://bugs.webkit.org/show_bug.cgi?id=37788 | 1625 // composition string. See: https://bugs.webkit.org/show_bug.cgi?id=37788 |
| 1626 host_->ImeSetComposition(composition.text, underlines, | 1626 host_->ImeSetComposition(composition.text, underlines, |
| 1627 gfx::Range::InvalidRange(), |
| 1627 composition.selection.end(), | 1628 composition.selection.end(), |
| 1628 composition.selection.end()); | 1629 composition.selection.end()); |
| 1629 | 1630 |
| 1630 has_composition_text_ = !composition.text.empty(); | 1631 has_composition_text_ = !composition.text.empty(); |
| 1631 } | 1632 } |
| 1632 | 1633 |
| 1633 void RenderWidgetHostViewAura::ConfirmCompositionText() { | 1634 void RenderWidgetHostViewAura::ConfirmCompositionText() { |
| 1634 if (host_ && has_composition_text_) { | 1635 if (host_ && has_composition_text_) { |
| 1635 host_->ImeConfirmComposition(base::string16(), gfx::Range::InvalidRange(), | 1636 host_->ImeConfirmComposition(base::string16(), gfx::Range::InvalidRange(), |
| 1636 false); | 1637 false); |
| (...skipping 1441 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3078 | 3079 |
| 3079 //////////////////////////////////////////////////////////////////////////////// | 3080 //////////////////////////////////////////////////////////////////////////////// |
| 3080 // RenderWidgetHostViewBase, public: | 3081 // RenderWidgetHostViewBase, public: |
| 3081 | 3082 |
| 3082 // static | 3083 // static |
| 3083 void RenderWidgetHostViewBase::GetDefaultScreenInfo(WebScreenInfo* results) { | 3084 void RenderWidgetHostViewBase::GetDefaultScreenInfo(WebScreenInfo* results) { |
| 3084 GetScreenInfoForWindow(results, NULL); | 3085 GetScreenInfoForWindow(results, NULL); |
| 3085 } | 3086 } |
| 3086 | 3087 |
| 3087 } // namespace content | 3088 } // namespace content |
| OLD | NEW |