<!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>[213344] trunk</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/213344">213344</a></dd>
<dt>Author</dt> <dd>aestes@apple.com</dd>
<dt>Date</dt> <dd>2017-03-02 20:12:15 -0800 (Thu, 02 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add support for canvas.toBlob
https://bugs.webkit.org/show_bug.cgi?id=148878
<rdar://problem/22590406>
Reviewed by Tim Horton.
LayoutTests/imported/w3c:
* web-platform-tests/html/semantics/embedded-content/the-canvas-element/toBlob.jpeg-expected.txt:
* web-platform-tests/html/semantics/embedded-content/the-canvas-element/toBlob.png-expected.txt:
Source/WebCore:
These tests now pass:
imported/w3c/web-platform-tests/html/semantics/embedded-content/the-canvas-element/toBlob.jpeg.html
imported/w3c/web-platform-tests/html/semantics/embedded-content/the-canvas-element/toBlob.png.html
* CMakeLists.txt:
* DerivedSources.make:
* WebCore.xcodeproj/project.pbxproj:
* fileapi/BlobCallback.cpp: Added.
(WebCore::BlobCallback::scheduleCallback):
* fileapi/BlobCallback.h: Added.
(WebCore::BlobCallback::~BlobCallback):
* fileapi/BlobCallback.idl: Added.
* html/HTMLCanvasElement.cpp:
(WebCore::HTMLCanvasElement::toBlob):
* html/HTMLCanvasElement.h:
* html/HTMLCanvasElement.idl:
* platform/graphics/ImageBuffer.h:
* platform/graphics/cairo/ImageBufferCairo.cpp:
(WebCore::writeFunction):
(WebCore::encodeImage):
(WebCore::ImageBuffer::toDataURL):
(WebCore::ImageBuffer::toData):
* platform/graphics/cg/ImageBufferCG.cpp:
(WebCore::data):
(WebCore::ImageBuffer::toDataURL):
(WebCore::ImageBuffer::toData):
(WebCore::ImageBuffer::toCGImage):
(WebCore::cgImage):
(WebCore::dataURL):
* platform/graphics/gtk/ImageBufferGtk.cpp:
(WebCore::ImageBuffer::toDataURL):
(WebCore::ImageBuffer::toData):
* platform/graphics/win/ImageBufferDirect2D.cpp:
(WebCore::ImageBuffer::toData):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsimportedw3cChangeLog">trunk/LayoutTests/imported/w3c/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestshtmlsemanticsembeddedcontentthecanvaselementtoBlobjpegexpectedtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/html/semantics/embedded-content/the-canvas-element/toBlob.jpeg-expected.txt</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestshtmlsemanticsembeddedcontentthecanvaselementtoBlobpngexpectedtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/html/semantics/embedded-content/the-canvas-element/toBlob.png-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreCMakeListstxt">trunk/Source/WebCore/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreDerivedSourcesmake">trunk/Source/WebCore/DerivedSources.make</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLCanvasElementcpp">trunk/Source/WebCore/html/HTMLCanvasElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLCanvasElementh">trunk/Source/WebCore/html/HTMLCanvasElement.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLCanvasElementidl">trunk/Source/WebCore/html/HTMLCanvasElement.idl</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsImageBufferh">trunk/Source/WebCore/platform/graphics/ImageBuffer.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscairoImageBufferCairocpp">trunk/Source/WebCore/platform/graphics/cairo/ImageBufferCairo.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscgImageBufferCGcpp">trunk/Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsgtkImageBufferGtkcpp">trunk/Source/WebCore/platform/graphics/gtk/ImageBufferGtk.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicswinImageBufferDirect2Dcpp">trunk/Source/WebCore/platform/graphics/win/ImageBufferDirect2D.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebCorefileapiBlobCallbackcpp">trunk/Source/WebCore/fileapi/BlobCallback.cpp</a></li>
<li><a href="#trunkSourceWebCorefileapiBlobCallbackh">trunk/Source/WebCore/fileapi/BlobCallback.h</a></li>
<li><a href="#trunkSourceWebCorefileapiBlobCallbackidl">trunk/Source/WebCore/fileapi/BlobCallback.idl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsimportedw3cChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/ChangeLog (213343 => 213344)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/ChangeLog 2017-03-03 03:59:01 UTC (rev 213343)
+++ trunk/LayoutTests/imported/w3c/ChangeLog 2017-03-03 04:12:15 UTC (rev 213344)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2017-03-02 Andy Estes <aestes@apple.com>
+
+ Add support for canvas.toBlob
+ https://bugs.webkit.org/show_bug.cgi?id=148878
+ <rdar://problem/22590406>
+
+ Reviewed by Tim Horton.
+
+ * web-platform-tests/html/semantics/embedded-content/the-canvas-element/toBlob.jpeg-expected.txt:
+ * web-platform-tests/html/semantics/embedded-content/the-canvas-element/toBlob.png-expected.txt:
+
</ins><span class="cx"> 2017-03-02 Ryan Haddad <ryanhaddad@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r213301.
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestshtmlsemanticsembeddedcontentthecanvaselementtoBlobjpegexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/html/semantics/embedded-content/the-canvas-element/toBlob.jpeg-expected.txt (213343 => 213344)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/html/semantics/embedded-content/the-canvas-element/toBlob.jpeg-expected.txt 2017-03-03 03:59:01 UTC (rev 213343)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/html/semantics/embedded-content/the-canvas-element/toBlob.jpeg-expected.txt 2017-03-03 04:12:15 UTC (rev 213344)
</span><span class="lines">@@ -1,5 +1,3 @@
</span><span class="cx">
</span><del>-FAIL toBlob with image/jpeg returns a JPEG Blob canvas.toBlob is not a function. (In 'canvas.toBlob(this.step_func_done(function(data) {
- assert_equals(data.type, "image/jpeg");
- }), 'image/jpeg')', 'canvas.toBlob' is undefined)
</del><ins>+PASS toBlob with image/jpeg returns a JPEG Blob
</ins><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestshtmlsemanticsembeddedcontentthecanvaselementtoBlobpngexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/html/semantics/embedded-content/the-canvas-element/toBlob.png-expected.txt (213343 => 213344)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/html/semantics/embedded-content/the-canvas-element/toBlob.png-expected.txt 2017-03-03 03:59:01 UTC (rev 213343)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/html/semantics/embedded-content/the-canvas-element/toBlob.png-expected.txt 2017-03-03 04:12:15 UTC (rev 213344)
</span><span class="lines">@@ -1,5 +1,3 @@
</span><span class="cx">
</span><del>-FAIL toBlob with image/png returns a PNG Blob canvas.toBlob is not a function. (In 'canvas.toBlob(this.step_func_done(function(data) {
- assert_equals(data.type, "image/png");
- }), 'image/png')', 'canvas.toBlob' is undefined)
</del><ins>+PASS toBlob with image/png returns a PNG Blob
</ins><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/CMakeLists.txt (213343 => 213344)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/CMakeLists.txt 2017-03-03 03:59:01 UTC (rev 213343)
+++ trunk/Source/WebCore/CMakeLists.txt 2017-03-03 04:12:15 UTC (rev 213344)
</span><span class="lines">@@ -474,6 +474,7 @@
</span><span class="cx"> dom/XMLDocument.idl
</span><span class="cx">
</span><span class="cx"> fileapi/Blob.idl
</span><ins>+ fileapi/BlobCallback.idl
</ins><span class="cx"> fileapi/BlobLineEndings.idl
</span><span class="cx"> fileapi/BlobPropertyBag.idl
</span><span class="cx"> fileapi/File.idl
</span><span class="lines">@@ -1604,6 +1605,7 @@
</span><span class="cx"> fileapi/AsyncFileStream.cpp
</span><span class="cx"> fileapi/Blob.cpp
</span><span class="cx"> fileapi/BlobBuilder.cpp
</span><ins>+ fileapi/BlobCallback.cpp
</ins><span class="cx"> fileapi/BlobURL.cpp
</span><span class="cx"> fileapi/File.cpp
</span><span class="cx"> fileapi/FileException.cpp
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (213343 => 213344)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-03-03 03:59:01 UTC (rev 213343)
+++ trunk/Source/WebCore/ChangeLog 2017-03-03 04:12:15 UTC (rev 213344)
</span><span class="lines">@@ -1,3 +1,46 @@
</span><ins>+2017-03-02 Andy Estes <aestes@apple.com>
+
+ Add support for canvas.toBlob
+ https://bugs.webkit.org/show_bug.cgi?id=148878
+ <rdar://problem/22590406>
+
+ Reviewed by Tim Horton.
+
+ These tests now pass:
+ imported/w3c/web-platform-tests/html/semantics/embedded-content/the-canvas-element/toBlob.jpeg.html
+ imported/w3c/web-platform-tests/html/semantics/embedded-content/the-canvas-element/toBlob.png.html
+
+ * CMakeLists.txt:
+ * DerivedSources.make:
+ * WebCore.xcodeproj/project.pbxproj:
+ * fileapi/BlobCallback.cpp: Added.
+ (WebCore::BlobCallback::scheduleCallback):
+ * fileapi/BlobCallback.h: Added.
+ (WebCore::BlobCallback::~BlobCallback):
+ * fileapi/BlobCallback.idl: Added.
+ * html/HTMLCanvasElement.cpp:
+ (WebCore::HTMLCanvasElement::toBlob):
+ * html/HTMLCanvasElement.h:
+ * html/HTMLCanvasElement.idl:
+ * platform/graphics/ImageBuffer.h:
+ * platform/graphics/cairo/ImageBufferCairo.cpp:
+ (WebCore::writeFunction):
+ (WebCore::encodeImage):
+ (WebCore::ImageBuffer::toDataURL):
+ (WebCore::ImageBuffer::toData):
+ * platform/graphics/cg/ImageBufferCG.cpp:
+ (WebCore::data):
+ (WebCore::ImageBuffer::toDataURL):
+ (WebCore::ImageBuffer::toData):
+ (WebCore::ImageBuffer::toCGImage):
+ (WebCore::cgImage):
+ (WebCore::dataURL):
+ * platform/graphics/gtk/ImageBufferGtk.cpp:
+ (WebCore::ImageBuffer::toDataURL):
+ (WebCore::ImageBuffer::toData):
+ * platform/graphics/win/ImageBufferDirect2D.cpp:
+ (WebCore::ImageBuffer::toData):
+
</ins><span class="cx"> 2017-03-02 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> Migrate font-stretch to use fixed-point values
</span></span></pre></div>
<a id="trunkSourceWebCoreDerivedSourcesmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/DerivedSources.make (213343 => 213344)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/DerivedSources.make 2017-03-03 03:59:01 UTC (rev 213343)
+++ trunk/Source/WebCore/DerivedSources.make 2017-03-03 04:12:15 UTC (rev 213344)
</span><span class="lines">@@ -403,6 +403,7 @@
</span><span class="cx"> $(WebCore)/dom/WheelEvent.idl \
</span><span class="cx"> $(WebCore)/dom/XMLDocument.idl \
</span><span class="cx"> $(WebCore)/fileapi/Blob.idl \
</span><ins>+ $(WebCore)/fileapi/BlobCallback.idl \
</ins><span class="cx"> $(WebCore)/fileapi/BlobLineEndings.idl \
</span><span class="cx"> $(WebCore)/fileapi/BlobPropertyBag.idl \
</span><span class="cx"> $(WebCore)/fileapi/File.idl \
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (213343 => 213344)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2017-03-03 03:59:01 UTC (rev 213343)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2017-03-03 04:12:15 UTC (rev 213344)
</span><span class="lines">@@ -4027,6 +4027,10 @@
</span><span class="cx"> A149786E1ABAF33800CEF7E4 /* ContentFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A149786C1ABAF33800CEF7E4 /* ContentFilter.cpp */; };
</span><span class="cx"> A149786F1ABAF33800CEF7E4 /* ContentFilter.h in Headers */ = {isa = PBXBuildFile; fileRef = A149786D1ABAF33800CEF7E4 /* ContentFilter.h */; };
</span><span class="cx"> A14978711ABAF3A500CEF7E4 /* PlatformContentFilter.h in Headers */ = {isa = PBXBuildFile; fileRef = A14978701ABAF3A500CEF7E4 /* PlatformContentFilter.h */; };
</span><ins>+ A15D75151E68F7C400A35FBC /* BlobCallback.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A15D75121E68F7B100A35FBC /* BlobCallback.cpp */; };
+ A15D75161E68F7C800A35FBC /* BlobCallback.h in Headers */ = {isa = PBXBuildFile; fileRef = A15D75131E68F7B100A35FBC /* BlobCallback.h */; };
+ A15D751A1E68F89E00A35FBC /* JSBlobCallback.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A15D75171E68F83600A35FBC /* JSBlobCallback.cpp */; };
+ A15D751B1E68F8A300A35FBC /* JSBlobCallback.h in Headers */ = {isa = PBXBuildFile; fileRef = A15D75181E68F83600A35FBC /* JSBlobCallback.h */; };
</ins><span class="cx"> A15E31F31E0CB0B2004B371C /* QuickLook.mm in Sources */ = {isa = PBXBuildFile; fileRef = A15E31F21E0CB0AA004B371C /* QuickLook.mm */; };
</span><span class="cx"> A15E31F41E0CB0B5004B371C /* QuickLook.h in Headers */ = {isa = PBXBuildFile; fileRef = A15E31F11E0CB0AA004B371C /* QuickLook.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> A15E6BF11E212A6A0080AF34 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A15E6BF01E212A6A0080AF34 /* Foundation.framework */; };
</span><span class="lines">@@ -11883,6 +11887,11 @@
</span><span class="cx"> A149786C1ABAF33800CEF7E4 /* ContentFilter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ContentFilter.cpp; sourceTree = "<group>"; };
</span><span class="cx"> A149786D1ABAF33800CEF7E4 /* ContentFilter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ContentFilter.h; sourceTree = "<group>"; };
</span><span class="cx"> A14978701ABAF3A500CEF7E4 /* PlatformContentFilter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlatformContentFilter.h; sourceTree = "<group>"; };
</span><ins>+ A15D75121E68F7B100A35FBC /* BlobCallback.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = BlobCallback.cpp; sourceTree = "<group>"; };
+ A15D75131E68F7B100A35FBC /* BlobCallback.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BlobCallback.h; sourceTree = "<group>"; };
+ A15D75141E68F7B100A35FBC /* BlobCallback.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = BlobCallback.idl; sourceTree = "<group>"; };
+ A15D75171E68F83600A35FBC /* JSBlobCallback.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSBlobCallback.cpp; sourceTree = "<group>"; };
+ A15D75181E68F83600A35FBC /* JSBlobCallback.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSBlobCallback.h; sourceTree = "<group>"; };
</ins><span class="cx"> A15E31F11E0CB0AA004B371C /* QuickLook.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QuickLook.h; sourceTree = "<group>"; };
</span><span class="cx"> A15E31F21E0CB0AA004B371C /* QuickLook.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = QuickLook.mm; sourceTree = "<group>"; };
</span><span class="cx"> A15E6BF01E212A6A0080AF34 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
</span><span class="lines">@@ -18938,6 +18947,8 @@
</span><span class="cx"> children = (
</span><span class="cx"> 2E2D99CB10E2BBDA00496337 /* JSBlob.cpp */,
</span><span class="cx"> 2E2D99CC10E2BBDA00496337 /* JSBlob.h */,
</span><ins>+ A15D75171E68F83600A35FBC /* JSBlobCallback.cpp */,
+ A15D75181E68F83600A35FBC /* JSBlobCallback.h */,
</ins><span class="cx"> 7C77C3D91DEF86D700A50BFA /* JSBlobLineEndings.cpp */,
</span><span class="cx"> 7C77C3DA1DEF86D700A50BFA /* JSBlobLineEndings.h */,
</span><span class="cx"> 7C77C3D21DEF178E00A50BFA /* JSBlobPropertyBag.cpp */,
</span><span class="lines">@@ -19872,6 +19883,9 @@
</span><span class="cx"> 14A98E05136386A200C9FED2 /* Blob.idl */,
</span><span class="cx"> 976D6C5C122B8A3D001FD1F7 /* BlobBuilder.cpp */,
</span><span class="cx"> 976D6C5D122B8A3D001FD1F7 /* BlobBuilder.h */,
</span><ins>+ A15D75121E68F7B100A35FBC /* BlobCallback.cpp */,
+ A15D75131E68F7B100A35FBC /* BlobCallback.h */,
+ A15D75141E68F7B100A35FBC /* BlobCallback.idl */,
</ins><span class="cx"> 7C77C3D61DEF850A00A50BFA /* BlobLineEndings.h */,
</span><span class="cx"> 7C77C3D81DEF854000A50BFA /* BlobLineEndings.idl */,
</span><span class="cx"> 7C77C3D01DEE472400A50BFA /* BlobPropertyBag.h */,
</span><span class="lines">@@ -26896,6 +26910,7 @@
</span><span class="cx"> 1AE2ABAB0A1CE90500B42B25 /* JSHTMLPreElement.h in Headers */,
</span><span class="cx"> A4226E5C1163D695008B8397 /* JSHTMLProgressElement.h in Headers */,
</span><span class="cx"> 1AE2AEC80A1D297B00B42B25 /* JSHTMLQuoteElement.h in Headers */,
</span><ins>+ A15D751B1E68F8A300A35FBC /* JSBlobCallback.h in Headers */,
</ins><span class="cx"> 1AE2ABAD0A1CE90500B42B25 /* JSHTMLScriptElement.h in Headers */,
</span><span class="cx"> E1E6EEA80B628DB3005F2F70 /* JSHTMLSelectElement.h in Headers */,
</span><span class="cx"> AB4CB4EB0B8BDA3D009F40B0 /* JSHTMLSelectElementCustom.h in Headers */,
</span><span class="lines">@@ -28290,6 +28305,7 @@
</span><span class="cx"> FEE1811416C319E800084849 /* SQLTransactionBackend.h in Headers */,
</span><span class="cx"> 97BC6A521505F081001B74AC /* SQLTransactionCallback.h in Headers */,
</span><span class="cx"> 97BC6A571505F081001B74AC /* SQLTransactionCoordinator.h in Headers */,
</span><ins>+ A15D75161E68F7C800A35FBC /* BlobCallback.h in Headers */,
</ins><span class="cx"> 97BC6A581505F081001B74AC /* SQLTransactionErrorCallback.h in Headers */,
</span><span class="cx"> FE36FD1816C7826500F887C1 /* SQLTransactionState.h in Headers */,
</span><span class="cx"> FE36FD1716C7826500F887C1 /* SQLTransactionStateMachine.h in Headers */,
</span><span class="lines">@@ -31071,6 +31087,7 @@
</span><span class="cx"> B2FA3E080AB75A6F000E5AC4 /* JSSVGTitleElement.cpp in Sources */,
</span><span class="cx"> B2FA3E0A0AB75A6F000E5AC4 /* JSSVGTransform.cpp in Sources */,
</span><span class="cx"> B2FA3E0C0AB75A6F000E5AC4 /* JSSVGTransformList.cpp in Sources */,
</span><ins>+ A15D75151E68F7C400A35FBC /* BlobCallback.cpp in Sources */,
</ins><span class="cx"> B2FA3E0E0AB75A6F000E5AC4 /* JSSVGTRefElement.cpp in Sources */,
</span><span class="cx"> B2FA3E100AB75A6F000E5AC4 /* JSSVGTSpanElement.cpp in Sources */,
</span><span class="cx"> B2FA3E120AB75A6F000E5AC4 /* JSSVGUnitTypes.cpp in Sources */,
</span><span class="lines">@@ -32420,6 +32437,7 @@
</span><span class="cx"> 444D4E230F708B2E003158E0 /* WebCoreURLResponseIOS.mm in Sources */,
</span><span class="cx"> 93F19B0708245E59001E9ABC /* WebCoreView.m in Sources */,
</span><span class="cx"> A5E616731894581F009ADF50 /* WebDebuggerAgent.cpp in Sources */,
</span><ins>+ A15D751A1E68F89E00A35FBC /* JSBlobCallback.cpp in Sources */,
</ins><span class="cx"> FE0D84EB1048436E001A179E /* WebEvent.mm in Sources */,
</span><span class="cx"> 225A16B60D5C11E900090295 /* WebEventRegion.mm in Sources */,
</span><span class="cx"> D3F3D36D1A69B7DC0059FC2B /* WebGL2RenderingContext.cpp in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebCorefileapiBlobCallbackcpp"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/fileapi/BlobCallback.cpp (0 => 213344)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/fileapi/BlobCallback.cpp (rev 0)
+++ trunk/Source/WebCore/fileapi/BlobCallback.cpp 2017-03-03 04:12:15 UTC (rev 213344)
</span><span class="lines">@@ -0,0 +1,41 @@
</span><ins>+/*
+ * Copyright (C) 2017 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "BlobCallback.h"
+
+#include "Blob.h"
+#include "ScriptExecutionContext.h"
+
+namespace WebCore {
+
+void BlobCallback::scheduleCallback(ScriptExecutionContext& context, RefPtr<Blob>&& blob)
+{
+ context.postTask([this, protectedThis = makeRef(*this), blob = WTFMove(blob)](ScriptExecutionContext&) {
+ handleEvent(blob.get());
+ });
+}
+
+} // namespace WebCore
</ins></span></pre></div>
<a id="trunkSourceWebCorefileapiBlobCallbackh"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/fileapi/BlobCallback.h (0 => 213344)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/fileapi/BlobCallback.h (rev 0)
+++ trunk/Source/WebCore/fileapi/BlobCallback.h 2017-03-03 04:12:15 UTC (rev 213344)
</span><span class="lines">@@ -0,0 +1,44 @@
</span><ins>+/*
+ * Copyright (C) 2017 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#pragma once
+
+#include <wtf/RefCounted.h>
+#include <wtf/RefPtr.h>
+
+namespace WebCore {
+
+class Blob;
+class ScriptExecutionContext;
+
+class BlobCallback : public RefCounted<BlobCallback> {
+public:
+ virtual ~BlobCallback() { }
+ virtual bool handleEvent(Blob*) = 0;
+
+ void scheduleCallback(ScriptExecutionContext&, RefPtr<Blob>&&);
+};
+
+} // namespace WebCore
</ins></span></pre></div>
<a id="trunkSourceWebCorefileapiBlobCallbackidl"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/fileapi/BlobCallback.idl (0 => 213344)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/fileapi/BlobCallback.idl (rev 0)
+++ trunk/Source/WebCore/fileapi/BlobCallback.idl 2017-03-03 04:12:15 UTC (rev 213344)
</span><span class="lines">@@ -0,0 +1,26 @@
</span><ins>+/*
+ * Copyright (C) 2017 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+callback BlobCallback = void (Blob? blob);
</ins></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLCanvasElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLCanvasElement.cpp (213343 => 213344)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLCanvasElement.cpp 2017-03-03 03:59:01 UTC (rev 213343)
+++ trunk/Source/WebCore/html/HTMLCanvasElement.cpp 2017-03-03 04:12:15 UTC (rev 213344)
</span><span class="lines">@@ -28,6 +28,8 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "HTMLCanvasElement.h"
</span><span class="cx">
</span><ins>+#include "Blob.h"
+#include "BlobCallback.h"
</ins><span class="cx"> #include "CanvasGradient.h"
</span><span class="cx"> #include "CanvasPattern.h"
</span><span class="cx"> #include "CanvasRenderingContext2D.h"
</span><span class="lines">@@ -485,6 +487,36 @@
</span><span class="cx"> return buffer()->toDataURL(encodingMIMEType, quality);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ExceptionOr<void> HTMLCanvasElement::toBlob(ScriptExecutionContext& context, Ref<BlobCallback>&& callback, const String& mimeType, JSC::JSValue qualityValue)
+{
+ if (!m_originClean)
+ return Exception { SECURITY_ERR };
+
+ if (m_size.isEmpty() || !buffer()) {
+ callback->scheduleCallback(context, nullptr);
+ return { };
+ }
+
+ String encodingMIMEType = toEncodingMimeType(mimeType);
+ std::optional<double> quality;
+ if (qualityValue.isNumber())
+ quality = qualityValue.toNumber(context.execState());
+
+#if USE(CG)
+ if (auto imageData = getImageData()) {
+ Vector<uint8_t> blobData = data(*imageData, encodingMIMEType, quality);
+ callback->scheduleCallback(context, Blob::create(WTFMove(blobData), encodingMIMEType));
+ return { };
+ }
+#endif
+
+ makeRenderingResultsAvailable();
+
+ Vector<uint8_t> blobData = buffer()->toData(encodingMIMEType, quality);
+ callback->scheduleCallback(context, Blob::create(WTFMove(blobData), encodingMIMEType));
+ return { };
+}
+
</ins><span class="cx"> RefPtr<ImageData> HTMLCanvasElement::getImageData()
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(WEBGL)
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLCanvasElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLCanvasElement.h (213343 => 213344)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLCanvasElement.h 2017-03-03 03:59:01 UTC (rev 213343)
+++ trunk/Source/WebCore/html/HTMLCanvasElement.h 2017-03-03 04:12:15 UTC (rev 213344)
</span><span class="lines">@@ -39,6 +39,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><ins>+class BlobCallback;
</ins><span class="cx"> class CanvasRenderingContext;
</span><span class="cx"> class GraphicsContext;
</span><span class="cx"> class GraphicsContextStateSaver;
</span><span class="lines">@@ -101,6 +102,7 @@
</span><span class="cx"> static String toEncodingMimeType(const String& mimeType);
</span><span class="cx"> WEBCORE_EXPORT ExceptionOr<String> toDataURL(const String& mimeType, std::optional<double> quality);
</span><span class="cx"> ExceptionOr<String> toDataURL(const String& mimeType) { return toDataURL(mimeType, std::nullopt); }
</span><ins>+ ExceptionOr<void> toBlob(ScriptExecutionContext&, Ref<BlobCallback>&&, const String& mimeType, JSC::JSValue qualityValue);
</ins><span class="cx">
</span><span class="cx"> // Used for rendering
</span><span class="cx"> void didDraw(const FloatRect&);
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLCanvasElementidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLCanvasElement.idl (213343 => 213344)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLCanvasElement.idl 2017-03-03 03:59:01 UTC (rev 213343)
+++ trunk/Source/WebCore/html/HTMLCanvasElement.idl 2017-03-03 04:12:15 UTC (rev 213344)
</span><span class="lines">@@ -37,4 +37,5 @@
</span><span class="cx"> [Custom] RenderingContext? getContext(DOMString contextId, any... arguments);
</span><span class="cx">
</span><span class="cx"> [Custom, MayThrowException] DOMString toDataURL(optional DOMString? type);
</span><ins>+ [CallWith=ScriptExecutionContext, MayThrowException] void toBlob(BlobCallback callback, optional DOMString type, optional any quality);
</ins><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsImageBufferh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ImageBuffer.h (213343 => 213344)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ImageBuffer.h 2017-03-03 03:59:01 UTC (rev 213343)
+++ trunk/Source/WebCore/platform/graphics/ImageBuffer.h 2017-03-03 04:12:15 UTC (rev 213344)
</span><span class="lines">@@ -112,6 +112,7 @@
</span><span class="cx"> void convertToLuminanceMask();
</span><span class="cx">
</span><span class="cx"> String toDataURL(const String& mimeType, std::optional<double> quality = std::nullopt, CoordinateSystem = LogicalCoordinateSystem) const;
</span><ins>+ Vector<uint8_t> toData(const String& mimeType, std::optional<double> quality = std::nullopt) const;
</ins><span class="cx"> #if !USE(CG)
</span><span class="cx"> AffineTransform baseTransform() const { return AffineTransform(); }
</span><span class="cx"> void transformColorSpace(ColorSpace srcColorSpace, ColorSpace dstColorSpace);
</span><span class="lines">@@ -174,6 +175,7 @@
</span><span class="cx"> WEBCORE_EXPORT ImageBuffer(const FloatSize&, float resolutionScale, ColorSpace, RenderingMode, bool& success);
</span><span class="cx"> #if USE(CG)
</span><span class="cx"> ImageBuffer(const FloatSize&, float resolutionScale, CGColorSpaceRef, RenderingMode, bool& success);
</span><ins>+ RetainPtr<CGImageRef> toCGImage(const String& mimeType) const;
</ins><span class="cx"> #elif USE(DIRECT2D)
</span><span class="cx"> ImageBuffer(const FloatSize&, float resolutionScale, ColorSpace, RenderingMode, const GraphicsContext*, bool& success);
</span><span class="cx"> #endif
</span><span class="lines">@@ -181,6 +183,7 @@
</span><span class="cx">
</span><span class="cx"> #if USE(CG)
</span><span class="cx"> String dataURL(const ImageData&, const String& mimeType, std::optional<double> quality);
</span><ins>+Vector<uint8_t> data(const ImageData&, const String& mimeType, std::optional<double> quality);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscairoImageBufferCairocpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cairo/ImageBufferCairo.cpp (213343 => 213344)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cairo/ImageBufferCairo.cpp 2017-03-03 03:59:01 UTC (rev 213343)
+++ trunk/Source/WebCore/platform/graphics/cairo/ImageBufferCairo.cpp 2017-03-03 04:12:15 UTC (rev 213344)
</span><span class="lines">@@ -539,12 +539,12 @@
</span><span class="cx"> #if !PLATFORM(GTK)
</span><span class="cx"> static cairo_status_t writeFunction(void* output, const unsigned char* data, unsigned int length)
</span><span class="cx"> {
</span><del>- if (!reinterpret_cast<Vector<unsigned char>*>(output)->tryAppend(data, length))
</del><ins>+ if (!reinterpret_cast<Vector<uint8_t>*>(output)->tryAppend(data, length))
</ins><span class="cx"> return CAIRO_STATUS_WRITE_ERROR;
</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)
</del><ins>+static bool encodeImage(cairo_surface_t* image, const String& mimeType, Vector<uint8_t>* output)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT_UNUSED(mimeType, mimeType == "image/png"); // Only PNG output is supported for now.
</span><span class="cx">
</span><span class="lines">@@ -553,19 +553,29 @@
</span><span class="cx">
</span><span class="cx"> String ImageBuffer::toDataURL(const String& mimeType, std::optional<double>, CoordinateSystem) const
</span><span class="cx"> {
</span><ins>+ Vector<uint8_t> encodedImage = toData(mimeType, quality);
+ if (encodedImage.isEmpty())
+ return "data:,";
+
+ Vector<char> base64Data;
+ base64Encode(encodedImage.data(), encodedImage.size(), base64Data);
+
+ return "data:" + mimeType + ";base64," + base64Data;
+}
+
+Vector<uint8_t> ImageBuffer::toData(const String& mimeType, std::optional<double> quality) const
+{
</ins><span class="cx"> ASSERT(MIMETypeRegistry::isSupportedImageMIMETypeForEncoding(mimeType));
</span><span class="cx">
</span><span class="cx"> cairo_surface_t* image = cairo_get_target(context().platformContext()->cr());
</span><span class="cx">
</span><del>- Vector<char> encodedImage;
</del><ins>+ Vector<uint8_t> encodedImage;
</ins><span class="cx"> if (!image || !encodeImage(image, mimeType, &encodedImage))
</span><del>- return "data:,";
</del><ins>+ return { };
</ins><span class="cx">
</span><del>- Vector<char> base64Data;
- base64Encode(encodedImage, base64Data);
</del><ins>+ return encodedImage;
+}
</ins><span class="cx">
</span><del>- return "data:" + mimeType + ";base64," + base64Data;
-}
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(ACCELERATED_2D_CANVAS) && !USE(COORDINATED_GRAPHICS_THREADED)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscgImageBufferCGcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp (213343 => 213344)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp 2017-03-03 03:59:01 UTC (rev 213343)
+++ trunk/Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp 2017-03-03 04:12:15 UTC (rev 213344)
</span><span class="lines">@@ -498,8 +498,36 @@
</span><span class="cx"> return "data:" + mimeType + ";base64," + base64Data;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static Vector<uint8_t> data(CGImageRef image, const String& mimeType, std::optional<double> quality)
+{
+ auto uti = utiFromMIMEType(mimeType);
+ ASSERT(uti);
+
+ auto cfData = adoptCF(CFDataCreateMutable(kCFAllocatorDefault, 0));
+ if (!encodeImage(image, uti.get(), quality, cfData.get()))
+ return { };
+
+ Vector<uint8_t> data;
+ data.append(CFDataGetBytePtr(cfData.get()), CFDataGetLength(cfData.get()));
+ return data;
+}
+
</ins><span class="cx"> String ImageBuffer::toDataURL(const String& mimeType, std::optional<double> quality, CoordinateSystem) const
</span><span class="cx"> {
</span><ins>+ if (auto image = toCGImage(mimeType))
+ return dataURL(image.get(), mimeType, quality);
+ return ASCIILiteral("data:,");
+}
+
+Vector<uint8_t> ImageBuffer::toData(const String& mimeType, std::optional<double> quality) const
+{
+ if (auto image = toCGImage(mimeType))
+ return data(image.get(), mimeType, quality);
+ return { };
+}
+
+RetainPtr<CGImageRef> ImageBuffer::toCGImage(const String& mimeType) const
+{
</ins><span class="cx"> ASSERT(MIMETypeRegistry::isSupportedImageMIMETypeForEncoding(mimeType));
</span><span class="cx">
</span><span class="cx"> if (context().isAcceleratedContext())
</span><span class="lines">@@ -515,14 +543,13 @@
</span><span class="cx"> // JPEGs don't have an alpha channel, so we have to manually composite on top of black.
</span><span class="cx"> premultipliedData = getPremultipliedImageData(IntRect(IntPoint(0, 0), logicalSize()));
</span><span class="cx"> if (!premultipliedData)
</span><del>- return ASCIILiteral("data:,");
</del><ins>+ return nullptr;
</ins><span class="cx">
</span><span class="cx"> auto dataProvider = adoptCF(CGDataProviderCreateWithData(0, premultipliedData->data(), 4 * logicalSize().width() * logicalSize().height(), 0));
</span><span class="cx"> if (!dataProvider)
</span><del>- return ASCIILiteral("data:,");
</del><ins>+ return nullptr;
</ins><span class="cx">
</span><del>- image = adoptCF(CGImageCreate(logicalSize().width(), logicalSize().height(), 8, 32, 4 * logicalSize().width(),
- sRGBColorSpaceRef(), kCGBitmapByteOrderDefault | kCGImageAlphaNoneSkipLast, dataProvider.get(), 0, false, kCGRenderingIntentDefault));
</del><ins>+ image = adoptCF(CGImageCreate(logicalSize().width(), logicalSize().height(), 8, 32, 4 * logicalSize().width(), sRGBColorSpaceRef(), kCGBitmapByteOrderDefault | kCGImageAlphaNoneSkipLast, dataProvider.get(), 0, false, kCGRenderingIntentDefault));
</ins><span class="cx"> } else if (m_resolutionScale == 1) {
</span><span class="cx"> image = copyNativeImage(CopyBackingStore);
</span><span class="cx"> image = createCroppedImageIfNecessary(image.get(), internalSize());
</span><span class="lines">@@ -536,10 +563,10 @@
</span><span class="cx"> image = adoptCF(CGBitmapContextCreateImage(context.get()));
</span><span class="cx"> }
</span><span class="cx">
</span><del>- return dataURL(image.get(), mimeType, quality);
</del><ins>+ return image;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-String dataURL(const ImageData& source, const String& mimeType, std::optional<double> quality)
</del><ins>+static RetainPtr<CGImageRef> cgImage(const ImageData& source, const String& mimeType)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(MIMETypeRegistry::isSupportedImageMIMETypeForEncoding(mimeType));
</span><span class="cx">
</span><span class="lines">@@ -554,7 +581,7 @@
</span><span class="cx"> // JPEGs don't have an alpha channel, so we have to manually composite on top of black.
</span><span class="cx"> size_t size = 4 * source.width() * source.height();
</span><span class="cx"> if (!premultipliedData.tryReserveCapacity(size))
</span><del>- return ASCIILiteral("data:,");
</del><ins>+ return nullptr;
</ins><span class="cx">
</span><span class="cx"> premultipliedData.resize(size);
</span><span class="cx"> unsigned char *buffer = premultipliedData.data();
</span><span class="lines">@@ -577,13 +604,26 @@
</span><span class="cx">
</span><span class="cx"> auto dataProvider = adoptCF(CGDataProviderCreateWithData(0, data, 4 * source.width() * source.height(), 0));
</span><span class="cx"> if (!dataProvider)
</span><del>- return ASCIILiteral("data:,");
</del><ins>+ return nullptr;
</ins><span class="cx">
</span><del>- auto image = adoptCF(CGImageCreate(source.width(), source.height(), 8, 32, 4 * source.width(),
- sRGBColorSpaceRef(), kCGBitmapByteOrderDefault | dataAlphaInfo, dataProvider.get(), 0, false, kCGRenderingIntentDefault));
- return dataURL(image.get(), mimeType, quality);
</del><ins>+ auto image = adoptCF(CGImageCreate(source.width(), source.height(), 8, 32, 4 * source.width(), sRGBColorSpaceRef(), kCGBitmapByteOrderDefault | dataAlphaInfo, dataProvider.get(), 0, false, kCGRenderingIntentDefault));
+ return image;
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+String dataURL(const ImageData& source, const String& mimeType, std::optional<double> quality)
+{
+ if (auto image = cgImage(source, mimeType))
+ return dataURL(image.get(), mimeType, quality);
+ return ASCIILiteral("data:,");
+}
+
+Vector<uint8_t> data(const ImageData& source, const String& mimeType, std::optional<double> quality)
+{
+ if (auto image = cgImage(source, mimeType))
+ return data(image.get(), mimeType, quality);
+ return { };
+}
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgtkImageBufferGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gtk/ImageBufferGtk.cpp (213343 => 213344)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gtk/ImageBufferGtk.cpp 2017-03-03 03:59:01 UTC (rev 213343)
+++ trunk/Source/WebCore/platform/graphics/gtk/ImageBufferGtk.cpp 2017-03-03 04:12:15 UTC (rev 213344)
</span><span class="lines">@@ -77,17 +77,28 @@
</span><span class="cx">
</span><span class="cx"> String ImageBuffer::toDataURL(const String& mimeType, std::optional<double> quality, CoordinateSystem) const
</span><span class="cx"> {
</span><ins>+ Vector<uint8_t> imageData = toData(mimeType, quality);
+ if (imageData.isEmpty())
+ return "data:,";
+
+ Vector<char> base64Data;
+ base64Encode(imageData.data(), imageData.size(), base64Data);
+
+ return "data:" + mimeType + ";base64," + base64Data;
+}
+
+Vector<uint8_t> ImageBuffer::toData(const String& mimeType, std::optional<double> quality) const
+{
</ins><span class="cx"> ASSERT(MIMETypeRegistry::isSupportedImageMIMETypeForEncoding(mimeType));
</span><span class="cx">
</span><span class="cx"> GUniqueOutPtr<gchar> buffer;
</span><span class="cx"> gsize bufferSize;
</span><span class="cx"> if (!encodeImage(m_data.m_surface.get(), mimeType, quality, buffer, bufferSize))
</span><del>- return "data:,";
</del><ins>+ return { };
</ins><span class="cx">
</span><del>- Vector<char> base64Data;
- base64Encode(buffer.get(), bufferSize, base64Data);
-
- return "data:" + mimeType + ";base64," + base64Data;
</del><ins>+ Vector<uint8_t> imageData;
+ imageData.append(buffer.get(), bufferSize);
+ return imageData;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicswinImageBufferDirect2Dcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/win/ImageBufferDirect2D.cpp (213343 => 213344)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/win/ImageBufferDirect2D.cpp 2017-03-03 03:59:01 UTC (rev 213343)
+++ trunk/Source/WebCore/platform/graphics/win/ImageBufferDirect2D.cpp 2017-03-03 04:12:15 UTC (rev 213344)
</span><span class="lines">@@ -260,6 +260,12 @@
</span><span class="cx"> return ASCIILiteral("data:,");
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+Vector<uint8_t> ImageBuffer::toData(const String& mimeType, std::optional<double> quality) const
+{
+ notImplemented();
+ return { };
+}
+
</ins><span class="cx"> String ImageDataToDataURL(const ImageData& source, const String& mimeType, const double* quality)
</span><span class="cx"> {
</span><span class="cx"> notImplemented();
</span></span></pre>
</div>
</div>
</body>
</html>