Changeset 65118 in webkit

Timestamp:

Aug 10, 2010 8:10:51 PM (14 years ago)

Author:

commit-queue@webkit.org

Message:

2010-08-10 Matthew Delaney <​mdelaney@apple.com>

Reviewed by Darin Adler.

2d.path.clip.empty.html test is failing
​https://bugs.webkit.org/show_bug.cgi?id=43161

• platform/mac/Skipped: Unskipping now passing path.clip.empty

2010-08-10 Matthew Delaney <​mdelaney@apple.com>

Reviewed by Darin Adler.

2d.path.clip.empty.html test is failing
​https://bugs.webkit.org/show_bug.cgi?id=43161

• platform/graphics/cg/GraphicsContextCG.cpp: (WebCore::GraphicsContext::clip): Catching the empty path case from being sent directly to CGContextClip - which would ignore it. Instead, using CGContextClip with a CGRectZero to achieve the desired behavior of reducing the clipping region to nothing.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/mac/Skipped (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/graphics/cg/GraphicsContextCG.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-08-10  Matthew Delaney  <mdelaney@apple.com>
+
+        Reviewed by Darin Adler.
+
+        2d.path.clip.empty.html test is failing
+        https://bugs.webkit.org/show_bug.cgi?id=43161
+
+        * platform/mac/Skipped: Unskipping now passing path.clip.empty
+
 2010-08-10  Sergio Villar Senin  <svillar@igalia.com>
 

trunk/LayoutTests/platform/mac/Skipped

@@ -162 +162 @@
 # Failing canvas test cases from http://philip.html5.org/tests/canvas/suite/tests/
 canvas/philip/tests/2d.drawImage.broken.html
-canvas/philip/tests/2d.path.clip.empty.html
 canvas/philip/tests/2d.composite.operation.clear.html
 canvas/philip/tests/2d.composite.operation.darker.html

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-08-10  Matthew Delaney  <mdelaney@apple.com>
+
+        Reviewed by Darin Adler.
+
+        2d.path.clip.empty.html test is failing
+        https://bugs.webkit.org/show_bug.cgi?id=43161
+
+        * platform/graphics/cg/GraphicsContextCG.cpp:
+        (WebCore::GraphicsContext::clip):
+        Catching the empty path case from being sent directly to 
+        CGContextClip - which would ignore it. Instead, using 
+        CGContextClip with a CGRectZero to achieve the desired
+        behavior of reducing the clipping region to nothing.
+
 2010-08-10  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
 

trunk/WebCore/platform/graphics/cg/GraphicsContextCG.cpp

@@ -951 +951 @@
         return;
     CGContextRef context = platformContext();
-    CGContextBeginPath(context);
-    CGContextAddPath(context, path.platformPath());
-    CGContextClip(context);
+
+    // CGContextClip does nothing if the path is empty, so in this case, we
+    // instead clip against a zero rect to reduce the clipping region to
+    // nothing - which is the intended behavior of clip() if the path is empty.    
+    if (path.isEmpty())
+        CGContextClipToRect(context, CGRectZero);
+    else {
+        CGContextBeginPath(context);
+        CGContextAddPath(context, path.platformPath());
+        CGContextClip(context);
+    }
     m_data->clip(path);
 }