Changeset 246091 in webkit

Timestamp:

Jun 4, 2019, 5:26:10 PM (7 years ago)

Author:

Keith Rollin

Message:

Fix 64-bit vs 32-bit mismatch in TileController.cpp
​https://bugs.webkit.org/show_bug.cgi?id=198540
<rdar://problem/51410851>

Reviewed by Alex Christensen.

TileController::blankPixelCountForTiles calculates its result as a
uint64_t, but returns it as an unsigned. The former is a 64-bit value,
while the latter can be a 32-bit value on some platforms. This
mismatch can lead to a compile-time error. Fix this by explicitly
casting the 64-bit value to an "unsigned".

No new tests -- no new functionality.

• platform/graphics/ca/TileController.cpp:

(WebCore::TileController::blankPixelCountForTiles):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/ca/TileController.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-06-04  Keith Rollin  <krollin@apple.com>
+
+        Fix 64-bit vs 32-bit mismatch in TileController.cpp
+        https://bugs.webkit.org/show_bug.cgi?id=198540
+        <rdar://problem/51410851>
+
+        Reviewed by Alex Christensen.
+
+        TileController::blankPixelCountForTiles calculates its result as a
+        uint64_t, but returns it as an unsigned. The former is a 64-bit value,
+        while the latter can be a 32-bit value on some platforms. This
+        mismatch can lead to a compile-time error. Fix this by explicitly
+        casting the 64-bit value to an "unsigned".
+
+        No new tests -- no new functionality.
+
+        * platform/graphics/ca/TileController.cpp:
+        (WebCore::TileController::blankPixelCountForTiles):
+
 2019-06-04  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/platform/graphics/ca/TileController.cpp

@@ -651 +651 @@
     uncoveredRegion.subtract(paintedVisibleTiles);
 
-    return uncoveredRegion.totalArea();
+    return static_cast<unsigned>(uncoveredRegion.totalArea());
 }