Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(33)

Side by Side Diff: chrome/browser/renderer_host/render_widget_host_view_views.h

Issue 8294026: Support IMM32 reconversion on Windows (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Fix review issues Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 #ifndef CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_VIEWS_H_ 5 #ifndef CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_VIEWS_H_
6 #define CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_VIEWS_H_ 6 #define CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_VIEWS_H_
7 #pragma once 7 #pragma once
8 8
9 #include <map> 9 #include <map>
10 #include <string> 10 #include <string>
11 #include <vector> 11 #include <vector>
12 12
13 #include "base/compiler_specific.h"
13 #include "base/memory/ref_counted.h" 14 #include "base/memory/ref_counted.h"
15 #include "base/string16.h"
14 #include "base/task.h" 16 #include "base/task.h"
15 #include "base/time.h" 17 #include "base/time.h"
16 #include "content/browser/renderer_host/render_widget_host_view.h" 18 #include "content/browser/renderer_host/render_widget_host_view.h"
17 #include "content/public/browser/notification_observer.h" 19 #include "content/public/browser/notification_observer.h"
18 #include "content/public/browser/notification_registrar.h" 20 #include "content/public/browser/notification_registrar.h"
19 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" 21 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h"
20 #include "ui/gfx/compositor/compositor_observer.h" 22 #include "ui/gfx/compositor/compositor_observer.h"
21 #include "ui/gfx/native_widget_types.h" 23 #include "ui/gfx/native_widget_types.h"
22 #include "views/controls/native/native_view_host.h" 24 #include "views/controls/native/native_view_host.h"
23 #include "views/events/event.h" 25 #include "views/events/event.h"
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after
169 virtual void InsertText(const string16& text) OVERRIDE; 171 virtual void InsertText(const string16& text) OVERRIDE;
170 virtual void InsertChar(char16 ch, int flags) OVERRIDE; 172 virtual void InsertChar(char16 ch, int flags) OVERRIDE;
171 virtual ui::TextInputType GetTextInputType() const OVERRIDE; 173 virtual ui::TextInputType GetTextInputType() const OVERRIDE;
172 virtual gfx::Rect GetCaretBounds() OVERRIDE; 174 virtual gfx::Rect GetCaretBounds() OVERRIDE;
173 virtual bool HasCompositionText() OVERRIDE; 175 virtual bool HasCompositionText() OVERRIDE;
174 virtual bool GetTextRange(ui::Range* range) OVERRIDE; 176 virtual bool GetTextRange(ui::Range* range) OVERRIDE;
175 virtual bool GetCompositionTextRange(ui::Range* range) OVERRIDE; 177 virtual bool GetCompositionTextRange(ui::Range* range) OVERRIDE;
176 virtual bool GetSelectionRange(ui::Range* range) OVERRIDE; 178 virtual bool GetSelectionRange(ui::Range* range) OVERRIDE;
177 virtual bool SetSelectionRange(const ui::Range& range) OVERRIDE; 179 virtual bool SetSelectionRange(const ui::Range& range) OVERRIDE;
178 virtual bool DeleteRange(const ui::Range& range) OVERRIDE; 180 virtual bool DeleteRange(const ui::Range& range) OVERRIDE;
179 virtual bool GetTextFromRange( 181 virtual bool GetTextFromRange(const ui::Range& range,
180 const ui::Range& range, 182 string16* text) OVERRIDE;
181 const base::Callback<void(const string16&)>& callback) OVERRIDE;
182 virtual void OnInputMethodChanged() OVERRIDE; 183 virtual void OnInputMethodChanged() OVERRIDE;
183 virtual bool ChangeTextDirectionAndLayoutAlignment( 184 virtual bool ChangeTextDirectionAndLayoutAlignment(
184 base::i18n::TextDirection direction) OVERRIDE; 185 base::i18n::TextDirection direction) OVERRIDE;
185 virtual views::View* GetOwnerViewOfTextInputClient() OVERRIDE; 186 virtual views::View* GetOwnerViewOfTextInputClient() OVERRIDE;
186 187
187 #if defined(UI_COMPOSITOR_IMAGE_TRANSPORT) 188 #if defined(UI_COMPOSITOR_IMAGE_TRANSPORT)
188 virtual void AcceleratedSurfaceNew( 189 virtual void AcceleratedSurfaceNew(
189 int32 width, 190 int32 width,
190 int32 height, 191 int32 height,
191 uint64* surface_id, 192 uint64* surface_id,
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
282 gfx::Size requested_size_; 283 gfx::Size requested_size_;
283 284
284 // The touch-event. Its touch-points are updated as necessary. A new 285 // The touch-event. Its touch-points are updated as necessary. A new
285 // touch-point is added from an ET_TOUCH_PRESSED event, and a touch-point is 286 // touch-point is added from an ET_TOUCH_PRESSED event, and a touch-point is
286 // removed from the list on an ET_TOUCH_RELEASED event. 287 // removed from the list on an ET_TOUCH_RELEASED event.
287 WebKit::WebTouchEvent touch_event_; 288 WebKit::WebTouchEvent touch_event_;
288 289
289 // The current text input type. 290 // The current text input type.
290 ui::TextInputType text_input_type_; 291 ui::TextInputType text_input_type_;
291 292
292 string16 selection_text_; 293 // Rectangles before and after the selection.
293 size_t selection_text_offset_;
294 ui::Range selection_range_;
295 gfx::Rect selection_start_rect_; 294 gfx::Rect selection_start_rect_;
296 gfx::Rect selection_end_rect_; 295 gfx::Rect selection_end_rect_;
297 296
298 // Indicates if there is onging composition text. 297 // Indicates if there is onging composition text.
299 bool has_composition_text_; 298 bool has_composition_text_;
300 299
301 string16 tooltip_text_; 300 string16 tooltip_text_;
302 301
303 #if defined(UI_COMPOSITOR_IMAGE_TRANSPORT) 302 #if defined(UI_COMPOSITOR_IMAGE_TRANSPORT)
304 std::vector< base::Callback<void(void)> > on_compositing_ended_callbacks_; 303 std::vector< base::Callback<void(void)> > on_compositing_ended_callbacks_;
(...skipping 11 matching lines...) Expand all
316 315
317 #if defined(UI_COMPOSITOR_IMAGE_TRANSPORT) 316 #if defined(UI_COMPOSITOR_IMAGE_TRANSPORT)
318 std::map<uint64, scoped_refptr<AcceleratedSurfaceContainerLinux> > 317 std::map<uint64, scoped_refptr<AcceleratedSurfaceContainerLinux> >
319 accelerated_surface_containers_; 318 accelerated_surface_containers_;
320 #endif 319 #endif
321 320
322 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewViews); 321 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewViews);
323 }; 322 };
324 323
325 #endif // CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_VIEWS_H_ 324 #endif // CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_VIEWS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698