Changeset 259833 in webkit

Timestamp:

Apr 9, 2020, 3:08:48 PM (6 years ago)

Author:

ddkilzer@apple.com

Message:

Add using WTF::isInBounds to CheckedArithmetic.h
<​https://webkit.org/b/210299>

Reviewed by Darin Adler.

Source/WebCore:

• fileapi/Blob.cpp:

(WebCore::Blob::size const):

• page/PointerCaptureController.cpp:

(WebCore::PointerCaptureController::elementWasRemoved):

• platform/graphics/ImageSource.cpp:

(WebCore::ImageSource::cacheNativeImageAtIndex):

• platform/graphics/gpu/cocoa/GPUBindGroupMetal.mm:

(WebCore::tryGetResourceAsBufferBinding):

• Remove WTF:: prefix from isInBounds().

Source/WebKit:

• Platform/IPC/ArgumentCoders.h:
• Shared/UserData.cpp:

(WebKit::UserData::decode):

• Remove WTF:: prefix from isInBounds().

Source/WTF:

• wtf/CheckedArithmetic.h:
• Add using WTF::isInBounds statement so this function may be used unprefixed outside the WTF project.

Tools:

• TestWebKitAPI/Tests/WTF/CheckedArithmeticOperations.cpp:

(TestWebKitAPI::TEST):

• Remove WTF:: prefix from isInBounds().

Location:

trunk

Files:

• Source/WTF/ChangeLog (modified) (1 diff)
• Source/WTF/wtf/CheckedArithmetic.h (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/fileapi/Blob.cpp (modified) (1 diff)
• Source/WebCore/page/PointerCaptureController.cpp (modified) (1 diff)
• Source/WebCore/platform/graphics/ImageSource.cpp (modified) (1 diff)
• Source/WebCore/platform/graphics/gpu/cocoa/GPUBindGroupMetal.mm (modified) (1 diff)
• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/Platform/IPC/ArgumentCoders.h (modified) (2 diffs)
• Source/WebKit/Shared/UserData.cpp (modified) (2 diffs)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/Tests/WTF/CheckedArithmeticOperations.cpp (modified) (1 diff)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2020-04-09  David Kilzer  <ddkilzer@apple.com>
+
+        Add using WTF::isInBounds to CheckedArithmetic.h
+        <https://webkit.org/b/210299>
+
+        Reviewed by Darin Adler.
+
+        * wtf/CheckedArithmetic.h:
+        - Add `using WTF::isInBounds` statement so this function may be
+          used unprefixed outside the WTF project.
+
 2020-04-09  David Kilzer  <ddkilzer@apple.com>
 

trunk/Source/WTF/wtf/CheckedArithmetic.h

@@ -1007 +1007 @@
 using WTF::checkedSum;
 using WTF::differenceOverflows;
+using WTF::isInBounds;
 using WTF::productOverflows;
 using WTF::sumOverflows;

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-04-09  David Kilzer  <ddkilzer@apple.com>
+
+        Add using WTF::isInBounds to CheckedArithmetic.h
+        <https://webkit.org/b/210299>
+
+        Reviewed by Darin Adler.
+
+        * fileapi/Blob.cpp:
+        (WebCore::Blob::size const):
+        * page/PointerCaptureController.cpp:
+        (WebCore::PointerCaptureController::elementWasRemoved):
+        * platform/graphics/ImageSource.cpp:
+        (WebCore::ImageSource::cacheNativeImageAtIndex):
+        * platform/graphics/gpu/cocoa/GPUBindGroupMetal.mm:
+        (WebCore::tryGetResourceAsBufferBinding):
+        - Remove WTF:: prefix from isInBounds().
+
 2020-04-09  Andres Gonzalez  <andresg_22@apple.com>
 

trunk/Source/WebCore/fileapi/Blob.cpp

@@ -163 +163 @@
         // come up with an exception to throw if file size is not representable.
         unsigned long long actualSize = ThreadableBlobRegistry::blobSize(m_internalURL);
-        m_size = WTF::isInBounds<long long>(actualSize) ? actualSize : 0;
+        m_size = isInBounds<long long>(actualSize) ? actualSize : 0;
     }
 

