Merge 106663 - [Chromium] Use the current clip when marking paints as opaque

Source/WebCore/platform/graphics/skia/OpaqueRegionSkia.cpp

 /*
  * Copyright (c) 2012, 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 16 matching lines @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 
 #include "OpaqueRegionSkia.h"
 
 #include "PlatformContextSkia.h"
 
+#include "SkCanvas.h"
 #include "SkShader.h"
 
 namespace WebCore {
 
 OpaqueRegionSkia::OpaqueRegionSkia()
     : m_opaqueRect(SkRect::MakeEmpty())
 {
 }
 
 OpaqueRegionSkia::~OpaqueRegionSkia()
@@ skipping 182 matching lines @@
 }
 
 void OpaqueRegionSkia::didDrawUnbounded(const SkPaint& paint, bool drawsOpaque)
 {
     if (!xfermodePreservesOpaque(paint, drawsOpaque)) {
         // We don't know what was drawn on so just destroy the known opaque area.
         m_opaqueRect = SkRect::MakeEmpty();
     }
 }
 
-void OpaqueRegionSkia::markRectAsOpaque(const PlatformContextSkia* context, const SkRect& rect)
+void OpaqueRegionSkia::markRectAsOpaque(const PlatformContextSkia* context, const SkRect& paintRect)
 {
     // We want to keep track of an opaque region but bound its complexity at a constant size.
     // We keep track of the largest rectangle seen by area. If we can add the new rect to this
     // rectangle then we do that, as that is the cheapest way to increase the area returned
     // without increasing the complexity.
 
-    if (rect.isEmpty())
+    if (paintRect.isEmpty())
         return;
     if (!context->clippedToImage().isOpaque())
         return;
-    if (m_opaqueRect.contains(rect))
+    if (context->canvas()->getClipType() != SkCanvas::kRect_ClipType)
         return;
+    if (m_opaqueRect.contains(paintRect))
+        return;
+
+    // Apply the current clip.
+    SkIRect deviceClip;
+    context->canvas()->getClipDeviceBounds(&deviceClip);
+    SkRect rect = paintRect;
+    if (!rect.intersect(SkIntToScalar(deviceClip.fLeft), SkIntToScalar(deviceClip.fTop), SkIntToScalar(deviceClip.fRight), SkIntToScalar(deviceClip.fBottom)))
+        return;
+
     if (rect.contains(m_opaqueRect)) {
         m_opaqueRect = rect;
         return;
     }
 
     if (rect.fTop <= m_opaqueRect.fTop && rect.fBottom >= m_opaqueRect.fBottom) {
         if (rect.fLeft < m_opaqueRect.fLeft && rect.fRight >= m_opaqueRect.fLeft)
             m_opaqueRect.fLeft = rect.fLeft;
         if (rect.fRight > m_opaqueRect.fRight && rect.fLeft <= m_opaqueRect.fRight)
             m_opaqueRect.fRight = rect.fRight;
@@ skipping 38 matching lines @@
     else
         vertical.fLeft = rect.fRight;
 
     if ((long)horizontal.width() * (long)horizontal.height() > (long)vertical.width() * (long)vertical.height())
         m_opaqueRect = horizontal;
     else
         m_opaqueRect = vertical;
 }
 
 } // namespace WebCore