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

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

Issue 671503005: Plumb composition character bounds for Android 5.0 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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 #include "content/renderer/render_view_impl.h" 5 #include "content/renderer/render_view_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <cmath> 8 #include <cmath>
9 9
10 #include "base/auto_reset.h" 10 #include "base/auto_reset.h"
(...skipping 3711 matching lines...) Expand 10 before | Expand all | Expand 10 after
3722 // after Pepper API equips features related to surrounding text retrieval. 3722 // after Pepper API equips features related to surrounding text retrieval.
3723 gfx::Rect caret = focused_pepper_plugin_->GetCaretBounds(); 3723 gfx::Rect caret = focused_pepper_plugin_->GetCaretBounds();
3724 *start = caret; 3724 *start = caret;
3725 *end = caret; 3725 *end = caret;
3726 return; 3726 return;
3727 } 3727 }
3728 #endif 3728 #endif
3729 RenderWidget::GetSelectionBounds(start, end); 3729 RenderWidget::GetSelectionBounds(start, end);
3730 } 3730 }
3731 3731
3732 #if defined(OS_MACOSX) || defined(USE_AURA) 3732 #if defined(OS_MACOSX) || defined(USE_AURA) || defined(OS_ANDROID)
3733 void RenderViewImpl::GetCompositionCharacterBounds( 3733 void RenderViewImpl::GetCompositionCharacterBounds(
3734 std::vector<gfx::Rect>* bounds) { 3734 std::vector<gfx::Rect>* bounds) {
3735 DCHECK(bounds); 3735 DCHECK(bounds);
3736 bounds->clear(); 3736 bounds->clear();
3737 3737
3738 #if defined(ENABLE_PLUGINS) 3738 #if defined(ENABLE_PLUGINS)
3739 if (focused_pepper_plugin_) { 3739 if (focused_pepper_plugin_) {
3740 return; 3740 return;
3741 } 3741 }
3742 #endif 3742 #endif
(...skipping 459 matching lines...) Expand 10 before | Expand all | Expand 10 after
4202 std::vector<gfx::Size> sizes; 4202 std::vector<gfx::Size> sizes;
4203 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); 4203 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes);
4204 if (!url.isEmpty()) 4204 if (!url.isEmpty())
4205 urls.push_back( 4205 urls.push_back(
4206 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); 4206 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes));
4207 } 4207 }
4208 SendUpdateFaviconURL(urls); 4208 SendUpdateFaviconURL(urls);
4209 } 4209 }
4210 4210
4211 } // namespace content 4211 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698