<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[23939] trunk/WebCore</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/23939">23939</a></dd>
<dt>Author</dt> <dd>oliver</dd>
<dt>Date</dt> <dd>2007-07-02 17:53:48 -0700 (Mon, 02 Jul 2007)</dd>
</dl>
<h3>Log Message</h3>
<pre> Reviewed by Darin.
Fix for <rdar://problem/5098378> single-pixel image optimization needs to be rewritten to not depend on floating point bitmap
Tested by fast/replaced/image-solid-color-with-alpha.html
Switch from float to byte based bitmap when pulling the color from 1x1 pixel images so
that we can use the single pixel image optimisation in WebKit/win.
* platform/graphics/cg/ImageCG.cpp:
(WebCore::BitmapImage::checkForSolidColor):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebCoreChangeLog">trunk/WebCore/ChangeLog</a></li>
<li><a href="#trunkWebCoreplatformgraphicscgImageCGcpp">trunk/WebCore/platform/graphics/cg/ImageCG.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/ChangeLog (23938 => 23939)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/ChangeLog 2007-07-02 23:54:22 UTC (rev 23938)
+++ trunk/WebCore/ChangeLog 2007-07-03 00:53:48 UTC (rev 23939)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2007-07-02 Oliver Hunt <oliver@apple.com>
+
+ Reviewed by Darin.
+
+ Fix for <rdar://problem/5098378> single-pixel image optimization needs to be rewritten to not depend on floating point bitmap
+ Tested by fast/replaced/image-solid-color-with-alpha.html
+
+ Switch from float to byte based bitmap when pulling the color from 1x1 pixel images so
+ that we can use the single pixel image optimisation in WebKit/win.
+
+ * platform/graphics/cg/ImageCG.cpp:
+ (WebCore::BitmapImage::checkForSolidColor):
+
</ins><span class="cx"> 2007-07-02 Adam Roben <aroben@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix Bug 14498: RenderContainer::positionForCoordinates contains an order of operations error
</span></span></pre></div>
<a id="trunkWebCoreplatformgraphicscgImageCGcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/platform/graphics/cg/ImageCG.cpp (23938 => 23939)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/platform/graphics/cg/ImageCG.cpp 2007-07-02 23:54:22 UTC (rev 23938)
+++ trunk/WebCore/platform/graphics/cg/ImageCG.cpp 2007-07-03 00:53:48 UTC (rev 23939)
</span><span class="lines">@@ -63,10 +63,10 @@
</span><span class="cx">
</span><span class="cx"> // Currently we only check for solid color in the important special case of a 1x1 image.
</span><span class="cx"> if (image && CGImageGetWidth(image) == 1 && CGImageGetHeight(image) == 1) {
</span><del>- CGFloat pixel[4]; // RGBA
</del><ins>+ unsigned char pixel[4]; // RGBA
</ins><span class="cx"> CGColorSpaceRef space = CGColorSpaceCreateDeviceRGB();
</span><del>- CGContextRef bmap = CGBitmapContextCreate(&pixel, 1, 1, 8*sizeof(float), sizeof(pixel), space,
- kCGImageAlphaPremultipliedLast | kCGBitmapFloatComponents | kCGBitmapByteOrder32Host);
</del><ins>+ CGContextRef bmap = CGBitmapContextCreate(pixel, 1, 1, 8, sizeof(pixel), space,
+ kCGImageAlphaPremultipliedLast | kCGBitmapByteOrder32Big);
</ins><span class="cx"> if (bmap) {
</span><span class="cx"> GraphicsContext(bmap).setCompositeOperation(CompositeCopy);
</span><span class="cx"> CGRect dst = { {0, 0}, {1, 1} };
</span><span class="lines">@@ -74,7 +74,7 @@
</span><span class="cx"> if (pixel[3] == 0)
</span><span class="cx"> m_solidColor = Color(0, 0, 0, 0);
</span><span class="cx"> else
</span><del>- m_solidColor = Color(int(pixel[0] / pixel[3] * 255), int(pixel[1] / pixel[3] * 255), int(pixel[2] / pixel[3] * 255), int(pixel[3] * 255));
</del><ins>+ m_solidColor = Color(pixel[0] * 255 / pixel[3], pixel[1] * 255 / pixel[3], pixel[2] * 255 / pixel[3], pixel[3]);
</ins><span class="cx"> m_isSolidColor = true;
</span><span class="cx"> CFRelease(bmap);
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>