| 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 "ui/aura/remote_window_tree_host_win.h" | 5 #include "ui/aura/remote_window_tree_host_win.h" |
| 6 | 6 |
| 7 #include <windows.h> | 7 #include <windows.h> |
| 8 | 8 |
| 9 #include <algorithm> | 9 #include <algorithm> |
| 10 | 10 |
| (...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 70 composition_text->Clear(); | 70 composition_text->Clear(); |
| 71 composition_text->text = text; | 71 composition_text->text = text; |
| 72 composition_text->selection.set_start(selection_start); | 72 composition_text->selection.set_start(selection_start); |
| 73 composition_text->selection.set_end(selection_end); | 73 composition_text->selection.set_end(selection_end); |
| 74 composition_text->underlines.resize(underlines.size()); | 74 composition_text->underlines.resize(underlines.size()); |
| 75 for (size_t i = 0; i < underlines.size(); ++i) { | 75 for (size_t i = 0; i < underlines.size(); ++i) { |
| 76 composition_text->underlines[i].start_offset = underlines[i].start_offset; | 76 composition_text->underlines[i].start_offset = underlines[i].start_offset; |
| 77 composition_text->underlines[i].end_offset = underlines[i].end_offset; | 77 composition_text->underlines[i].end_offset = underlines[i].end_offset; |
| 78 composition_text->underlines[i].color = SK_ColorBLACK; | 78 composition_text->underlines[i].color = SK_ColorBLACK; |
| 79 composition_text->underlines[i].thick = underlines[i].thick; | 79 composition_text->underlines[i].thick = underlines[i].thick; |
| 80 composition_text->underlines[i].background_color = SK_ColorTRANSPARENT; |
| 80 } | 81 } |
| 81 } | 82 } |
| 82 | 83 |
| 83 } // namespace | 84 } // namespace |
| 84 | 85 |
| 85 RemoteWindowTreeHostWin* g_instance = NULL; | 86 RemoteWindowTreeHostWin* g_instance = NULL; |
| 86 | 87 |
| 87 // static | 88 // static |
| 88 RemoteWindowTreeHostWin* RemoteWindowTreeHostWin::Instance() { | 89 RemoteWindowTreeHostWin* RemoteWindowTreeHostWin::Instance() { |
| 89 return g_instance; | 90 return g_instance; |
| (...skipping 425 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 515 } | 516 } |
| 516 | 517 |
| 517 void RemoteWindowTreeHostWin::SetEventFlags(uint32 flags) { | 518 void RemoteWindowTreeHostWin::SetEventFlags(uint32 flags) { |
| 518 if (flags == event_flags_) | 519 if (flags == event_flags_) |
| 519 return; | 520 return; |
| 520 event_flags_ = flags; | 521 event_flags_ = flags; |
| 521 SetVirtualKeyStates(event_flags_); | 522 SetVirtualKeyStates(event_flags_); |
| 522 } | 523 } |
| 523 | 524 |
| 524 } // namespace aura | 525 } // namespace aura |
| OLD | NEW |