Changeset 139083 in webkit

Timestamp:

Jan 8, 2013 11:15:56 AM (11 years ago)

Author:

alokp@chromium.org

Message:

Added OpaqueRegionSkia::currentTrackingOpaqueRect

[chromium] Add OpaqueRegionSkia::currentTrackingOpaqueRect
​https://bugs.webkit.org/show_bug.cgi?id=106267

Reviewed by Stephen White.

No new tests needed. No change in functionality.

• platform/graphics/skia/OpaqueRegionSkia.cpp:

(WebCore::OpaqueRegionSkia::applyOpaqueRegionFromLayer):
(WebCore::OpaqueRegionSkia::markRectAsOpaque):
(WebCore::OpaqueRegionSkia::markRectAsNonOpaque):
(WebCore::OpaqueRegionSkia::markAllAsNonOpaque):
(WebCore::OpaqueRegionSkia::currentTrackingOpaqueRect):
(WebCore):

• platform/graphics/skia/OpaqueRegionSkia.h:

(OpaqueRegionSkia):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/skia/OpaqueRegionSkia.cpp (modified) (5 diffs)
• platform/graphics/skia/OpaqueRegionSkia.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-01-08  Alok Priyadarshi  <alokp@chromium.org>
+
+        Added OpaqueRegionSkia::currentTrackingOpaqueRect
+
+        [chromium] Add OpaqueRegionSkia::currentTrackingOpaqueRect
+        https://bugs.webkit.org/show_bug.cgi?id=106267
+
+        Reviewed by Stephen White.
+
+        No new tests needed. No change in functionality.
+
+        * platform/graphics/skia/OpaqueRegionSkia.cpp:
+        (WebCore::OpaqueRegionSkia::applyOpaqueRegionFromLayer):
+        (WebCore::OpaqueRegionSkia::markRectAsOpaque):
+        (WebCore::OpaqueRegionSkia::markRectAsNonOpaque):
+        (WebCore::OpaqueRegionSkia::markAllAsNonOpaque):
+        (WebCore::OpaqueRegionSkia::currentTrackingOpaqueRect):
+        (WebCore):
+        * platform/graphics/skia/OpaqueRegionSkia.h:
+        (OpaqueRegionSkia):
+
 2013-01-08  Zan Dobersek  <zandobersek@gmail.com>
 

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

@@ -165 +165 @@
 }
 
-static inline SkRect& currentTrackingOpaqueRect(SkRect& rootOpaqueRect, Vector<OpaqueRegionSkia::CanvasLayerState, 3>& canvasLayerStack)
-{
-    // If we are drawing into a canvas layer, then track the opaque rect in that layer.
-    if (!canvasLayerStack.isEmpty())
-        return canvasLayerStack.last().opaqueRect;
-    return rootOpaqueRect;
-}
-
 void OpaqueRegionSkia::pushCanvasLayer(const SkPaint* paint)
 {
@@ -334 +326 @@
     SkRect sourceOpaqueRect = layerOpaqueRect;
     // Save the opaque area in the destination, so we can preserve the parts of it under the source opaque area if possible.
-    SkRect destinationOpaqueRect = currentTrackingOpaqueRect(m_opaqueRect, m_canvasLayerStack);
+    SkRect destinationOpaqueRect = currentTrackingOpaqueRect();
 
     bool outsideSourceOpaqueRectPreservesOpaque = xfermodePreservesOpaque(paint, false);
@@ -364 +356 @@
     // without increasing the complexity.
 
-    SkRect& opaqueRect = currentTrackingOpaqueRect(m_opaqueRect, m_canvasLayerStack);
+    SkRect& opaqueRect = currentTrackingOpaqueRect();
 
     if (rect.isEmpty())
@@ -398 +390 @@
     // rectangle inside m_opaqueRect that does not intersect with |rect|.
 
-    SkRect& opaqueRect = currentTrackingOpaqueRect(m_opaqueRect, m_canvasLayerStack);
+    SkRect& opaqueRect = currentTrackingOpaqueRect();
 
     if (!SkRect::Intersects(rect, opaqueRect))
@@ -433 +425 @@
 void OpaqueRegionSkia::markAllAsNonOpaque()
 {
-    SkRect& opaqueRect = currentTrackingOpaqueRect(m_opaqueRect, m_canvasLayerStack);
+    SkRect& opaqueRect = currentTrackingOpaqueRect();
     opaqueRect.setEmpty();
 }
 
+SkRect& OpaqueRegionSkia::currentTrackingOpaqueRect()
+{
+    // If we are drawing into a canvas layer, then track the opaque rect in that layer.
+    return m_canvasLayerStack.isEmpty() ? m_opaqueRect : m_canvasLayerStack.last().opaqueRect;
+}
+
 } // namespace WebCore

trunk/Source/WebCore/platform/graphics/skia/OpaqueRegionSkia.h

@@ -92 +92 @@
     void markAllAsNonOpaque();
 
+    SkRect& currentTrackingOpaqueRect();
+
     SkRect m_opaqueRect;