Changeset 207591 in webkit

Timestamp:

Oct 20, 2016 2:03:29 AM (8 years ago)

Author:

pvollan@apple.com

Message:

[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):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/win/ImageBufferDataDirect2D.cpp (modified) (2 diffs)
• platform/graphics/win/ImageBufferDirect2D.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+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):
+
 2016-10-20  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebCore/platform/graphics/win/ImageBufferDataDirect2D.cpp

@@ -29 +29 @@
 #if USE(DIRECT2D)
 
+#include "BitmapInfo.h"
 #include "GraphicsContext.h"
+#include "HWndDC.h"
 #include "IntRect.h"
 #include "NotImplemented.h"
@@ -40 +42 @@
 namespace WebCore {
 
-RefPtr<Uint8ClampedArray> ImageBufferData::getData(const IntRect&, const IntSize&, bool /* accelerateRendering */, bool /* unmultiplied */, float /* resolutionScale */) const
+RefPtr<Uint8ClampedArray> ImageBufferData::getData(const IntRect& rect, const IntSize& size, bool /* accelerateRendering */, bool /* unmultiplied */, float /* resolutionScale */) const
 {
-    notImplemented();
-    return nullptr;
+    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;
 }
 

trunk/Source/WebCore/platform/graphics/win/ImageBufferDirect2D.cpp

@@ -108 +108 @@
 
     COMPtr<ID2D1BitmapRenderTarget> bitmapContext;
-    HRESULT hr = renderTarget->CreateCompatibleRenderTarget(FloatSize(m_logicalSize), &bitmapContext);
+    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);
     if (!bitmapContext || !SUCCEEDED(hr))
         return;