trunk/Source/WebCore/page/PointerCaptureController.cpp

@@ -145 +145 @@
             // override nodes SHOULD be cleared and also a PointerEvent named lostpointercapture corresponding to the captured pointer SHOULD be fired
             // at the document.
-            ASSERT(WTF::isInBounds<PointerID>(keyAndValue.key));
+            ASSERT(isInBounds<PointerID>(keyAndValue.key));
             auto pointerId = static_cast<PointerID>(keyAndValue.key);
             auto pointerType = capturingData.pointerType;

trunk/Source/WebCore/platform/graphics/ImageSource.cpp

@@ -289 +289 @@
     // Do not cache the NativeImage if adding its frameByes to the MemoryCache will cause numerical overflow.
     size_t frameBytes = size().unclampedArea() * sizeof(uint32_t);
-    if (!WTF::isInBounds<unsigned>(frameBytes + decodedSize()))
+    if (!isInBounds<unsigned>(frameBytes + decodedSize()))
         return;
 

trunk/Source/WebCore/platform/graphics/gpu/cocoa/GPUBindGroupMetal.mm

@@ -56 +56 @@
         return WTF::nullopt;
     }
-    if (!WTF::isInBounds<NSUInteger>(bufferBinding.size) || bufferBinding.size > bufferBinding.buffer->byteLength()) {
+    if (!isInBounds<NSUInteger>(bufferBinding.size) || bufferBinding.size > bufferBinding.buffer->byteLength()) {
         LOG(WebGPU, "%s: GPUBufferBinding size is too large!", functionName);
         return WTF::nullopt;
     }
     // MTLBuffer size (NSUInteger) is 32 bits on some platforms.
-    if (!WTF::isInBounds<NSUInteger>(bufferBinding.offset)) {
+    if (!isInBounds<NSUInteger>(bufferBinding.offset)) {
         LOG(WebGPU, "%s: Buffer offset is too large!", functionName);
         return WTF::nullopt;

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-04-09  David Kilzer  <ddkilzer@apple.com>
+
+        Add using WTF::isInBounds to CheckedArithmetic.h
+        <https://webkit.org/b/210299>
+
+        Reviewed by Darin Adler.
+
+        * Platform/IPC/ArgumentCoders.h:
+        * Shared/UserData.cpp:
+        (WebKit::UserData::decode):
+        - Remove WTF:: prefix from isInBounds().
+
 2020-04-09  Keith Rollin  <krollin@apple.com>
 

trunk/Source/WebKit/Platform/IPC/ArgumentCoders.h

@@ -373 +373 @@
         }
 
-        if (!WTF::isInBounds<size_t>(decodedSize)) {
+        if (!isInBounds<size_t>(decodedSize)) {
             decoder.markInvalid();
             return false;
@@ -408 +408 @@
         }
 
-        if (!WTF::isInBounds<size_t>(decodedSize)) {
+        if (!isInBounds<size_t>(decodedSize)) {
             decoder.markInvalid();
             return WTF::nullopt;

trunk/Source/WebKit/Shared/UserData.cpp

@@ -346 +346 @@
             return false;
 
-        if (!WTF::isInBounds<size_t>(decodedSize))
+        if (!isInBounds<size_t>(decodedSize))
             return false;
 
@@ -387 +387 @@
             return false;
 
-        if (!WTF::isInBounds<size_t>(decodedSize))
+        if (!isInBounds<size_t>(decodedSize))
             return false;
 

trunk/Tools/ChangeLog

@@ +1 @@
+2020-04-09  David Kilzer  <ddkilzer@apple.com>
+
+        Add using WTF::isInBounds to CheckedArithmetic.h
+        <https://webkit.org/b/210299>
+
+        Reviewed by Darin Adler.
+
+        * TestWebKitAPI/Tests/WTF/CheckedArithmeticOperations.cpp:
+        (TestWebKitAPI::TEST):
+        - Remove WTF:: prefix from isInBounds().
+
 2020-04-09  Keith Rollin  <krollin@apple.com>
 

trunk/Tools/TestWebKitAPI/Tests/WTF/CheckedArithmeticOperations.cpp

@@ -432 +432 @@
 {
     // bigger precision, signed, signed
-    EXPECT_TRUE(WTF::isInBounds<int32_t>(std::numeric_limits<int16_t>::max()));
-    EXPECT_TRUE(WTF::isInBounds<int32_t>(std::numeric_limits<int16_t>::min()));
+    EXPECT_TRUE(isInBounds<int32_t>(std::numeric_limits<int16_t>::max()));
+    EXPECT_TRUE(isInBounds<int32_t>(std::numeric_limits<int16_t>::min()));
 
     // bigger precision, unsigned, signed
-    EXPECT_TRUE(WTF::isInBounds<uint32_t>(std::numeric_limits<int32_t>::max()));
-    EXPECT_FALSE(WTF::isInBounds<uint32_t>(std::numeric_limits<int16_t>::min()));
-
-    EXPECT_FALSE(WTF::isInBounds<uint32_t>((int32_t)-1));
-    EXPECT_FALSE(WTF::isInBounds<uint16_t>((int32_t)-1));
-    EXPECT_FALSE(WTF::isInBounds<unsigned long>((int)-1));
-
-    EXPECT_TRUE(WTF::isInBounds<uint32_t>((int32_t)1));
-    EXPECT_TRUE(WTF::isInBounds<uint32_t>((int16_t)1));
-    EXPECT_TRUE(WTF::isInBounds<unsigned>((int)1));
-
-    EXPECT_TRUE(WTF::isInBounds<uint32_t>((int32_t)0));
-    EXPECT_TRUE(WTF::isInBounds<uint16_t>((int32_t)0));
-    EXPECT_TRUE(WTF::isInBounds<uint32_t>((int16_t)0));
-    EXPECT_TRUE(WTF::isInBounds<unsigned>((int)0));
-
-    EXPECT_TRUE(WTF::isInBounds<uint32_t>(std::numeric_limits<int32_t>::max()));
-    EXPECT_TRUE(WTF::isInBounds<uint32_t>(std::numeric_limits<int16_t>::max()));
-    EXPECT_TRUE(WTF::isInBounds<unsigned>(std::numeric_limits<int>::max()));
+    EXPECT_TRUE(isInBounds<uint32_t>(std::numeric_limits<int32_t>::max()));
+    EXPECT_FALSE(isInBounds<uint32_t>(std::numeric_limits<int16_t>::min()));
+
+    EXPECT_FALSE(isInBounds<uint32_t>((int32_t)-1));
+    EXPECT_FALSE(isInBounds<uint16_t>((int32_t)-1));
+    EXPECT_FALSE(isInBounds<unsigned long>((int)-1));
+
+    EXPECT_TRUE(isInBounds<uint32_t>((int32_t)1));
+    EXPECT_TRUE(isInBounds<uint32_t>((int16_t)1));
+    EXPECT_TRUE(isInBounds<unsigned>((int)1));
+
+    EXPECT_TRUE(isInBounds<uint32_t>((int32_t)0));
+    EXPECT_TRUE(isInBounds<uint16_t>((int32_t)0));
+    EXPECT_TRUE(isInBounds<uint32_t>((int16_t)0));
+    EXPECT_TRUE(isInBounds<unsigned>((int)0));
+
+    EXPECT_TRUE(isInBounds<uint32_t>(std::numeric_limits<int32_t>::max()));
+    EXPECT_TRUE(isInBounds<uint32_t>(std::numeric_limits<int16_t>::max()));
+    EXPECT_TRUE(isInBounds<unsigned>(std::numeric_limits<int>::max()));
 
     // bigger precision, signed, unsigned
-    EXPECT_TRUE(WTF::isInBounds<int32_t>(std::numeric_limits<uint16_t>::max()));
-    EXPECT_FALSE(WTF::isInBounds<int32_t>(std::numeric_limits<uint32_t>::max()));
-    EXPECT_TRUE(WTF::isInBounds<int32_t>((uint32_t)0));
+    EXPECT_TRUE(isInBounds<int32_t>(std::numeric_limits<uint16_t>::max()));
+    EXPECT_FALSE(isInBounds<int32_t>(std::numeric_limits<uint32_t>::max()));
+    EXPECT_TRUE(isInBounds<int32_t>((uint32_t)0));
 
     // bigger precision, unsigned, unsigned
-    EXPECT_TRUE(WTF::isInBounds<uint32_t>(std::numeric_limits<uint16_t>::max()));
-    EXPECT_TRUE(WTF::isInBounds<uint32_t>(std::numeric_limits<uint16_t>::min()));
+    EXPECT_TRUE(isInBounds<uint32_t>(std::numeric_limits<uint16_t>::max()));
+    EXPECT_TRUE(isInBounds<uint32_t>(std::numeric_limits<uint16_t>::min()));
 
     // lower precision, signed signed
-    EXPECT_FALSE(WTF::isInBounds<int16_t>(std::numeric_limits<int32_t>::max()));
-    EXPECT_FALSE(WTF::isInBounds<int16_t>(std::numeric_limits<int32_t>::min()));
-    EXPECT_TRUE(WTF::isInBounds<int16_t>((int32_t)-1));
-    EXPECT_TRUE(WTF::isInBounds<int16_t>((int32_t)0));
-    EXPECT_TRUE(WTF::isInBounds<int16_t>((int32_t)1));
+    EXPECT_FALSE(isInBounds<int16_t>(std::numeric_limits<int32_t>::max()));
+    EXPECT_FALSE(isInBounds<int16_t>(std::numeric_limits<int32_t>::min()));
+    EXPECT_TRUE(isInBounds<int16_t>((int32_t)-1));
+    EXPECT_TRUE(isInBounds<int16_t>((int32_t)0));
+    EXPECT_TRUE(isInBounds<int16_t>((int32_t)1));
     // lower precision, unsigned, signed
-    EXPECT_FALSE(WTF::isInBounds<uint16_t>(std::numeric_limits<int32_t>::max()));
-    EXPECT_FALSE(WTF::isInBounds<uint16_t>(std::numeric_limits<int32_t>::min()));
-    EXPECT_FALSE(WTF::isInBounds<uint16_t>((int32_t)-1));
-    EXPECT_TRUE(WTF::isInBounds<uint16_t>((int32_t)0));
-    EXPECT_TRUE(WTF::isInBounds<uint16_t>((int32_t)1));
+    EXPECT_FALSE(isInBounds<uint16_t>(std::numeric_limits<int32_t>::max()));
+    EXPECT_FALSE(isInBounds<uint16_t>(std::numeric_limits<int32_t>::min()));
+    EXPECT_FALSE(isInBounds<uint16_t>((int32_t)-1));
+    EXPECT_TRUE(isInBounds<uint16_t>((int32_t)0));
+    EXPECT_TRUE(isInBounds<uint16_t>((int32_t)1));
     // lower precision, signed, unsigned
-    EXPECT_FALSE(WTF::isInBounds<int16_t>(std::numeric_limits<uint32_t>::max()));
-    EXPECT_TRUE(WTF::isInBounds<int16_t>((uint32_t)0));
-    EXPECT_TRUE(WTF::isInBounds<int16_t>((uint32_t)1));
+    EXPECT_FALSE(isInBounds<int16_t>(std::numeric_limits<uint32_t>::max()));
+    EXPECT_TRUE(isInBounds<int16_t>((uint32_t)0));
+    EXPECT_TRUE(isInBounds<int16_t>((uint32_t)1));
     // lower precision, unsigned, unsigned
-    EXPECT_FALSE(WTF::isInBounds<uint16_t>(std::numeric_limits<uint32_t>::max()));
-    EXPECT_TRUE(WTF::isInBounds<uint16_t>((uint32_t)0));
-    EXPECT_TRUE(WTF::isInBounds<uint16_t>((uint32_t)1));
+    EXPECT_FALSE(isInBounds<uint16_t>(std::numeric_limits<uint32_t>::max()));
+    EXPECT_TRUE(isInBounds<uint16_t>((uint32_t)0));
+    EXPECT_TRUE(isInBounds<uint16_t>((uint32_t)1));
 }