Remove the coordinate hack for zoomed plugin pages on the Mac.

webkit/glue/plugins/webplugin_delegate_impl_mac.mm

 // Copyright (c) 2010 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.
 
 #import <Cocoa/Cocoa.h>
 #import <QuartzCore/QuartzCore.h>
 
 #include "webkit/glue/plugins/webplugin_delegate_impl.h"
 
 #include <string>
@@ skipping 479 matching lines @@
     return false;
 #ifndef NP_NO_CARBON
   if (instance()->event_model() == NPEventModelCarbon &&
       !np_cg_context_.context) {
     return false;
   }
 #endif
 
   if (WebInputEvent::isMouseEventType(event.type) ||
       event.type == WebInputEvent::MouseWheel) {
-    // Ideally we would compute the content origin from the web event using the
-    // code below as a safety net for missed content area location changes.
-    // Because of <http://crbug.com/9996>, however, only globalX/Y are right if
-    // the page has been zoomed, so for now the coordinates we get aren't
-    // trustworthy enough to use for corrections.
-#if PLUGIN_SCALING_FIXED
     // Check our plugin location before we send the event to the plugin, just
     // in case we somehow missed a plugin frame change.
     const WebMouseEvent* mouse_event =
         static_cast<const WebMouseEvent*>(&event);
     gfx::Point content_origin(
         mouse_event->globalX - mouse_event->x - window_rect_.x(),
         mouse_event->globalY - mouse_event->y - window_rect_.y());
     if (content_origin.x() != content_area_origin_.x() ||
         content_origin.y() != content_area_origin_.y()) {
       DLOG(WARNING) << "Stale plugin content area location: "
                     << content_area_origin_ << " instead of "
                     << content_origin;
       SetContentAreaOrigin(content_origin);
     }
-#endif
 
     current_windowless_cursor_.GetCursorInfo(cursor_info);
   }
 
 #ifndef NP_NO_CARBON
   if (instance()->event_model() == NPEventModelCarbon) {
 #ifndef NP_NO_QUICKDRAW
     if (instance()->drawing_model() == NPDrawingModelQuickDraw) {
       if (quirks_ & PLUGIN_QUIRK_ALLOW_FASTER_QUICKDRAW_PATH) {
         // Mouse event handling doesn't work correctly in the fast path mode,
@@ skipping 55 matching lines @@
         // When an external drag ends, we need to synthesize a MouseEntered.
         NPCocoaEvent enter_event = *(static_cast<NPCocoaEvent*>(plugin_event));
         enter_event.type = NPCocoaEventMouseEntered;
         NPAPI::ScopedCurrentPluginEvent event_scope(instance(), &enter_event);
         instance()->NPP_HandleEvent(&enter_event);
       }
       return false;
     }
   }
 
-#ifndef PLUGIN_SCALING_FIXED
-  // Because of <http://crbug.com/9996>, the non-global coordinates we get for
-  // zoomed pages are wrong. As a temporary hack around that bug, override the
-  // coordinates we are given with ones computed based on our knowledge of where
-  // the plugin is on screen. We only need to do this for Cocoa, since Carbon
-  // only uses the global coordinates.
-  if (instance()->event_model() == NPEventModelCocoa &&
-      (WebInputEvent::isMouseEventType(event.type) ||
-       event.type == WebInputEvent::MouseWheel)) {
-    const WebMouseEvent* mouse_event =
-        static_cast<const WebMouseEvent*>(&event);
-    NPCocoaEvent* cocoa_event = static_cast<NPCocoaEvent*>(plugin_event);
-    cocoa_event->data.mouse.pluginX =
-        mouse_event->globalX - content_area_origin_.x() - window_rect_.x();
-    cocoa_event->data.mouse.pluginY =
-        mouse_event->globalY - content_area_origin_.y() - window_rect_.y();
-  }
-#endif
-
   // Send the plugin the event.
   scoped_ptr<NPAPI::ScopedCurrentPluginEvent> event_scope(NULL);
   if (instance()->event_model() == NPEventModelCocoa) {
     event_scope.reset(new NPAPI::ScopedCurrentPluginEvent(
         instance(), static_cast<NPCocoaEvent*>(plugin_event)));
   }
   bool handled = instance()->NPP_HandleEvent(plugin_event) != 0;
 
   // Plugins don't give accurate information about whether or not they handled
   // events, so browsers on the Mac ignore the return value.
@@ skipping 526 matching lines @@
     return;
   }
 
   qd_manager_->SetFastPathEnabled(enabled);
   qd_port_.port = qd_manager_->port();
   WindowlessSetWindow();
   // Send a paint event so that the new buffer gets updated immediately.
   WindowlessPaint(buffer_context_, clip_rect_);
 }
 #endif  // !NP_NO_QUICKDRAW