Chromium Code Reviews| Index: content/browser/renderer_host/render_widget_host_impl.cc |
| diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc |
| index 2c57a2b78d543dafaff3170cf9d2447cc2ce5d62..d6576e7e184467c810cd386bb22a740c5f788663 100644 |
| --- a/content/browser/renderer_host/render_widget_host_impl.cc |
| +++ b/content/browser/renderer_host/render_widget_host_impl.cc |
| @@ -1686,13 +1686,17 @@ void RenderWidgetHostImpl::OnShowDisambiguationPopup( |
| SkBitmap zoomed_bitmap; |
| zoomed_bitmap.installPixels(info, bitmap->pixels(), info.minRowBytes()); |
| -#if defined(OS_ANDROID) |
| +#if defined(OS_ANDROID) || defined(TOOLKIT_VIEWS) |
| + // Note that |rect| is in coordinates of pixels relative to the window origin. |
| + // Aura-based systems will want to convert this to DIPs. |
| if (view_) |
| view_->ShowDisambiguationPopup(rect, zoomed_bitmap); |
|
sky
2014/09/11 14:53:43
rect->rect_pixels and similarly rename in RenderWi
luken
2014/09/17 00:00:48
Renamed. The Android code needs pixels. I just add
|
| #else |
| NOTIMPLEMENTED(); |
| #endif |
| + // It is assumed that the disambiguation popup will make a copy of the |
| + // provided zoomed image, so we delete this one. |
| zoomed_bitmap.setPixels(0); |
| Send(new ViewMsg_ReleaseDisambiguationPopupBitmap(GetRoutingID(), id)); |
| } |