Fix 3474: Context menu issues when page is zoomed....

webkit/glue/context_menu_client_impl.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 
 #include "base/compiler_specific.h"
 
 MSVC_PUSH_WARNING_LEVEL(0);
 #include "ContextMenu.h"
@@ skipping 121 matching lines @@
         WebCore::ContextMenu* default_menu) {
   // Displaying the context menu in this function is a big hack as we don't
   // have context, i.e. whether this is being invoked via a script or in 
   // response to user input (Mouse event WM_RBUTTONDOWN,
   // Keyboard events KeyVK_APPS, Shift+F10). Check if this is being invoked
   // in response to the above input events before popping up the context menu.
   if (!webview_->context_menu_allowed())
     return NULL;
 
   WebCore::HitTestResult r = default_menu->hitTestResult();
   WebCore::Frame* selected_frame = r.innerNonSharedNode()->document()->frame();

[brettw, 2008/12/22 17:09:21]

The un-adjusted hit test result is used several times before you adjust it for
the zoom factor. Are you sure this is correct?

 
   WebCore::IntPoint menu_point =
       selected_frame->view()->contentsToWindow(r.point());
 
+  // Adjust for any page zoom.
+  if (selected_frame->pageZoomFactor() != 1.0f) {
+    float zoom_factor = selected_frame->pageZoomFactor();
+    menu_point.setX(static_cast<int>(menu_point.x() * zoom_factor));
+    menu_point.setY(static_cast<int>(menu_point.y() * zoom_factor));
+    r = selected_frame->eventHandler()->hitTestResultAtPoint(menu_point, false);
+  }
+
   ContextNode::Type type = ContextNode::NONE;
 
   // Links, Images and Image-Links take preference over all else.
   WebCore::KURL link_url = r.absoluteLinkURL();
   if (!link_url.isEmpty()) {
     type = ContextNode::LINK;
   }
   WebCore::KURL image_url = r.absoluteImageURL();
   if (!image_url.isEmpty()) {
     type = ContextNode::IMAGE;
@@ skipping 114 matching lines @@
 
 bool ContextMenuClientImpl::shouldIncludeInspectElementItem() {
     return false;  // TODO(jackson): Eventually include the inspector context menu item
 }
 
 #if defined(OS_MACOSX)
 void ContextMenuClientImpl::searchWithSpotlight() {
   // TODO(pinkerton): write this
 }
 #endif