diff options
| author | awalker@google.com <awalker@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-12 23:09:35 +0000 |
|---|---|---|
| committer | awalker@google.com <awalker@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-12 23:09:35 +0000 |
| commit | 0f0981df65123740e2e873f33cec192c85218c79 (patch) | |
| tree | 9d2f4f5dddab7a15212cc556fcc50717dc57a952 /webkit/glue | |
| parent | 2ecfe2aeacfbd30e38a309eb1c0f017d6ec5e1ac (diff) | |
| download | chromium_src-0f0981df65123740e2e873f33cec192c85218c79.zip chromium_src-0f0981df65123740e2e873f33cec192c85218c79.tar.gz chromium_src-0f0981df65123740e2e873f33cec192c85218c79.tar.bz2 | |
Chromium side of WebKit merge to 40846
Darin: primary
Brett: FYI
Review URL: http://codereview.chromium.org/21243
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9712 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue')
| -rw-r--r-- | webkit/glue/context_menu_client_impl.cc | 6 | ||||
| -rw-r--r-- | webkit/glue/webframe_impl.cc | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/webkit/glue/context_menu_client_impl.cc b/webkit/glue/context_menu_client_impl.cc index dea8840..584cbe0 100644 --- a/webkit/glue/context_menu_client_impl.cc +++ b/webkit/glue/context_menu_client_impl.cc @@ -76,9 +76,9 @@ std::wstring GetMisspelledWord(const WebCore::ContextMenu* default_menu, WebCore::VisiblePosition pos(inner_node->renderer()->positionForPoint( hit_test_result.localPoint())); - WebCore::Selection selection; + WebCore::VisibleSelection selection; if (pos.isNotNull()) { - selection = WebCore::Selection(pos); + selection = WebCore::VisibleSelection(pos); selection.expandUsingGranularity(WebCore::WordGranularity); } @@ -96,7 +96,7 @@ std::wstring GetMisspelledWord(const WebCore::ContextMenu* default_menu, // If misspelled word is empty, then that portion should not be selected. // Set the selection to that position only, and do not expand. if (misspelled_word_string.empty()) { - selection = WebCore::Selection(pos); + selection = WebCore::VisibleSelection(pos); selected_frame->selection()->setSelection(selection); } diff --git a/webkit/glue/webframe_impl.cc b/webkit/glue/webframe_impl.cc index e44bb9c..b8b70db 100644 --- a/webkit/glue/webframe_impl.cc +++ b/webkit/glue/webframe_impl.cc @@ -176,7 +176,7 @@ using WebCore::RenderObject; using WebCore::ResourceError; using WebCore::ResourceHandle; using WebCore::ResourceRequest; -using WebCore::Selection; +using WebCore::VisibleSelection; using WebCore::SharedBuffer; using WebCore::String; using WebCore::SubstituteData; @@ -814,7 +814,7 @@ bool WebFrameImpl::Find(const FindInPageRequest& request, main_frame_impl->active_match_frame_ = this; // We found something, so we can now query the selection for its position. - Selection new_selection(frame()->selection()->selection()); + VisibleSelection new_selection(frame()->selection()->selection()); IntRect curr_selection_rect; // If we thought we found something, but it couldn't be selected (perhaps @@ -1176,7 +1176,7 @@ void WebFrameImpl::SetFindEndstateFocusAndSelection() { active_match_.get()) { // If the user has changed the selection since the match was found, we // don't focus anything. - Selection selection(frame()->selection()->selection()); + VisibleSelection selection(frame()->selection()->selection()); if (selection.isNone() || (selection.start() == selection.end()) || active_match_->boundingBox() != selection.toNormalizedRange()->boundingBox()) |