Changeset 235942 in webkit

Timestamp:

Sep 12, 2018 9:47:19 AM (6 years ago)

Author:

Fujii Hironori

Message:

[Win][Clang] error: non-constant-expression cannot be narrowed from type 'int' to 'SHORT'
​https://bugs.webkit.org/show_bug.cgi?id=189542

Reviewed by Alex Christensen.

Source/WebCore:

No new tests (No behavior change).

• platform/graphics/win/IntPointWin.cpp:

(WebCore::IntPoint::operator POINTS const): Narrowed m_x and m_y by using static_cast.

Source/WebKit:

• UIProcess/win/WebInspectorProxyWin.cpp:

(WebKit::WebInspectorProxy::platformCreateFrontendPage): Narrowed initialWindowWidth and initialWindowHeight by using static_cast.

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/graphics/win/IntPointWin.cpp (modified) (1 diff)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/UIProcess/win/WebInspectorProxyWin.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-09-12  Fujii Hironori  <Hironori.Fujii@sony.com>
+
+        [Win][Clang] error: non-constant-expression cannot be narrowed from type 'int' to 'SHORT'
+        https://bugs.webkit.org/show_bug.cgi?id=189542
+
+        Reviewed by Alex Christensen.
+
+        No new tests (No behavior change).
+
+        * platform/graphics/win/IntPointWin.cpp:
+        (WebCore::IntPoint::operator POINTS const): Narrowed m_x and m_y by using static_cast.
+
 2018-09-12  Guillaume Emont  <guijemont@igalia.com>
 

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

@@ -54 +54 @@
 IntPoint::operator POINTS() const
 {
-    POINTS p = {m_x, m_y};
+    POINTS p = { static_cast<SHORT>(m_x), static_cast<SHORT>(m_y) };
     return p;
 }

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2018-09-12  Fujii Hironori  <Hironori.Fujii@sony.com>
+
+        [Win][Clang] error: non-constant-expression cannot be narrowed from type 'int' to 'SHORT'
+        https://bugs.webkit.org/show_bug.cgi?id=189542
+
+        Reviewed by Alex Christensen.
+
+        * UIProcess/win/WebInspectorProxyWin.cpp:
+        (WebKit::WebInspectorProxy::platformCreateFrontendPage): Narrowed initialWindowWidth and initialWindowHeight by using static_cast.
+
 2018-09-12  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebKit/UIProcess/win/WebInspectorProxyWin.cpp

@@ -232 +232 @@
     };
 
-    RECT r = { 0, 0, initialWindowWidth, initialWindowHeight };
+    RECT r = { 0, 0, static_cast<LONG>(initialWindowWidth), static_cast<LONG>(initialWindowHeight) };
     auto page = inspectedPage();
     m_inspectedViewWindow = page->viewWidget();