Blink: Pass 'unobscured' rect to WebPlugins.

Source/core/frame/FrameView.cpp

 /*
  * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
  *                     1999 Lars Knoll <knoll@kde.org>
  *                     1999 Antti Koivisto <koivisto@kde.org>
  *                     2000 Dirk Mueller <mueller@kde.org>
  * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
  *           (C) 2006 Graham Dennis (graham.dennis@gmail.com)
  *           (C) 2006 Alexey Proskuryakov (ap@nypop.com)
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
@@ skipping 2146 matching lines @@
 
     // Set our clip rect to be our contents.
     IntRect clipRect = contentsToRootFrame(visibleContentRect(scrollbarInclusion));
     if (!m_frame->deprecatedLocalOwner())
         return clipRect;
 
     // Take our owner element and get its clip rect.
     // FIXME: Do we need to do this for remote frames?
     HTMLFrameOwnerElement* ownerElement = m_frame->deprecatedLocalOwner();
     FrameView* parentView = ownerElement->document().view();
-    if (parentView)
-        clipRect.intersect(parentView->windowClipRectForFrameOwner(ownerElement));
+    if (parentView) {
+        IntRect elementClipRect;
+        parentView->getClipRectsForFrameOwner(ownerElement, &elementClipRect, nullptr);
+        clipRect.intersect(elementClipRect);
+    }
     return clipRect;
 }
 
-IntRect FrameView::windowClipRectForFrameOwner(const HTMLFrameOwnerElement* ownerElement) const
+void FrameView::getClipRectsForFrameOwner(const HTMLFrameOwnerElement* ownerElement, IntRect* clipRect, IntRect* unobscuredRect) const

[Julien - ping for review, 2015/03/27 21:26:07]

In Blink, we don't prefix getters with get so it should be
clipRectsForFrameOwner.

Also it seems like we should just return |clipRect| instead of having it a
non-optional parameter.

[tommycli, 2015/03/27 22:42:51]

Done.

 {
+    ASSERT(ownerElement);
+    ASSERT(clipRect);
+
+    *clipRect = windowClipRect();
+    if (unobscuredRect)
+        *unobscuredRect = IntRect();
+
     // The renderer can sometimes be null when style="display:none" interacts
     // with external content and plugins.
     if (!ownerElement->layoutObject())
-        return windowClipRect();
+        return;
 
     // If we have no layer, just return our window clip rect.
     const DeprecatedPaintLayer* enclosingLayer = ownerElement->layoutObject()->enclosingLayer();
     if (!enclosingLayer)
-        return windowClipRect();
+        return;
 
     // FIXME: childrenClipRect relies on compositingState, which is not necessarily up to date.
     // https://code.google.com/p/chromium/issues/detail?id=343769
     DisableCompositingQueryAsserts disabler;
 
     // Apply the clip from the layer.
-    IntRect clipRect = contentsToRootFrame(pixelSnappedIntRect(enclosingLayer->clipper().childrenClipRect()));
-    return intersection(clipRect, windowClipRect());
+    IntRect elementRect = contentsToRootFrame(pixelSnappedIntRect(enclosingLayer->clipper().childrenClipRect()));
+
+    clipRect->intersect(elementRect);
+
+    if (unobscuredRect) {
+        *unobscuredRect = elementRect;
+
+        // If element is not in root frame, clip to the local frame.
+        // FIXME: Do we need to do this for remote frames?
+        if (m_frame->deprecatedLocalOwner())
+            unobscuredRect->intersect(contentsToRootFrame(visibleContentRect()));
+    }
 }
 
 bool FrameView::shouldUseIntegerScrollOffset() const
 {
     if (m_frame->settings() && !m_frame->settings()->preferCompositingToLCDTextEnabled())
         return true;
     return false;
 }
 
 bool FrameView::isActive() const
@@ skipping 1847 matching lines @@
 {
     Settings* settings = frame().settings();
     if (!settings || !settings->rootLayerScrolls())
         return this;
 
     LayoutView* layoutView = this->layoutView();
     return layoutView ? layoutView->scrollableArea() : nullptr;
 }
 
 } // namespace blink