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 72a8e3c3e1b997e45c74c7317edbb516af432d75..fa4724bb817a540ecb60ecb1b3051cb927e3117c 100644 |
--- a/content/browser/renderer_host/render_widget_host_impl.cc |
+++ b/content/browser/renderer_host/render_widget_host_impl.cc |
@@ -1678,13 +1678,17 @@ void RenderWidgetHostImpl::OnShowDisambiguationPopup( |
SkBitmap zoomed_bitmap; |
zoomed_bitmap.installPixels(info, bitmap->pixels(), info.minRowBytes()); |
-#if defined(OS_ANDROID) |
+#if defined(OS_ANDROID) || defined(OS_WIN) |
sky
2014/08/04 20:05:19
OS_WIN->TOOLKIT_VIEWS
luken
2014/09/11 01:07:27
Done.
|
+ // 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); |
#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); |
sky
2014/08/04 20:05:20
Is this code necessary?
luken
2014/09/11 01:07:27
This code comes from the Android support, which ha
|
Send(new ViewMsg_ReleaseDisambiguationPopupBitmap(GetRoutingID(), id)); |
} |