Do correct hit testing for context menu items in WebViewImpl.

webkit/glue/webview_impl.cc

 /*
 * Copyright 2007 Google Inc. All Rights Reserved.
 *
 * Portions Copyright (C) 2006 Apple Computer, Inc.  All rights reserved.
 *
 * ***** BEGIN LICENSE BLOCK *****
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
@@ skipping 428 matching lines @@
 
 void WebViewImpl::MouseContextMenu(const WebMouseEvent& event) {
   if (!main_frame() || !main_frame()->frameview())
     return;
 
   page_->contextMenuController()->clearContextMenu();
 
   MakePlatformMouseEvent pme(main_frame()->frameview(), event);
 
   // Find the right target frame. See issue 1186900.
-  IntPoint doc_point(
-      page_->mainFrame()->view()->windowToContents(pme.pos()));
-  HitTestResult result =
-      page_->mainFrame()->eventHandler()->hitTestResultAtPoint(
-          doc_point, false);
+  HitTestResult result = HitTestResultForWindowPos(pme.pos());
   Frame* target_frame;
   if (result.innerNonSharedNode())
     target_frame = result.innerNonSharedNode()->document()->frame();
   else
     target_frame = page_->focusController()->focusedOrMainFrame();
 
 #if defined(OS_WIN)
   target_frame->view()->setCursor(pointerCursor());
 #endif
 
@@ skipping 914 matching lines @@
   zoom_level_ = 0;
   main_frame()->frame()->setZoomFactor(
       1.0f,
       main_frame()->frame()->isZoomFactorTextOnly());
 }
 
 void WebViewImpl::CopyImageAt(int x, int y) {
   if (!page_.get())
     return;
 
-  IntPoint point = IntPoint(x, y);
-
-  Frame* frame = page_->mainFrame();
-
-  HitTestResult result =
-      frame->eventHandler()->hitTestResultAtPoint(point, false);
+  HitTestResult result = HitTestResultForWindowPos(IntPoint(x, y));
 
   if (result.absoluteImageURL().isEmpty()) {
     // There isn't actually an image at these coordinates.  Might be because
     // the window scrolled while the context menu was open or because the page
     // changed itself between when we thought there was an image here and when
     // we actually tried to retreive the image.
     //
     // TODO: implement a cache of the most recent HitTestResult to avoid having
     //       to do two hit tests.
     return;
   }
 
-  frame->editor()->copyImage(result);
+  page_->mainFrame()->editor()->copyImage(result);
 }
 
 void WebViewImpl::InspectElement(int x, int y) {
   if (!page_.get())
     return;
 
   if (x == -1 || y == -1) {
     page_->inspectorController()->inspect(NULL);
   } else {
-    IntPoint point = IntPoint(x, y);
-    HitTestResult result(point);
-
-    result = page_->mainFrame()->eventHandler()->hitTestResultAtPoint(point, false);
+    HitTestResult result = HitTestResultForWindowPos(IntPoint(x, y));
 
     if (!result.innerNonSharedNode())
       return;
 
     page_->inspectorController()->inspect(result.innerNonSharedNode());
   }
 }
 
 void WebViewImpl::ShowJavaScriptConsole() {
   page_->inspectorController()->showPanel(InspectorController::ConsolePanel);
@@ skipping 276 matching lines @@
   Frame* frame = page_->focusController()->focusedFrame();
   if (!frame)
     return NULL;
 
   Document* document = frame->document();
   if (!document)
     return NULL;
 
   return document->focusedNode();
 }
+
+HitTestResult WebViewImpl::HitTestResultForWindowPos(const IntPoint& pos) {
+  IntPoint doc_point(
+      page_->mainFrame()->view()->windowToContents(pos));
+  return page_->mainFrame()->eventHandler()->
+      hitTestResultAtPoint(doc_point, false);
+}