summaryrefslogtreecommitdiffstats
path: root/webkit/glue/webframe_impl.cc
diff options
context:
space:
mode:
Diffstat (limited to 'webkit/glue/webframe_impl.cc')
-rw-r--r--webkit/glue/webframe_impl.cc11
1 files changed, 6 insertions, 5 deletions
diff --git a/webkit/glue/webframe_impl.cc b/webkit/glue/webframe_impl.cc
index 7df51c5..5cf992f 100644
--- a/webkit/glue/webframe_impl.cc
+++ b/webkit/glue/webframe_impl.cc
@@ -827,7 +827,7 @@ bool WebFrameImpl::Find(const FindInPageRequest& request,
(new_selection.start() == new_selection.end())) {
active_match_ = NULL;
} else {
- active_match_ = new_selection.toRange();
+ active_match_ = new_selection.toNormalizedRange();
curr_selection_rect = active_match_->boundingBox();
}
@@ -1179,7 +1179,8 @@ void WebFrameImpl::SetFindEndstateFocusAndSelection() {
// don't focus anything.
Selection selection(frame()->selection()->selection());
if (selection.isNone() || (selection.start() == selection.end()) ||
- active_match_->boundingBox() != selection.toRange()->boundingBox())
+ active_match_->boundingBox() !=
+ selection.toNormalizedRange()->boundingBox())
return;
// We will be setting focus ourselves, so we want the view to forget its
@@ -1307,8 +1308,8 @@ void WebFrameImpl::Paste() {
void WebFrameImpl::Replace(const std::wstring& wtext) {
String text = webkit_glue::StdWStringToString(wtext);
- RefPtr<DocumentFragment> fragment =
- createFragmentFromText(frame()->selection()->toRange().get(), text);
+ RefPtr<DocumentFragment> fragment = createFragmentFromText(
+ frame()->selection()->toNormalizedRange().get(), text);
WebCore::applyCommand(WebCore::ReplaceSelectionCommand::create(
frame()->document(), fragment.get(), false, true, true));
}
@@ -1350,7 +1351,7 @@ void WebFrameImpl::ClearSelection() {
}
std::string WebFrameImpl::GetSelection(bool as_html) {
- RefPtr<Range> range = frame()->selection()->toRange();
+ RefPtr<Range> range = frame()->selection()->toNormalizedRange();
if (!range.get())
return std::string();