<!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>[185506] trunk/Source/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/185506">185506</a></dd>
<dt>Author</dt> <dd>hyuki.kim@samsung.com</dd>
<dt>Date</dt> <dd>2015-06-12 09:45:15 -0700 (Fri, 12 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[EFL] canvas/philip/tests/toDataURL.jpeg.foo tests have been failed since <a href="http://trac.webkit.org/projects/webkit/changeset/185417">r185417</a>.
https://bugs.webkit.org/show_bug.cgi?id=145878
Reviewed by Gyuyoung Kim.
Fix input buffer alignment issue.
No new tests, canvas/philip/tests/toDataURL.jpeg.foo can be used.
* platform/graphics/efl/ImageBufferEfl.cpp:
(WebCore::encodeImagePNG):
(WebCore::encodeImageJPEG):
(WebCore::ImageBuffer::toDataURL):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicseflImageBufferEflcpp">trunk/Source/WebCore/platform/graphics/efl/ImageBufferEfl.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformimageencodersJPEGImageEncodercpp">trunk/Source/WebCore/platform/image-encoders/JPEGImageEncoder.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (185505 => 185506)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-06-12 16:33:37 UTC (rev 185505)
+++ trunk/Source/WebCore/ChangeLog 2015-06-12 16:45:15 UTC (rev 185506)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2015-06-12 KwangHyuk Kim <hyuki.kim@samsung.com>
+
+ [EFL] canvas/philip/tests/toDataURL.jpeg.foo tests have been failed since r185417.
+ https://bugs.webkit.org/show_bug.cgi?id=145878
+
+ Reviewed by Gyuyoung Kim.
+
+ Fix input buffer alignment issue.
+
+ No new tests, canvas/philip/tests/toDataURL.jpeg.foo can be used.
+
+ * platform/graphics/efl/ImageBufferEfl.cpp:
+ (WebCore::encodeImagePNG):
+ (WebCore::encodeImageJPEG):
+ (WebCore::ImageBuffer::toDataURL):
+
</ins><span class="cx"> 2015-06-12 Zan Dobersek <zdobersek@igalia.com>
</span><span class="cx">
</span><span class="cx"> Add missing override specifiers under Source/WebCore/svg/
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicseflImageBufferEflcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/efl/ImageBufferEfl.cpp (185505 => 185506)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/efl/ImageBufferEfl.cpp 2015-06-12 16:33:37 UTC (rev 185505)
+++ trunk/Source/WebCore/platform/graphics/efl/ImageBufferEfl.cpp 2015-06-12 16:45:15 UTC (rev 185506)
</span><span class="lines">@@ -42,22 +42,14 @@
</span><span class="cx"> return CAIRO_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static bool encodeImage(cairo_surface_t* image, const String& mimeType, Vector<char>* output, const double* quality)
</del><ins>+static bool encodeImagePNG(cairo_surface_t* image, Vector<char>* output)
</ins><span class="cx"> {
</span><del>- ASSERT_UNUSED(mimeType, mimeType == "image/png" || mimeType == "image/jpeg"); // Only PNG and JPEG output are supported for now.
- bool result = false;
</del><ins>+ return cairo_surface_write_to_png_stream(image, writeFunction, output) == CAIRO_STATUS_SUCCESS;
+}
</ins><span class="cx">
</span><del>- if (mimeType == "image/png")
- result = cairo_surface_write_to_png_stream(image, writeFunction, output) == CAIRO_STATUS_SUCCESS;
-
- if (mimeType == "image/jpeg") {
- unsigned char* imageData = cairo_image_surface_get_data(image);
- int width = cairo_image_surface_get_width(image);
- int height = cairo_image_surface_get_height(image);
- result = compressRGBABigEndianToJPEG(imageData, IntSize(width, height), *output, quality);
- }
-
- return result;
</del><ins>+static bool encodeImageJPEG(unsigned char* data, IntSize size, Vector<char>* output, const double* quality)
+{
+ return compressRGBABigEndianToJPEG(data, size, *output, quality);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String ImageBuffer::toDataURL(const String& mimeType, const double* quality, CoordinateSystem) const
</span><span class="lines">@@ -67,9 +59,27 @@
</span><span class="cx"> cairo_surface_t* image = cairo_get_target(context()->platformContext()->cr());
</span><span class="cx">
</span><span class="cx"> Vector<char> encodedImage;
</span><del>- if (!image || !encodeImage(image, mimeType, &encodedImage, quality))
</del><ins>+
+ if (!image)
</ins><span class="cx"> return "data:,";
</span><span class="cx">
</span><ins>+ if (mimeType == "image/png") {
+ if (!encodeImagePNG(image, &encodedImage))
+ return "data:,";
+ }
+
+ if (mimeType == "image/jpeg") {
+ int width = cairo_image_surface_get_width(image);
+ int height = cairo_image_surface_get_height(image);
+
+ IntSize size(width, height);
+ IntRect dataRect(IntPoint(), size);
+ RefPtr<Uint8ClampedArray> myData = getPremultipliedImageData(dataRect);
+
+ if (!encodeImageJPEG(myData->data(), size, &encodedImage, quality))
+ return "data:,";
+ }
+
</ins><span class="cx"> Vector<char> base64Data;
</span><span class="cx"> base64Encode(encodedImage, base64Data);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformimageencodersJPEGImageEncodercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/image-encoders/JPEGImageEncoder.cpp (185505 => 185506)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/image-encoders/JPEGImageEncoder.cpp 2015-06-12 16:33:37 UTC (rev 185505)
+++ trunk/Source/WebCore/platform/image-encoders/JPEGImageEncoder.cpp 2015-06-12 16:45:15 UTC (rev 185506)
</span><span class="lines">@@ -104,10 +104,12 @@
</span><span class="cx"> compressData.in_color_space = JCS_RGB;
</span><span class="cx"> jpeg_set_defaults(&compressData);
</span><span class="cx"> int compressionQuality = 65;
</span><ins>+
</ins><span class="cx"> if (quality && *quality >= 0.0 && *quality <= 1.0)
</span><span class="cx"> compressionQuality = static_cast<int>(*quality * 100 + 0.5);
</span><del>- jpeg_set_quality(&compressData, compressionQuality, FALSE);
</del><span class="cx">
</span><ins>+ jpeg_set_quality(&compressData, compressionQuality, TRUE);
+
</ins><span class="cx"> // rowBuffer must be defined here so that its destructor is always called even when "setjmp" catches an error.
</span><span class="cx"> Vector<JSAMPLE, 600 * 3> rowBuffer;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>