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

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

Issue 10836053: Add IPCs/methods for additional IME actions. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: now calling WebKit implementations of setCompositionFromExistingText and ExtendSelectionAndDelete; … Created 8 years, 4 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 (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 #ifndef CONTENT_RENDERER_RENDER_VIEW_IMPL_H_ 5 #ifndef CONTENT_RENDERER_RENDER_VIEW_IMPL_H_
6 #define CONTENT_RENDERER_RENDER_VIEW_IMPL_H_ 6 #define CONTENT_RENDERER_RENDER_VIEW_IMPL_H_
7 7
8 #include <deque> 8 #include <deque>
9 #include <map> 9 #include <map>
10 #include <set> 10 #include <set>
(...skipping 781 matching lines...) Expand 10 before | Expand all | Expand 10 after
792 FRIEND_TEST_ALL_PREFIXES(ExternalPopupMenuRemoveTest, RemoveOnChange); 792 FRIEND_TEST_ALL_PREFIXES(ExternalPopupMenuRemoveTest, RemoveOnChange);
793 FRIEND_TEST_ALL_PREFIXES(ExternalPopupMenuTest, NormalCase); 793 FRIEND_TEST_ALL_PREFIXES(ExternalPopupMenuTest, NormalCase);
794 FRIEND_TEST_ALL_PREFIXES(ExternalPopupMenuTest, ShowPopupThenNavigate); 794 FRIEND_TEST_ALL_PREFIXES(ExternalPopupMenuTest, ShowPopupThenNavigate);
795 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, DecideNavigationPolicyForWebUI); 795 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, DecideNavigationPolicyForWebUI);
796 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, 796 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest,
797 DontIgnoreBackAfterNavEntryLimit); 797 DontIgnoreBackAfterNavEntryLimit);
798 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, ImeComposition); 798 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, ImeComposition);
799 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, InsertCharacters); 799 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, InsertCharacters);
800 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, JSBlockSentAfterPageLoad); 800 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, JSBlockSentAfterPageLoad);
801 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, LastCommittedUpdateState); 801 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, LastCommittedUpdateState);
802 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, OnExtendSelectionAndDelete);
802 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, OnHandleKeyboardEvent); 803 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, OnHandleKeyboardEvent);
803 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, OnImeStateChanged); 804 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, OnImeStateChanged);
804 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, OnNavStateChanged); 805 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, OnNavStateChanged);
806 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, OnReplaceAll);
805 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, OnSetTextDirection); 807 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, OnSetTextDirection);
806 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, OnUpdateWebPreferences); 808 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, OnUpdateWebPreferences);
807 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, SendSwapOutACK); 809 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, SendSwapOutACK);
810 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest,
811 SetEditableSelectionAndComposition);
808 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, StaleNavigationsIgnored); 812 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, StaleNavigationsIgnored);
809 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, UpdateTargetURLWithInvalidURL); 813 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, UpdateTargetURLWithInvalidURL);
810 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, 814 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest,
811 GetCompositionCharacterBoundsTest); 815 GetCompositionCharacterBoundsTest);
812 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, OnNavigationHttpPost); 816 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, OnNavigationHttpPost);
813 #if defined(OS_MACOSX) 817 #if defined(OS_MACOSX)
814 FRIEND_TEST_ALL_PREFIXES(RenderViewTest, MacTestCmdUp); 818 FRIEND_TEST_ALL_PREFIXES(RenderViewTest, MacTestCmdUp);
815 #endif 819 #endif
816 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, SetHistoryLengthAndPrune); 820 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, SetHistoryLengthAndPrune);
817 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, ZoomLimit); 821 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, ZoomLimit);
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
932 void OnDragTargetDragLeave(); 936 void OnDragTargetDragLeave();
933 void OnDragTargetDragOver(const gfx::Point& client_pt, 937 void OnDragTargetDragOver(const gfx::Point& client_pt,
934 const gfx::Point& screen_pt, 938 const gfx::Point& screen_pt,
935 WebKit::WebDragOperationsMask operations_allowed, 939 WebKit::WebDragOperationsMask operations_allowed,
936 int key_modifiers); 940 int key_modifiers);
937 void OnEnablePreferredSizeChangedMode(); 941 void OnEnablePreferredSizeChangedMode();
938 void OnEnableAutoResize(const gfx::Size& min_size, const gfx::Size& max_size); 942 void OnEnableAutoResize(const gfx::Size& min_size, const gfx::Size& max_size);
939 void OnDisableAutoResize(const gfx::Size& new_size); 943 void OnDisableAutoResize(const gfx::Size& new_size);
940 void OnEnumerateDirectoryResponse(int id, const std::vector<FilePath>& paths); 944 void OnEnumerateDirectoryResponse(int id, const std::vector<FilePath>& paths);
941 void OnExecuteEditCommand(const std::string& name, const std::string& value); 945 void OnExecuteEditCommand(const std::string& name, const std::string& value);
946 void OnExtendSelectionAndDelete(int before, int after);
942 void OnFileChooserResponse( 947 void OnFileChooserResponse(
943 const std::vector<ui::SelectedFileInfo>& files); 948 const std::vector<ui::SelectedFileInfo>& files);
944 void OnFind(int request_id, const string16&, const WebKit::WebFindOptions&); 949 void OnFind(int request_id, const string16&, const WebKit::WebFindOptions&);
945 void OnGetAllSavableResourceLinksForCurrentPage(const GURL& page_url); 950 void OnGetAllSavableResourceLinksForCurrentPage(const GURL& page_url);
946 void OnGetSerializedHtmlDataForCurrentPageWithLocalLinks( 951 void OnGetSerializedHtmlDataForCurrentPageWithLocalLinks(
947 const std::vector<GURL>& links, 952 const std::vector<GURL>& links,
948 const std::vector<FilePath>& local_paths, 953 const std::vector<FilePath>& local_paths,
949 const FilePath& local_directory_name); 954 const FilePath& local_directory_name);
950 void OnMediaPlayerActionAt(const gfx::Point& location, 955 void OnMediaPlayerActionAt(const gfx::Point& location,
951 const WebKit::WebMediaPlayerAction& action); 956 const WebKit::WebMediaPlayerAction& action);
952 957
953 // Screen has rotated. 0 = default (portrait), 90 = one turn right, and so on. 958 // Screen has rotated. 0 = default (portrait), 90 = one turn right, and so on.
954 void OnOrientationChangeEvent(int orientation); 959 void OnOrientationChangeEvent(int orientation);
955 960
956 void OnPluginActionAt(const gfx::Point& location, 961 void OnPluginActionAt(const gfx::Point& location,
957 const WebKit::WebPluginAction& action); 962 const WebKit::WebPluginAction& action);
958 void OnMoveOrResizeStarted(); 963 void OnMoveOrResizeStarted();
959 CONTENT_EXPORT void OnNavigate(const ViewMsg_Navigate_Params& params); 964 CONTENT_EXPORT void OnNavigate(const ViewMsg_Navigate_Params& params);
960 void OnPaste(); 965 void OnPaste();
961 void OnPasteAndMatchStyle(); 966 void OnPasteAndMatchStyle();
962 #if defined(OS_MACOSX) 967 #if defined(OS_MACOSX)
963 void OnPluginImeCompositionCompleted(const string16& text, int plugin_id); 968 void OnPluginImeCompositionCompleted(const string16& text, int plugin_id);
964 #endif 969 #endif
965 void OnPostMessageEvent(const ViewMsg_PostMessage_Params& params); 970 void OnPostMessageEvent(const ViewMsg_PostMessage_Params& params);
966 void OnRedo(); 971 void OnRedo();
967 void OnReloadFrame(); 972 void OnReloadFrame();
968 void OnReplace(const string16& text); 973 void OnReplace(const string16& text);
974 void OnReplaceAll(const string16& text);
969 void OnResetPageEncodingToDefault(); 975 void OnResetPageEncodingToDefault();
970 void OnScriptEvalRequest(const string16& frame_xpath, 976 void OnScriptEvalRequest(const string16& frame_xpath,
971 const string16& jscript, 977 const string16& jscript,
972 int id, 978 int id,
973 bool notify_result); 979 bool notify_result);
974 void OnSelectAll(); 980 void OnSelectAll();
975 void OnSelectRange(const gfx::Point& start, const gfx::Point& end); 981 void OnSelectRange(const gfx::Point& start, const gfx::Point& end);
976 CONTENT_EXPORT void OnSetAccessibilityMode(AccessibilityMode new_mode); 982 CONTENT_EXPORT void OnSetAccessibilityMode(AccessibilityMode new_mode);
977 void OnSetActive(bool active); 983 void OnSetActive(bool active);
978 void OnSetAltErrorPageURL(const GURL& gurl); 984 void OnSetAltErrorPageURL(const GURL& gurl);
979 void OnSetBackground(const SkBitmap& background); 985 void OnSetBackground(const SkBitmap& background);
986 void OnSetCompositionFromExistingText(
987 int start, int end,
988 const std::vector<WebKit::WebCompositionUnderline>& underlines);
989 void OnSetEditableSelectionOffsets(int start, int end);
980 void OnSetNavigationStartTime( 990 void OnSetNavigationStartTime(
981 const base::TimeTicks& browser_navigation_start); 991 const base::TimeTicks& browser_navigation_start);
982 void OnSetWebUIProperty(const std::string& name, const std::string& value); 992 void OnSetWebUIProperty(const std::string& name, const std::string& value);
983 CONTENT_EXPORT void OnSetEditCommandsForNextKeyEvent( 993 CONTENT_EXPORT void OnSetEditCommandsForNextKeyEvent(
984 const EditCommands& edit_commands); 994 const EditCommands& edit_commands);
985 CONTENT_EXPORT void OnSetHistoryLengthAndPrune(int history_length, 995 CONTENT_EXPORT void OnSetHistoryLengthAndPrune(int history_length,
986 int32 minimum_page_id); 996 int32 minimum_page_id);
987 void OnSetInitialFocus(bool reverse); 997 void OnSetInitialFocus(bool reverse);
988 #if defined(OS_MACOSX) 998 #if defined(OS_MACOSX)
989 void OnSetInLiveResize(bool in_live_resize); 999 void OnSetInLiveResize(bool in_live_resize);
(...skipping 10 matching lines...) Expand all
1000 void OnExitFullscreen(); 1010 void OnExitFullscreen();
1001 void OnShouldClose(); 1011 void OnShouldClose();
1002 void OnStop(); 1012 void OnStop();
1003 void OnStopFinding(content::StopFindAction action); 1013 void OnStopFinding(content::StopFindAction action);
1004 CONTENT_EXPORT void OnSwapOut(const ViewMsg_SwapOut_Params& params); 1014 CONTENT_EXPORT void OnSwapOut(const ViewMsg_SwapOut_Params& params);
1005 void OnThemeChanged(); 1015 void OnThemeChanged();
1006 void OnUndo(); 1016 void OnUndo();
1007 void OnUpdateTargetURLAck(); 1017 void OnUpdateTargetURLAck();
1008 CONTENT_EXPORT void OnUpdateWebPreferences( 1018 CONTENT_EXPORT void OnUpdateWebPreferences(
1009 const webkit_glue::WebPreferences& prefs); 1019 const webkit_glue::WebPreferences& prefs);
1020 void OnUnselect();
1010 1021
1011 #if defined(OS_MACOSX) 1022 #if defined(OS_MACOSX)
1012 void OnWindowFrameChanged(const gfx::Rect& window_frame, 1023 void OnWindowFrameChanged(const gfx::Rect& window_frame,
1013 const gfx::Rect& view_frame); 1024 const gfx::Rect& view_frame);
1014 CONTENT_EXPORT void OnSelectPopupMenuItem(int selected_index); 1025 CONTENT_EXPORT void OnSelectPopupMenuItem(int selected_index);
1015 #endif 1026 #endif
1016 1027
1017 #if defined(OS_ANDROID) 1028 #if defined(OS_ANDROID)
1018 void OnSelectPopupMenuItems(bool canceled, 1029 void OnSelectPopupMenuItems(bool canceled,
1019 const std::vector<int>& selected_indices); 1030 const std::vector<int>& selected_indices);
(...skipping 428 matching lines...) Expand 10 before | Expand all | Expand 10 after
1448 // bunch of stuff, you should probably create a helper class and put your 1459 // bunch of stuff, you should probably create a helper class and put your
1449 // data and methods on that to avoid bloating RenderView more. You can 1460 // data and methods on that to avoid bloating RenderView more. You can
1450 // use the Observer interface to filter IPC messages and receive frame change 1461 // use the Observer interface to filter IPC messages and receive frame change
1451 // notifications. 1462 // notifications.
1452 // --------------------------------------------------------------------------- 1463 // ---------------------------------------------------------------------------
1453 1464
1454 DISALLOW_COPY_AND_ASSIGN(RenderViewImpl); 1465 DISALLOW_COPY_AND_ASSIGN(RenderViewImpl);
1455 }; 1466 };
1456 1467
1457 #endif // CONTENT_RENDERER_RENDER_VIEW_IMPL_H_ 1468 #endif // CONTENT_RENDERER_RENDER_VIEW_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698