summaryrefslogtreecommitdiffstats
path: root/content/renderer/render_widget.cc
diff options
context:
space:
mode:
authorkinaba@chromium.org <kinaba@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-21 22:40:50 +0000
committerkinaba@chromium.org <kinaba@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-21 22:40:50 +0000
commit3f783369aa10fa323d79b6ec69afbd7035350fcd (patch)
treee1a5000171b7c854a8625947817e541a5843f419 /content/renderer/render_widget.cc
parent5d921d4cb8e9d5c90366183a523817b99c9bc63f (diff)
downloadchromium_src-3f783369aa10fa323d79b6ec69afbd7035350fcd.zip
chromium_src-3f783369aa10fa323d79b6ec69afbd7035350fcd.tar.gz
chromium_src-3f783369aa10fa323d79b6ec69afbd7035350fcd.tar.bz2
Handle the change from CaretBounds to SelectionBounds for PPAPI Plugins.
BUG=101173 TEST=Manual: run ppapi_example_ime and verify the candidate window to pop up in a correct place, or open a Flash website with text field on Chrome OS, and verify that the candidate window is displayed in the bottom-left corner of the Flash rect. This CL is to reflect the refactoring http://crrev.com/105699 on IPCs also for Pepper plugins, and make IME candidate windows to be displayed on intended positions. Review URL: http://codereview.chromium.org/8363015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106796 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer/render_widget.cc')
-rw-r--r--content/renderer/render_widget.cc19
1 files changed, 9 insertions, 10 deletions
diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc
index 960fa49..f7c7362 100644
--- a/content/renderer/render_widget.cc
+++ b/content/renderer/render_widget.cc
@@ -1313,22 +1313,21 @@ void RenderWidget::UpdateTextInputState() {
}
}
-gfx::Rect RenderWidget::GetCaretBounds() {
- if (!webwidget_)
- return gfx::Rect();
- return webwidget_->caretOrSelectionBounds();
+void RenderWidget::GetSelectionBounds(gfx::Rect* start, gfx::Rect* end) {
+ WebRect start_webrect;
+ WebRect end_webrect;
+ webwidget_->selectionBounds(start_webrect, end_webrect);
+ *start = start_webrect;
+ *end = end_webrect;
}
void RenderWidget::UpdateSelectionBounds() {
if (!webwidget_)
return;
- WebRect start;
- WebRect end;
- webwidget_->selectionBounds(start, end);
-
- gfx::Rect start_rect = start;
- gfx::Rect end_rect = end;
+ gfx::Rect start_rect;
+ gfx::Rect end_rect;
+ GetSelectionBounds(&start_rect, &end_rect);
if (selection_start_rect_ == start_rect && selection_end_rect_ == end_rect)
return;