Merge 114275

Source/WebKit/chromium/src/WebPluginContainerImpl.cpp

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 435 matching lines @@
 }
 
 bool WebPluginContainerImpl::isRectTopmost(const WebRect& rect)
 {
     Page* page = m_element->document()->page();
     if (!page)
         return false;
 
     // hitTestResultAtPoint() takes a padding rectangle.
     // FIXME: We'll be off by 1 when the width or height is even.
-    IntRect windowRect = convertToContainingWindow(static_cast<IntRect>(rect));
-    LayoutPoint center = windowRect.center();
+    IntRect documentRect(x() + rect.x, y() + rect.y, rect.width, rect.height);
+    LayoutPoint center = documentRect.center();
     // Make the rect we're checking (the point surrounded by padding rects) contained inside the requested rect. (Note that -1/2 is 0.)
-    LayoutSize padding((windowRect.width() - 1) / 2, (windowRect.height() - 1) / 2);
+    LayoutSize padding((documentRect.width() - 1) / 2, (documentRect.height() - 1) / 2);
     HitTestResult result =
         page->mainFrame()->eventHandler()->hitTestResultAtPoint(center, false, false, DontHitTestScrollbars, HitTestRequest::ReadOnly | HitTestRequest::Active, padding);
     const HitTestResult::NodeSet& nodes = result.rectBasedTestResult();
     if (nodes.size() != 1)
         return false;
     return (nodes.first().get() == m_element);
 }
 
 void WebPluginContainerImpl::didReceiveResponse(const ResourceResponse& response)
 {
@@ skipping 225 matching lines @@
         // frame view.
         RenderLayer* layer = m_element->renderer()->enclosingLayer();
         clipRect.intersect(
             m_element->document()->view()->windowClipRectForLayer(layer, true));
     }
 
     return clipRect;
 }
 
 } // namespace WebKit