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

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

Issue 2568093003: Support parsing BackgroundSpans and UnderlineSpans in Android IME's commitText() (Closed)
Patch Set: Use addCompositionUnderlines() where I said I couldn't Created 3 years, 11 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
« no previous file with comments | « content/renderer/render_frame_impl.h ('k') | content/renderer/render_view_browsertest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #include "content/renderer/render_frame_impl.h" 5 #include "content/renderer/render_frame_impl.h"
6 6
7 #include <map> 7 #include <map>
8 #include <string> 8 #include <string>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 1373 matching lines...) Expand 10 before | Expand all | Expand 10 after
1384 const std::vector<blink::WebCompositionUnderline>& underlines, 1384 const std::vector<blink::WebCompositionUnderline>& underlines,
1385 int selection_start, 1385 int selection_start,
1386 int selection_end) { 1386 int selection_end) {
1387 render_view_->OnImeSetComposition( 1387 render_view_->OnImeSetComposition(
1388 text, underlines, gfx::Range::InvalidRange(), 1388 text, underlines, gfx::Range::InvalidRange(),
1389 selection_start, selection_end); 1389 selection_start, selection_end);
1390 } 1390 }
1391 1391
1392 void RenderFrameImpl::SimulateImeCommitText( 1392 void RenderFrameImpl::SimulateImeCommitText(
1393 const base::string16& text, 1393 const base::string16& text,
1394 const std::vector<blink::WebCompositionUnderline>& underlines,
1394 const gfx::Range& replacement_range) { 1395 const gfx::Range& replacement_range) {
1395 render_view_->OnImeCommitText(text, replacement_range, 0); 1396 render_view_->OnImeCommitText(text, underlines, replacement_range, 0);
1396 } 1397 }
1397 1398
1398 void RenderFrameImpl::SimulateImeFinishComposingText(bool keep_selection) { 1399 void RenderFrameImpl::SimulateImeFinishComposingText(bool keep_selection) {
1399 render_view_->OnImeFinishComposingText(keep_selection); 1400 render_view_->OnImeFinishComposingText(keep_selection);
1400 } 1401 }
1401 1402
1402 void RenderFrameImpl::OnImeSetComposition( 1403 void RenderFrameImpl::OnImeSetComposition(
1403 const base::string16& text, 1404 const base::string16& text,
1404 const std::vector<blink::WebCompositionUnderline>& underlines, 1405 const std::vector<blink::WebCompositionUnderline>& underlines,
1405 int selection_start, 1406 int selection_start,
(...skipping 5379 matching lines...) Expand 10 before | Expand all | Expand 10 after
6785 // event target. Potentially a Pepper plugin will receive the event. 6786 // event target. Potentially a Pepper plugin will receive the event.
6786 // In order to tell whether a plugin gets the last mouse event and which it 6787 // In order to tell whether a plugin gets the last mouse event and which it
6787 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets 6788 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets
6788 // the event, it will notify us via DidReceiveMouseEvent() and set itself as 6789 // the event, it will notify us via DidReceiveMouseEvent() and set itself as
6789 // |pepper_last_mouse_event_target_|. 6790 // |pepper_last_mouse_event_target_|.
6790 pepper_last_mouse_event_target_ = nullptr; 6791 pepper_last_mouse_event_target_ = nullptr;
6791 #endif 6792 #endif
6792 } 6793 }
6793 6794
6794 } // namespace content 6795 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/render_frame_impl.h ('k') | content/renderer/render_view_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698