Attachment 349293 Details for Bug 189398 – Patch

[patch] Patch

bug-189398-20180910110618.patch (text/plain), 2.47 KB, created by Fujii Hironori on 2018-09-09 19:06:19 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Fujii Hironori

Created: 2018-09-09 19:06:19 PDT

Size: 2.47 KB

patch

obsolete

>Subversion Revision: 235837
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 8375217f8686e250bb3a23429f0200fb573ffe7e..36b763552a76e1f86b5e1e9be7427b32b4091509 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,21 @@
>+2018-09-09  Fujii Hironori  <Hironori.Fujii@sony.com>
>+
>+        [Win][Clang] Add FloatRect(const RECT&) constructor
>+        https://bugs.webkit.org/show_bug.cgi?id=189398
>+
>+        Reviewed by Alex Christensen.
>+
>+        While trying to build WebKit WinCairo port with the latest Clang
>+        (Bug 171618), the following compilation errors were reported.
>+
>+          error: no viable conversion from returned value of type 'RECT' (aka 'tagRECT') to function return type 'WebCore::FloatRect'
>+
>+        No new tests (No behavior change).
>+
>+        * platform/graphics/FloatRect.h:
>+        * platform/graphics/win/FloatRectDirect2D.cpp:
>+        (WebCore::FloatRect::FloatRect): Added a new constructor taking a RECT as the argument.
>+
> 2018-09-08  Andy Estes  <aestes@apple.com>
> 
>         [Apple Pay] Dispatch a paymentmethodchange event when the payment method changes
>diff --git a/Source/WebCore/platform/graphics/FloatRect.h b/Source/WebCore/platform/graphics/FloatRect.h
>index 8d19f7f862ef4adc6b754cdce16072ebd3fe200e..a6dd2106fe3c6f366c3af4e8080163ec062dfd35 100644
>--- a/Source/WebCore/platform/graphics/FloatRect.h
>+++ b/Source/WebCore/platform/graphics/FloatRect.h
>@@ -45,6 +45,7 @@ typedef struct _cairo_rectangle cairo_rectangle_t;
> #endif
> 
> #if PLATFORM(WIN)
>+typedef struct tagRECT RECT;
> struct D2D_RECT_F;
> typedef D2D_RECT_F D2D1_RECT_F;
> #endif
>@@ -195,6 +196,7 @@ public:
> #endif
> 
> #if PLATFORM(WIN)
>+    WEBCORE_EXPORT FloatRect(const RECT&);
>     WEBCORE_EXPORT FloatRect(const D2D1_RECT_F&);
>     WEBCORE_EXPORT operator D2D1_RECT_F() const;
> #endif
>diff --git a/Source/WebCore/platform/graphics/win/FloatRectDirect2D.cpp b/Source/WebCore/platform/graphics/win/FloatRectDirect2D.cpp
>index 88d05e69538e7f94104778e3ebefd7aa469dbc27..36f7f8d4cfe0023ade134a7a7f4d59ac5871e7e1 100644
>--- a/Source/WebCore/platform/graphics/win/FloatRectDirect2D.cpp
>+++ b/Source/WebCore/platform/graphics/win/FloatRectDirect2D.cpp
>@@ -50,6 +50,12 @@ static bool isInfiniteRect(const D2D1_RECT_F& rect)
>     return true;
> }
> 
>+FloatRect::FloatRect(const RECT& rect)
>+    : m_location(rect.left, rect.top)
>+    , m_size(rect.right - rect.left, rect.bottom - rect.top)
>+{
>+}
>+
> FloatRect::FloatRect(const D2D1_RECT_F& r)
> {
>     // Infinite Rect case:

Actions: View | Formatted Diff | Diff

Attachments on bug 189398: 349117 | 349293