OLD | NEW |
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 3720 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3731 // after Pepper API equips features related to surrounding text retrieval. | 3731 // after Pepper API equips features related to surrounding text retrieval. |
3732 gfx::Rect caret = focused_pepper_plugin_->GetCaretBounds(); | 3732 gfx::Rect caret = focused_pepper_plugin_->GetCaretBounds(); |
3733 *start = caret; | 3733 *start = caret; |
3734 *end = caret; | 3734 *end = caret; |
3735 return; | 3735 return; |
3736 } | 3736 } |
3737 #endif | 3737 #endif |
3738 RenderWidget::GetSelectionBounds(start, end); | 3738 RenderWidget::GetSelectionBounds(start, end); |
3739 } | 3739 } |
3740 | 3740 |
3741 #if defined(OS_MACOSX) || defined(USE_AURA) | 3741 #if defined(OS_MACOSX) || defined(USE_AURA) || defined(OS_ANDROID) |
3742 void RenderViewImpl::GetCompositionCharacterBounds( | 3742 void RenderViewImpl::GetCompositionCharacterBounds( |
3743 std::vector<gfx::Rect>* bounds) { | 3743 std::vector<gfx::Rect>* bounds) { |
3744 DCHECK(bounds); | 3744 DCHECK(bounds); |
3745 bounds->clear(); | 3745 bounds->clear(); |
3746 | 3746 |
3747 #if defined(ENABLE_PLUGINS) | 3747 #if defined(ENABLE_PLUGINS) |
3748 if (focused_pepper_plugin_) { | 3748 if (focused_pepper_plugin_) { |
3749 return; | 3749 return; |
3750 } | 3750 } |
3751 #endif | 3751 #endif |
(...skipping 459 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4211 std::vector<gfx::Size> sizes; | 4211 std::vector<gfx::Size> sizes; |
4212 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); | 4212 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); |
4213 if (!url.isEmpty()) | 4213 if (!url.isEmpty()) |
4214 urls.push_back( | 4214 urls.push_back( |
4215 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); | 4215 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); |
4216 } | 4216 } |
4217 SendUpdateFaviconURL(urls); | 4217 SendUpdateFaviconURL(urls); |
4218 } | 4218 } |
4219 | 4219 |
4220 } // namespace content | 4220 } // namespace content |
OLD | NEW |