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):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@114115 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 2e949cb..7f72154 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2012-04-13  Mike Reed  <reed@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.santos@intel.com>
 
         [EFL] Add API for color chooser

diff --git a/Source/WebCore/platform/graphics/skia/OpaqueRegionSkia.cpp b/Source/WebCore/platform/graphics/skia/OpaqueRegionSkia.cpp
index c7e8744..e602e60 100644 (file)
--- a/Source/WebCore/platform/graphics/skia/OpaqueRegionSkia.cpp
+++ b/Source/WebCore/platform/graphics/skia/OpaqueRegionSkia.cpp
@@ -258,7 +258,9 @@ void OpaqueRegionSkia::didDraw(const PlatformContextSkia* context, const AffineT
     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;
     }