Blink: Pass 'unobscured' rect to WebPlugins.

Source/web/WebPluginContainerImpl.cpp

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  * Copyright (C) 2014 Opera Software ASA. 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.
@@ skipping 389 matching lines @@
 {
     invalidateRect(rect);
 }
 
 void WebPluginContainerImpl::reportGeometry()
 {
     // We cannot compute geometry without a parent or renderer.
     if (!parent() || !m_element->layoutObject())
         return;
 
-    IntRect windowRect, clipRect;
+    IntRect windowRect, clipRect, unobscuredRect;
     Vector<IntRect> cutOutRects;
-    calculateGeometry(frameRect(), windowRect, clipRect, cutOutRects);
+    calculateGeometry(windowRect, clipRect, unobscuredRect, cutOutRects);
 
-    m_webPlugin->updateGeometry(windowRect, clipRect, cutOutRects, isVisible());
+    m_webPlugin->updateGeometry(windowRect, clipRect, unobscuredRect, cutOutRects, isVisible());
 
     if (m_scrollbarGroup) {
         m_scrollbarGroup->scrollAnimator()->contentsResized();
         m_scrollbarGroup->setFrameRect(frameRect());
     }
 }
 
 void WebPluginContainerImpl::allowScriptObjects()
 {
 }
@@ skipping 533 matching lines @@
 
 void WebPluginContainerImpl::focusPlugin()
 {
     LocalFrame& containingFrame = toFrameView(parent())->frame();
     if (Page* currentPage = containingFrame.page())
         currentPage->focusController().setFocusedElement(m_element, &containingFrame);
     else
         containingFrame.document()->setFocusedElement(m_element);
 }
 
-void WebPluginContainerImpl::calculateGeometry(const IntRect& frameRect,
-                                               IntRect& windowRect,
-                                               IntRect& clipRect,
-                                               Vector<IntRect>& cutOutRects)
+void WebPluginContainerImpl::calculateGeometry(IntRect& windowRect, IntRect& clipRect, IntRect& unobscuredRect, Vector<IntRect>& cutOutRects)
 {
-    windowRect = toFrameView(parent())->contentsToRootFrame(frameRect);
+    windowRect = toFrameView(parent())->contentsToRootFrame(frameRect());
 
     // Calculate a clip-rect so that we don't overlap the scrollbars, etc.
-    clipRect = windowClipRect();
-    clipRect.move(-windowRect.x(), -windowRect.y());
-
-    getPluginOcclusions(m_element, this->parent(), frameRect, cutOutRects);
-    // Convert to the plugin position.
-    for (size_t i = 0; i < cutOutRects.size(); i++)
-        cutOutRects[i].move(-frameRect.x(), -frameRect.y());
-}
-
-IntRect WebPluginContainerImpl::windowClipRect() const
-{
-    // Start by clipping to our bounds.
-    IntRect clipRect =
+    IntRect rawClipRect =
         convertToContainingWindow(IntRect(0, 0, width(), height()));
 
     // document().layoutView() can be 0 when we receive messages from the
     // plugins while we are destroying a frame.
     // FIXME: Can we just check m_element->document().isActive() ?
     if (m_element->layoutObject()->document().layoutView()) {
         // Take our element and get the clip rect from the enclosing layer and
         // frame view.
-        clipRect.intersect(
-            m_element->document().view()->windowClipRectForFrameOwner(m_element));
+        clipRect = intersection(rawClipRect, m_element->document().view()->windowClipRectForFrameOwner(m_element));
+        unobscuredRect = intersection(rawClipRect, m_element->document().view()->unobscuredRectForFrameOwner(m_element));
     }

[piman, 2015/03/24 23:59:21]

clipRect and unobscuredRect aren't initialized in the else case. Is that on
purpose? It looks like it would at least change the meaning of clipRect.

[tommycli, 2015/03/25 20:18:35]

Done.

 
-    return clipRect;
+    clipRect.move(-windowRect.x(), -windowRect.y());
+    unobscuredRect.move(-windowRect.x(), -windowRect.y());
+
+    getPluginOcclusions(m_element, this->parent(), frameRect(), cutOutRects);
+    // Convert to the plugin position.
+    for (size_t i = 0; i < cutOutRects.size(); i++)
+        cutOutRects[i].move(-frameRect().x(), -frameRect().y());
 }
 
 bool WebPluginContainerImpl::pluginShouldPersist() const
 {
     return m_webPlugin->shouldPersist();
 }
 
 } // namespace blink