Changeset 89397 in webkit

Timestamp:

Jun 21, 2011 5:40:41 PM (13 years ago)

Author:

mdelaney@apple.com

Message:

2011-06-21 Matthew Delaney <​mdelaney@apple.com>

Reviewed by Simon Fraser.

beginTransparencyLayer leaves context color out of sync, bleeds color into text
​https://bugs.webkit.org/show_bug.cgi?id=63093

Test: fast/css/color-leakage.html

• platform/graphics/cg/GraphicsContextCG.cpp: Swap out CGContextSave/Restore with GraphicsContext::save/restore to keep the context in sync with its CG context (WebCore::GraphicsContext::beginTransparencyLayer): Added save(), removed redundant calls. (WebCore::GraphicsContext::endTransparencyLayer): Added restore(), removed redundant calls.

2011-06-21 Matthew Delaney <​mdelaney@apple.com>

Reviewed by Simon Fraser.

beginTransparencyLayer leaves context color out of sync, bleeds color into text
​https://bugs.webkit.org/show_bug.cgi?id=63093

• fast/css/color-leakage.html: Added pixel regression test that previously would have the border's color spilling into the text.
• platform/mac/fast/css/color-leakage-expected.png: Added.
• platform/mac/fast/css/color-leakage-expected.txt: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/css/color-leakage.html (added)
• LayoutTests/platform/mac/fast/css/color-leakage-expected.png (added)
• LayoutTests/platform/mac/fast/css/color-leakage-expected.txt (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-06-21  Matthew Delaney  <mdelaney@apple.com>
+
+        Reviewed by Simon Fraser.
+
+        beginTransparencyLayer leaves context color out of sync, bleeds color into text
+        https://bugs.webkit.org/show_bug.cgi?id=63093
+
+        * fast/css/color-leakage.html: Added pixel regression test that previously would have the
+          border's color spilling into the text.
+        * platform/mac/fast/css/color-leakage-expected.png: Added.
+        * platform/mac/fast/css/color-leakage-expected.txt: Added.
+
 2011-06-21  Tony Chang  <tony@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-06-21  Matthew Delaney  <mdelaney@apple.com>
+
+        Reviewed by Simon Fraser.
+
+        beginTransparencyLayer leaves context color out of sync, bleeds color into text
+        https://bugs.webkit.org/show_bug.cgi?id=63093
+
+        Test: fast/css/color-leakage.html
+
+        * platform/graphics/cg/GraphicsContextCG.cpp: Swap out CGContextSave/Restore with
+        GraphicsContext::save/restore to keep the context in sync with its CG context
+        (WebCore::GraphicsContext::beginTransparencyLayer): Added save(), removed redundant calls.
+        (WebCore::GraphicsContext::endTransparencyLayer): Added restore(), removed redundant calls.
+
 2011-06-21  Tony Chang  <tony@chromium.org>
 

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

@@ -895 +895 @@
     if (paintingDisabled())
         return;
-    CGContextRef context = platformContext();
-    CGContextSaveGState(context);
+
+    save();
+
+    CGContextRef context = platformContext();
     CGContextSetAlpha(context, opacity);
     CGContextBeginTransparencyLayer(context, 0);
@@ -909 +911 @@
     CGContextRef context = platformContext();
     CGContextEndTransparencyLayer(context);
-    CGContextRestoreGState(context);
     m_data->endTransparencyLayer();
-    m_data->m_userToDeviceTransformKnownToBeIdentity = false;
+
+    restore();
 }