diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-05-24 11:40:17 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-05-24 12:42:11 +0000 |
commit | 5d87695f37678f96492b258bbab36486c59866b4 (patch) | |
tree | be9783bbaf04fb930c4d74ca9c00b5e7954c8bc6 /chromium/ui/base/ime/win/tsf_text_store.h | |
parent | 6c11fb357ec39bf087b8b632e2b1e375aef1b38b (diff) | |
download | qtwebengine-chromium-5d87695f37678f96492b258bbab36486c59866b4.tar.gz |
BASELINE: Update Chromium to 75.0.3770.56
Change-Id: I86d2007fd27a45d5797eee06f4c9369b8b50ac4f
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'chromium/ui/base/ime/win/tsf_text_store.h')
-rw-r--r-- | chromium/ui/base/ime/win/tsf_text_store.h | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/chromium/ui/base/ime/win/tsf_text_store.h b/chromium/ui/base/ime/win/tsf_text_store.h index b433e19eb8f..2605a96a462 100644 --- a/chromium/ui/base/ime/win/tsf_text_store.h +++ b/chromium/ui/base/ime/win/tsf_text_store.h @@ -10,11 +10,11 @@ #include <deque> #include "base/compiler_specific.h" +#include "base/component_export.h" #include "base/macros.h" #include "base/strings/string16.h" #include "ui/base/ime/ime_text_span.h" #include "ui/base/ime/input_method_delegate.h" -#include "ui/base/ime/ui_base_ime_export.h" #include "ui/events/event_utils.h" #include "ui/gfx/range/range.h" @@ -99,10 +99,11 @@ class TextInputClient; // // More information about TSF can be found here: // http://msdn.microsoft.com/en-us/library/ms629032 -class UI_BASE_IME_EXPORT TSFTextStore : public ITextStoreACP, - public ITfContextOwnerCompositionSink, - public ITfKeyTraceEventSink, - public ITfTextEditSink { +class COMPONENT_EXPORT(UI_BASE_IME_WIN) TSFTextStore + : public ITextStoreACP, + public ITfContextOwnerCompositionSink, + public ITfKeyTraceEventSink, + public ITfTextEditSink { public: TSFTextStore(); virtual ~TSFTextStore(); @@ -339,9 +340,13 @@ class UI_BASE_IME_EXPORT TSFTextStore : public ITextStoreACP, // edit session during same composition. |previous_composition_start_| // indicates composition start in last session during same composition. If // RequestLock() is called during two edit sessions, we don't want to set same - // composition string twice. + // composition string twice. |previous_composition_selection_range_| indicates + // the selection range during composition. We want to send the selection + // change to blink if IME only change the selection range but not the + // composition text. base::string16 previous_composition_string_; size_t previous_composition_start_ = 0; + gfx::Range previous_composition_selection_range_ = gfx::Range::InvalidRange(); // |new_text_inserted_| indicates there is text to be inserted // into blink during ITextStoreACP::SetText(). |