<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[37460] trunk/WebCore</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/37460">37460</a></dd>
<dt>Author</dt> <dd>eric@webkit.org</dd>
<dt>Date</dt> <dd>2008-10-09 19:26:54 -0700 (Thu, 09 Oct 2008)</dd>
</dl>

<h3>Log Message</h3>
<pre>        Reviewed by Oliver Hunt.

        Fix Canvex DOOM Game
        Gradient clips were not getting cleared after filling the
        gradient, this was causing nothing to draw in Canvex
        https://bugs.webkit.org/show_bug.cgi?id=21498

        Tests forthcoming.

        * WebCore.xcodeproj/project.pbxproj:
        * platform/graphics/cg/GraphicsContextCG.cpp:
        (WebCore::GraphicsContext::fillPath):
        (WebCore::GraphicsContext::strokePath):
        (WebCore::GraphicsContext::fillRect):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebCoreChangeLog">trunk/WebCore/ChangeLog</a></li>
<li><a href="#trunkWebCoreplatformgraphicscgGraphicsContextCGcpp">trunk/WebCore/platform/graphics/cg/GraphicsContextCG.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/ChangeLog (37459 => 37460)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/ChangeLog        2008-10-10 02:17:12 UTC (rev 37459)
+++ trunk/WebCore/ChangeLog        2008-10-10 02:26:54 UTC (rev 37460)
</span><span class="lines">@@ -1,7 +1,24 @@
</span><span class="cx"> 2008-10-09  Eric Seidel  &lt;eric@webkit.org&gt;
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Oliver Hunt.
</span><ins>+
+        Fix Canvex DOOM Game
+        Gradient clips were not getting cleared after filling the
+        gradient, this was causing nothing to draw in Canvex
+        https://bugs.webkit.org/show_bug.cgi?id=21498
</ins><span class="cx">         
</span><ins>+        Tests forthcoming.
+
+        * WebCore.xcodeproj/project.pbxproj:
+        * platform/graphics/cg/GraphicsContextCG.cpp:
+        (WebCore::GraphicsContext::fillPath):
+        (WebCore::GraphicsContext::strokePath):
+        (WebCore::GraphicsContext::fillRect):
+
+2008-10-09  Eric Seidel  &lt;eric@webkit.org&gt;
+
+        Reviewed by Oliver Hunt.
+        
</ins><span class="cx">         Fix transformed patterns
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=21498
</span><span class="cx">         
</span></span></pre></div>
<a id="trunkWebCoreplatformgraphicscgGraphicsContextCGcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/platform/graphics/cg/GraphicsContextCG.cpp (37459 => 37460)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/platform/graphics/cg/GraphicsContextCG.cpp        2008-10-10 02:17:12 UTC (rev 37459)
+++ trunk/WebCore/platform/graphics/cg/GraphicsContextCG.cpp        2008-10-10 02:26:54 UTC (rev 37460)
</span><span class="lines">@@ -493,11 +493,13 @@
</span><span class="cx">         fillPathWithFillRule(context, fillRule());
</span><span class="cx">         break;
</span><span class="cx">     case GradientColorSpace:
</span><ins>+        CGContextSaveGState(context);
</ins><span class="cx">         if (fillRule() == RULE_EVENODD)
</span><span class="cx">             CGContextEOClip(context);
</span><span class="cx">         else
</span><span class="cx">             CGContextClip(context);
</span><span class="cx">         CGContextDrawShading(context, m_common-&gt;state.fillGradient-&gt;platformGradient());
</span><ins>+        CGContextRestoreGState(context);
</ins><span class="cx">         break;
</span><span class="cx">     }
</span><span class="cx"> }
</span><span class="lines">@@ -518,9 +520,11 @@
</span><span class="cx">         CGContextStrokePath(context);
</span><span class="cx">         break;
</span><span class="cx">     case GradientColorSpace:
</span><ins>+        CGContextSaveGState(context);
</ins><span class="cx">         CGContextReplacePathWithStrokedPath(context);
</span><span class="cx">         CGContextClip(context);
</span><span class="cx">         CGContextDrawShading(context, m_common-&gt;state.strokeGradient-&gt;platformGradient());
</span><ins>+        CGContextRestoreGState(context);
</ins><span class="cx">         break;
</span><span class="cx">     }
</span><span class="cx"> }
</span><span class="lines">@@ -529,18 +533,21 @@
</span><span class="cx"> {
</span><span class="cx">     if (paintingDisabled())
</span><span class="cx">         return;
</span><ins>+    CGContextRef context = platformContext();
</ins><span class="cx">     switch (m_common-&gt;state.fillColorSpace) {
</span><span class="cx">     case SolidColorSpace:
</span><span class="cx">         if (fillColor().alpha())
</span><del>-            CGContextFillRect(platformContext(), rect);
</del><ins>+            CGContextFillRect(context, rect);
</ins><span class="cx">         break;
</span><span class="cx">     case PatternColorSpace:
</span><span class="cx">         applyFillPattern(this, m_common-&gt;state.fillPattern.get());
</span><del>-        CGContextFillRect(platformContext(), rect);
</del><ins>+        CGContextFillRect(context, rect);
</ins><span class="cx">         break;
</span><span class="cx">     case GradientColorSpace:
</span><del>-        clip(rect);
-        CGContextDrawShading(platformContext(), m_common-&gt;state.fillGradient-&gt;platformGradient());
</del><ins>+        CGContextSaveGState(context);
+        CGContextClipToRect(context, rect);
+        CGContextDrawShading(context, m_common-&gt;state.fillGradient-&gt;platformGradient());
+        CGContextRestoreGState(context);
</ins><span class="cx">         break;
</span><span class="cx">     }
</span><span class="cx"> }
</span></span></pre>
</div>
</div>

</body>
</html>