Title: [114115] trunk/Source/WebCore
Revision
114115
Author
r...@google.com
Date
2012-04-13 05:12:30 -0700 (Fri, 13 Apr 2012)

Log Message

use getClipDeviceBounds, rather than (deprecated) getTotalClip
https://bugs.webkit.org/show_bug.cgi?id=83808

Reviewed by Stephen White.

Equivalent functionality, existing tests apply.

* platform/graphics/skia/OpaqueRegionSkia.cpp:
(WebCore::OpaqueRegionSkia::didDraw):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (114114 => 114115)


--- trunk/Source/WebCore/ChangeLog	2012-04-13 12:02:05 UTC (rev 114114)
+++ trunk/Source/WebCore/ChangeLog	2012-04-13 12:12:30 UTC (rev 114115)
@@ -1,3 +1,15 @@
+2012-04-13  Mike Reed  <r...@google.com>
+
+        use getClipDeviceBounds, rather than (deprecated) getTotalClip
+        https://bugs.webkit.org/show_bug.cgi?id=83808
+
+        Reviewed by Stephen White.
+
+        Equivalent functionality, existing tests apply.
+
+        * platform/graphics/skia/OpaqueRegionSkia.cpp:
+        (WebCore::OpaqueRegionSkia::didDraw):
+
 2012-04-13  Thiago Marcos P. Santos  <thiago.san...@intel.com>
 
         [EFL] Add API for color chooser

Modified: trunk/Source/WebCore/platform/graphics/skia/OpaqueRegionSkia.cpp (114114 => 114115)


--- trunk/Source/WebCore/platform/graphics/skia/OpaqueRegionSkia.cpp	2012-04-13 12:02:05 UTC (rev 114114)
+++ trunk/Source/WebCore/platform/graphics/skia/OpaqueRegionSkia.cpp	2012-04-13 12:12:30 UTC (rev 114115)
@@ -258,7 +258,9 @@
     if (context->canvas()->getClipType() != SkCanvas::kRect_ClipType)
         fillsBounds = false;
     else {
-        SkIRect deviceClip = context->canvas()->getTotalClip().getBounds();
+        SkIRect deviceClip;
+        if (!context->canvas()->getClipDeviceBounds(&deviceClip))
+            return;
         if (!targetRect.intersect(SkIntToScalar(deviceClip.fLeft), SkIntToScalar(deviceClip.fTop), SkIntToScalar(deviceClip.fRight), SkIntToScalar(deviceClip.fBottom)))
             return;
     }
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to