<!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>[207591] 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/207591">207591</a></dd>
<dt>Author</dt> <dd>pvollan@apple.com</dd>
<dt>Date</dt> <dd>2016-10-20 02:03:29 -0700 (Thu, 20 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Win][Direct2D] Implement ImageBufferData::getData.
https://bugs.webkit.org/show_bug.cgi?id=163668
Reviewed by Brent Fulgham.
Render data to a bitmap in system memory, which data can be read from.
* platform/graphics/win/ImageBufferDataDirect2D.cpp:
(WebCore::ImageBufferData::getData):
* platform/graphics/win/ImageBufferDirect2D.cpp:
(WebCore::ImageBuffer::ImageBuffer):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicswinImageBufferDataDirect2Dcpp">trunk/Source/WebCore/platform/graphics/win/ImageBufferDataDirect2D.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicswinImageBufferDirect2Dcpp">trunk/Source/WebCore/platform/graphics/win/ImageBufferDirect2D.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (207590 => 207591)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-10-20 08:33:44 UTC (rev 207590)
+++ trunk/Source/WebCore/ChangeLog 2016-10-20 09:03:29 UTC (rev 207591)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-10-20 Per Arne Vollan <pvollan@apple.com>
+
+ [Win][Direct2D] Implement ImageBufferData::getData.
+ https://bugs.webkit.org/show_bug.cgi?id=163668
+
+ Reviewed by Brent Fulgham.
+
+ Render data to a bitmap in system memory, which data can be read from.
+
+ * platform/graphics/win/ImageBufferDataDirect2D.cpp:
+ (WebCore::ImageBufferData::getData):
+ * platform/graphics/win/ImageBufferDirect2D.cpp:
+ (WebCore::ImageBuffer::ImageBuffer):
+
</ins><span class="cx"> 2016-10-20 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> Wrong use of EGL_DEPTH_SIZE
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicswinImageBufferDataDirect2Dcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/win/ImageBufferDataDirect2D.cpp (207590 => 207591)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/win/ImageBufferDataDirect2D.cpp 2016-10-20 08:33:44 UTC (rev 207590)
+++ trunk/Source/WebCore/platform/graphics/win/ImageBufferDataDirect2D.cpp 2016-10-20 09:03:29 UTC (rev 207591)
</span><span class="lines">@@ -28,7 +28,9 @@
</span><span class="cx">
</span><span class="cx"> #if USE(DIRECT2D)
</span><span class="cx">
</span><ins>+#include "BitmapInfo.h"
</ins><span class="cx"> #include "GraphicsContext.h"
</span><ins>+#include "HWndDC.h"
</ins><span class="cx"> #include "IntRect.h"
</span><span class="cx"> #include "NotImplemented.h"
</span><span class="cx"> #include <d2d1.h>
</span><span class="lines">@@ -39,10 +41,52 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-RefPtr<Uint8ClampedArray> ImageBufferData::getData(const IntRect&, const IntSize&, bool /* accelerateRendering */, bool /* unmultiplied */, float /* resolutionScale */) const
</del><ins>+RefPtr<Uint8ClampedArray> ImageBufferData::getData(const IntRect& rect, const IntSize& size, bool /* accelerateRendering */, bool /* unmultiplied */, float /* resolutionScale */) const
</ins><span class="cx"> {
</span><del>- notImplemented();
- return nullptr;
</del><ins>+ auto platformContext = context->platformContext();
+
+ Checked<unsigned, RecordOverflow> area = 4 * rect.area();
+ if (area.hasOverflowed())
+ return nullptr;
+
+ auto result = Uint8ClampedArray::createUninitialized(area.unsafeGet());
+ unsigned char* resultData = result ? result->data() : nullptr;
+ if (!resultData)
+ return nullptr;
+
+ BitmapInfo bitmapInfo = BitmapInfo::createBottomUp(size);
+
+ void* pixels = nullptr;
+ auto bitmap = adoptGDIObject(::CreateDIBSection(0, &bitmapInfo, DIB_RGB_COLORS, &pixels, 0, 0));
+
+ HWndDC windowDC(nullptr);
+ auto bitmapDC = adoptGDIObject(::CreateCompatibleDC(windowDC));
+ HGDIOBJ oldBitmap = ::SelectObject(bitmapDC.get(), bitmap.get());
+
+ HRESULT hr;
+
+ COMPtr<ID2D1GdiInteropRenderTarget> gdiRenderTarget;
+ hr = platformContext->QueryInterface(__uuidof(ID2D1GdiInteropRenderTarget), (void**)&gdiRenderTarget);
+ if (FAILED(hr))
+ return nullptr;
+
+ platformContext->BeginDraw();
+
+ HDC hdc = nullptr;
+ hr = gdiRenderTarget->GetDC(D2D1_DC_INITIALIZE_MODE_COPY, &hdc);
+
+ BOOL ok = ::BitBlt(bitmapDC.get(), 0, 0, rect.width(), rect.height(), hdc, rect.x(), rect.y(), SRCCOPY);
+
+ hr = gdiRenderTarget->ReleaseDC(nullptr);
+
+ hr = platformContext->EndDraw();
+
+ if (!ok)
+ return nullptr;
+
+ memcpy(result->data(), pixels, 4 * rect.area());
+
+ return result;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ImageBufferData::putData(Uint8ClampedArray*& /* source */, const IntSize& /* sourceSize */, const IntRect& /* sourceRect */, const IntPoint& /* destPoint */, const IntSize& /* size */, bool /* accelerateRendering */, bool /* unmultiplied */, float /* resolutionScale */)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicswinImageBufferDirect2Dcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/win/ImageBufferDirect2D.cpp (207590 => 207591)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/win/ImageBufferDirect2D.cpp 2016-10-20 08:33:44 UTC (rev 207590)
+++ trunk/Source/WebCore/platform/graphics/win/ImageBufferDirect2D.cpp 2016-10-20 09:03:29 UTC (rev 207591)
</span><span class="lines">@@ -107,7 +107,9 @@
</span><span class="cx"> RELEASE_ASSERT(renderTarget);
</span><span class="cx">
</span><span class="cx"> COMPtr<ID2D1BitmapRenderTarget> bitmapContext;
</span><del>- HRESULT hr = renderTarget->CreateCompatibleRenderTarget(FloatSize(m_logicalSize), &bitmapContext);
</del><ins>+ D2D1_SIZE_F desiredSize = FloatSize(m_logicalSize);
+ D2D1_SIZE_U pixelSize = IntSize(m_logicalSize);
+ HRESULT hr = renderTarget->CreateCompatibleRenderTarget(&desiredSize, &pixelSize, nullptr, D2D1_COMPATIBLE_RENDER_TARGET_OPTIONS_GDI_COMPATIBLE, &bitmapContext);
</ins><span class="cx"> if (!bitmapContext || !SUCCEEDED(hr))
</span><span class="cx"> return;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>