Changeset 235840 in webkit

Timestamp:

Sep 9, 2018 10:12:44 PM (6 years ago)

Author:

Fujii Hironori

Message:

[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.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/FloatRect.h (modified) (2 diffs)
• platform/graphics/win/FloatRectDirect2D.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+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>
 

trunk/Source/WebCore/platform/graphics/FloatRect.h

@@ -46 +46 @@
 
 #if PLATFORM(WIN)
+typedef struct tagRECT RECT;
 struct D2D_RECT_F;
 typedef D2D_RECT_F D2D1_RECT_F;
@@ -196 +197 @@
 
 #if PLATFORM(WIN)
+    WEBCORE_EXPORT FloatRect(const RECT&);
     WEBCORE_EXPORT FloatRect(const D2D1_RECT_F&);
     WEBCORE_EXPORT operator D2D1_RECT_F() const;

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

@@ -51 +51 @@
 }
 
+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)
 {