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

Side by Side Diff: content/renderer/render_frame_impl.h

Issue 1995333002: Handle newCursorPosition correctly for Android's commitText() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Split confirmComposition into 2 Created 4 years, 3 months 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ 5 #ifndef CONTENT_RENDERER_RENDER_FRAME_IMPL_H_
6 #define CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ 6 #define CONTENT_RENDERER_RENDER_FRAME_IMPL_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 #include <stdint.h> 9 #include <stdint.h>
10 10
(...skipping 338 matching lines...) Expand 10 before | Expand all | Expand 10 after
349 // Notification that the given plugin has crashed. 349 // Notification that the given plugin has crashed.
350 void PluginCrashed(const base::FilePath& plugin_path, 350 void PluginCrashed(const base::FilePath& plugin_path,
351 base::ProcessId plugin_pid); 351 base::ProcessId plugin_pid);
352 352
353 // Simulates IME events for testing purpose. 353 // Simulates IME events for testing purpose.
354 void SimulateImeSetComposition( 354 void SimulateImeSetComposition(
355 const base::string16& text, 355 const base::string16& text,
356 const std::vector<blink::WebCompositionUnderline>& underlines, 356 const std::vector<blink::WebCompositionUnderline>& underlines,
357 int selection_start, 357 int selection_start,
358 int selection_end); 358 int selection_end);
359 void SimulateImeConfirmComposition(const base::string16& text, 359 void SimulateImeCommitText(const base::string16& text,
360 const gfx::Range& replacement_range); 360 const gfx::Range& replacement_range);
361 void SimulateImeFinishComposingText(bool keep_selection);
361 362
362 // TODO(jam): remove these once the IPC handler moves from RenderView to 363 // TODO(jam): remove these once the IPC handler moves from RenderView to
363 // RenderFrame. 364 // RenderFrame.
364 void OnImeSetComposition( 365 void OnImeSetComposition(
365 const base::string16& text, 366 const base::string16& text,
366 const std::vector<blink::WebCompositionUnderline>& underlines, 367 const std::vector<blink::WebCompositionUnderline>& underlines,
367 int selection_start, 368 int selection_start,
368 int selection_end); 369 int selection_end);
369 void OnImeConfirmComposition(const base::string16& text, 370 void OnImeCommitText(const base::string16& text,
370 const gfx::Range& replacement_range, 371 const gfx::Range& replacement_range,
371 bool keep_selection); 372 int relative_cursor_pos);
373 void OnImeFinishComposingText(bool keep_selection);
374
372 #endif // defined(ENABLE_PLUGINS) 375 #endif // defined(ENABLE_PLUGINS)
373 376
374 // May return NULL in some cases, especially if userMediaClient() returns 377 // May return NULL in some cases, especially if userMediaClient() returns
375 // NULL. 378 // NULL.
376 MediaStreamDispatcher* GetMediaStreamDispatcher(); 379 MediaStreamDispatcher* GetMediaStreamDispatcher();
377 380
378 #if defined(USE_EXTERNAL_POPUP_MENU) 381 #if defined(USE_EXTERNAL_POPUP_MENU)
379 void DidHideExternalPopupMenu(); 382 void DidHideExternalPopupMenu();
380 #endif 383 #endif
381 384
(...skipping 897 matching lines...) Expand 10 before | Expand all | Expand 10 after
1279 bool has_accessed_initial_document_; 1282 bool has_accessed_initial_document_;
1280 1283
1281 base::WeakPtrFactory<RenderFrameImpl> weak_factory_; 1284 base::WeakPtrFactory<RenderFrameImpl> weak_factory_;
1282 1285
1283 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl); 1286 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl);
1284 }; 1287 };
1285 1288
1286 } // namespace content 1289 } // namespace content
1287 1290
1288 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ 1291 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698