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

Unified Diff: content/browser/renderer_host/render_widget_host_impl.cc

Issue 351683002: Adds link disambiguation popup support to Windows. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: attempt to fix athena build Created 6 years, 3 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 side-by-side diff with in-line comments
Download patch
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 38b255017638b94d4942ee8a6b5c7819d4f22b20..f80eb38328dd6f6d79ac888db6fe4ce54ae116c2 100644
--- a/content/browser/renderer_host/render_widget_host_impl.cc
+++ b/content/browser/renderer_host/render_widget_host_impl.cc
@@ -1715,10 +1715,10 @@ void RenderWidgetHostImpl::OnUnlockMouse() {
}
void RenderWidgetHostImpl::OnShowDisambiguationPopup(
- const gfx::Rect& rect,
+ const gfx::Rect& rect_pixels,
const gfx::Size& size,
const cc::SharedBitmapId& id) {
- DCHECK(!rect.IsEmpty());
+ DCHECK(!rect_pixels.IsEmpty());
DCHECK(!size.IsEmpty());
scoped_ptr<cc::SharedBitmap> bitmap =
@@ -1735,13 +1735,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);
+ view_->ShowDisambiguationPopup(rect_pixels, 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);
Send(new ViewMsg_ReleaseDisambiguationPopupBitmap(GetRoutingID(), id));
}

Powered by Google App Engine
This is Rietveld 408576698