Title: [246091] trunk/Source/WebCore
Revision
246091
Author
[email protected]
Date
2019-06-04 17:26:10 -0700 (Tue, 04 Jun 2019)

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

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (246090 => 246091)


--- trunk/Source/WebCore/ChangeLog	2019-06-05 00:23:59 UTC (rev 246090)
+++ trunk/Source/WebCore/ChangeLog	2019-06-05 00:26:10 UTC (rev 246091)
@@ -1,3 +1,22 @@
+2019-06-04  Keith Rollin  <[email protected]>
+
+        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  <[email protected]>
 
         Crash when calling XMLHttpRequest.setRequestHeader() in a worker

Modified: trunk/Source/WebCore/platform/graphics/ca/TileController.cpp (246090 => 246091)


--- trunk/Source/WebCore/platform/graphics/ca/TileController.cpp	2019-06-05 00:23:59 UTC (rev 246090)
+++ trunk/Source/WebCore/platform/graphics/ca/TileController.cpp	2019-06-05 00:26:10 UTC (rev 246091)
@@ -650,7 +650,7 @@
     Region uncoveredRegion(enclosingIntRect(visibleRect));
     uncoveredRegion.subtract(paintedVisibleTiles);
 
-    return uncoveredRegion.totalArea();
+    return static_cast<unsigned>(uncoveredRegion.totalArea());
 }
 
 void TileController::setNeedsRevalidateTiles()
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to