Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (260053 => 260054)
--- trunk/Source/_javascript_Core/ChangeLog 2020-04-14 01:30:00 UTC (rev 260053)
+++ trunk/Source/_javascript_Core/ChangeLog 2020-04-14 01:40:46 UTC (rev 260054)
@@ -1,3 +1,19 @@
+2020-04-13 David Kilzer <[email protected]>
+
+ Replace use of Checked<size_t, RecordOverflow> with CheckedSize
+ <https://webkit.org/b/210461>
+
+ Reviewed by Mark Lam.
+
+ * heap/Heap.cpp:
+ (JSC::Heap::deprecatedReportExtraMemorySlowCase):
+ (JSC::Heap::extraMemorySize):
+ (JSC::Heap::updateAllocationLimits):
+ (JSC::Heap::reportExtraMemoryVisited):
+ * heap/SlotVisitor.h:
+ * runtime/ArgList.cpp:
+ (JSC::MarkedArgumentBuffer::expandCapacity):
+
2020-04-10 Michael Saboff <[email protected]>
[YARR] Allow for Unicode named capture group identifiers in non-Unicode regular expressions
Modified: trunk/Source/_javascript_Core/heap/Heap.cpp (260053 => 260054)
--- trunk/Source/_javascript_Core/heap/Heap.cpp 2020-04-14 01:30:00 UTC (rev 260053)
+++ trunk/Source/_javascript_Core/heap/Heap.cpp 2020-04-14 01:40:46 UTC (rev 260054)
@@ -525,7 +525,7 @@
{
// FIXME: Change this to use SaturatedArithmetic when available.
// https://bugs.webkit.org/show_bug.cgi?id=170411
- Checked<size_t, RecordOverflow> checkedNewSize = m_deprecatedExtraMemorySize;
+ CheckedSize checkedNewSize = m_deprecatedExtraMemorySize;
checkedNewSize += size;
m_deprecatedExtraMemorySize = UNLIKELY(checkedNewSize.hasOverflowed()) ? std::numeric_limits<size_t>::max() : checkedNewSize.unsafeGet();
reportExtraMemoryAllocatedSlowCase(size);
@@ -836,7 +836,7 @@
{
// FIXME: Change this to use SaturatedArithmetic when available.
// https://bugs.webkit.org/show_bug.cgi?id=170411
- Checked<size_t, RecordOverflow> checkedTotal = m_extraMemorySize;
+ CheckedSize checkedTotal = m_extraMemorySize;
checkedTotal += m_deprecatedExtraMemorySize;
checkedTotal += m_arrayBuffers.size();
size_t total = UNLIKELY(checkedTotal.hasOverflowed()) ? std::numeric_limits<size_t>::max() : checkedTotal.unsafeGet();
@@ -2280,7 +2280,7 @@
// extra memory reporting.
currentHeapSize += extraMemorySize();
if (ASSERT_ENABLED) {
- Checked<size_t, RecordOverflow> checkedCurrentHeapSize = m_totalBytesVisited;
+ CheckedSize checkedCurrentHeapSize = m_totalBytesVisited;
checkedCurrentHeapSize += extraMemorySize();
ASSERT(!checkedCurrentHeapSize.hasOverflowed() && checkedCurrentHeapSize.unsafeGet() == currentHeapSize);
}
@@ -2585,7 +2585,7 @@
size_t oldSize = *counter;
// FIXME: Change this to use SaturatedArithmetic when available.
// https://bugs.webkit.org/show_bug.cgi?id=170411
- Checked<size_t, RecordOverflow> checkedNewSize = oldSize;
+ CheckedSize checkedNewSize = oldSize;
checkedNewSize += size;
size_t newSize = UNLIKELY(checkedNewSize.hasOverflowed()) ? std::numeric_limits<size_t>::max() : checkedNewSize.unsafeGet();
if (WTF::atomicCompareExchangeWeakRelaxed(counter, oldSize, newSize))
Modified: trunk/Source/_javascript_Core/heap/SlotVisitor.h (260053 => 260054)
--- trunk/Source/_javascript_Core/heap/SlotVisitor.h 2020-04-14 01:30:00 UTC (rev 260053)
+++ trunk/Source/_javascript_Core/heap/SlotVisitor.h 2020-04-14 01:40:46 UTC (rev 260054)
@@ -238,7 +238,7 @@
size_t m_bytesVisited;
size_t m_visitCount;
size_t m_nonCellVisitCount { 0 }; // Used for incremental draining, ignored otherwise.
- Checked<size_t, RecordOverflow> m_extraMemorySize { 0 };
+ CheckedSize m_extraMemorySize { 0 };
bool m_isInParallelMode;
bool m_ignoreNewOpaqueRoots { false }; // Useful as a debugging mode.
Modified: trunk/Source/_javascript_Core/runtime/ArgList.cpp (260053 => 260054)
--- trunk/Source/_javascript_Core/runtime/ArgList.cpp 2020-04-14 01:30:00 UTC (rev 260053)
+++ trunk/Source/_javascript_Core/runtime/ArgList.cpp 2020-04-14 01:40:46 UTC (rev 260054)
@@ -85,7 +85,7 @@
{
setNeedsOverflowCheck();
ASSERT(m_capacity < newCapacity);
- auto checkedSize = Checked<size_t, RecordOverflow>(newCapacity) * sizeof(EncodedJSValue);
+ auto checkedSize = CheckedSize(newCapacity) * sizeof(EncodedJSValue);
if (UNLIKELY(checkedSize.hasOverflowed()))
return this->overflowed();
EncodedJSValue* newBuffer = static_cast<EncodedJSValue*>(Gigacage::malloc(Gigacage::JSValue, checkedSize.unsafeGet()));
Modified: trunk/Source/WTF/ChangeLog (260053 => 260054)
--- trunk/Source/WTF/ChangeLog 2020-04-14 01:30:00 UTC (rev 260053)
+++ trunk/Source/WTF/ChangeLog 2020-04-14 01:40:46 UTC (rev 260054)
@@ -1,3 +1,17 @@
+2020-04-13 David Kilzer <[email protected]>
+
+ Replace use of Checked<size_t, RecordOverflow> with CheckedSize
+ <https://webkit.org/b/210461>
+
+ Reviewed by Mark Lam.
+
+ * wtf/FastMalloc.cpp:
+ (WTF::tryFastCalloc):
+ * wtf/Gigacage.cpp:
+ (Gigacage::tryMallocArray):
+ * wtf/glib/SocketConnection.cpp:
+ (WTF::SocketConnection::sendMessage):
+
2020-04-13 Simon Fraser <[email protected]>
Add ENABLE_CUSTOM_SCROLLBARS and define it for macOS and for non-Cocoa platforms
Modified: trunk/Source/WTF/wtf/FastMalloc.cpp (260053 => 260054)
--- trunk/Source/WTF/wtf/FastMalloc.cpp 2020-04-14 01:30:00 UTC (rev 260053)
+++ trunk/Source/WTF/wtf/FastMalloc.cpp 2020-04-14 01:40:46 UTC (rev 260054)
@@ -570,7 +570,7 @@
TryMallocReturnValue tryFastCalloc(size_t numElements, size_t elementSize)
{
FAIL_IF_EXCEEDS_LIMIT(numElements * elementSize);
- Checked<size_t, RecordOverflow> checkedSize = elementSize;
+ CheckedSize checkedSize = elementSize;
checkedSize *= numElements;
if (checkedSize.hasOverflowed())
return nullptr;
Modified: trunk/Source/WTF/wtf/Gigacage.cpp (260053 => 260054)
--- trunk/Source/WTF/wtf/Gigacage.cpp 2020-04-14 01:30:00 UTC (rev 260053)
+++ trunk/Source/WTF/wtf/Gigacage.cpp 2020-04-14 01:40:46 UTC (rev 260054)
@@ -135,7 +135,7 @@
void* tryMallocArray(Kind kind, size_t numElements, size_t elementSize)
{
- Checked<size_t, RecordOverflow> checkedSize = elementSize;
+ CheckedSize checkedSize = elementSize;
checkedSize *= numElements;
if (checkedSize.hasOverflowed())
return nullptr;
Modified: trunk/Source/WTF/wtf/glib/SocketConnection.cpp (260053 => 260054)
--- trunk/Source/WTF/wtf/glib/SocketConnection.cpp 2020-04-14 01:30:00 UTC (rev 260053)
+++ trunk/Source/WTF/wtf/glib/SocketConnection.cpp 2020-04-14 01:40:46 UTC (rev 260054)
@@ -179,7 +179,7 @@
{
GRefPtr<GVariant> adoptedParameters = parameters;
size_t parametersSize = parameters ? g_variant_get_size(parameters) : 0;
- Checked<size_t, RecordOverflow> messageNameLength = strlen(messageName);
+ CheckedSize messageNameLength = strlen(messageName);
messageNameLength++;
if (UNLIKELY(messageNameLength.hasOverflowed())) {
g_warning("Trying to send message with invalid too long name");
Modified: trunk/Source/WebCore/ChangeLog (260053 => 260054)
--- trunk/Source/WebCore/ChangeLog 2020-04-14 01:30:00 UTC (rev 260053)
+++ trunk/Source/WebCore/ChangeLog 2020-04-14 01:40:46 UTC (rev 260054)
@@ -1,3 +1,19 @@
+2020-04-13 David Kilzer <[email protected]>
+
+ Replace use of Checked<size_t, RecordOverflow> with CheckedSize
+ <https://webkit.org/b/210461>
+
+ Reviewed by Mark Lam.
+
+ * platform/audio/ios/AudioFileReaderIOS.cpp:
+ (WebCore::createAudioBufferList):
+ * platform/graphics/ImageBufferBackend.cpp:
+ (WebCore::ImageBufferBackend::calculateBackendSize):
+ * platform/graphics/win/Direct2DUtilities.cpp:
+ (WebCore::Direct2D::createDirect2DImageSurfaceWithData):
+ * platform/graphics/win/ImageBufferDirect2DBackend.cpp:
+ (WebCore::ImageBufferDirect2DBackend::copyNativeImage const):
+
2020-04-13 Simon Fraser <[email protected]>
Add ENABLE_CUSTOM_SCROLLBARS and define it for macOS and for non-Cocoa platforms
Modified: trunk/Source/WebCore/platform/audio/ios/AudioFileReaderIOS.cpp (260053 => 260054)
--- trunk/Source/WebCore/platform/audio/ios/AudioFileReaderIOS.cpp 2020-04-14 01:30:00 UTC (rev 260053)
+++ trunk/Source/WebCore/platform/audio/ios/AudioFileReaderIOS.cpp 2020-04-14 01:40:46 UTC (rev 260054)
@@ -53,7 +53,7 @@
static WARN_UNUSED_RETURN AudioBufferList* createAudioBufferList(size_t numberOfBuffers)
{
- Checked<size_t, RecordOverflow> bufferListSize = sizeof(AudioBufferList) - sizeof(AudioBuffer);
+ CheckedSize bufferListSize = sizeof(AudioBufferList) - sizeof(AudioBuffer);
bufferListSize += numberOfBuffers * sizeof(AudioBuffer);
AudioBufferList* bufferList = static_cast<AudioBufferList*>(calloc(1, bufferListSize.unsafeGet()));
Modified: trunk/Source/WebCore/platform/graphics/ImageBufferBackend.cpp (260053 => 260054)
--- trunk/Source/WebCore/platform/graphics/ImageBufferBackend.cpp 2020-04-14 01:30:00 UTC (rev 260053)
+++ trunk/Source/WebCore/platform/graphics/ImageBufferBackend.cpp 2020-04-14 01:40:46 UTC (rev 260054)
@@ -51,7 +51,7 @@
if (bytesPerRow.hasOverflowed())
return { };
- Checked<size_t, RecordOverflow> numBytes = Checked<unsigned, RecordOverflow>(backendSize.height()) * bytesPerRow;
+ CheckedSize numBytes = Checked<unsigned, RecordOverflow>(backendSize.height()) * bytesPerRow;
if (numBytes.hasOverflowed())
return { };
Modified: trunk/Source/WebCore/platform/graphics/win/Direct2DUtilities.cpp (260053 => 260054)
--- trunk/Source/WebCore/platform/graphics/win/Direct2DUtilities.cpp 2020-04-14 01:30:00 UTC (rev 260053)
+++ trunk/Source/WebCore/platform/graphics/win/Direct2DUtilities.cpp 2020-04-14 01:40:46 UTC (rev 260054)
@@ -126,7 +126,7 @@
COMPtr<IWICBitmap> createDirect2DImageSurfaceWithData(void* data, const IntSize& size, unsigned stride)
{
- Checked<size_t, RecordOverflow> numBytes = Checked<unsigned, RecordOverflow>(size.height()) * stride;
+ CheckedSize numBytes = Checked<unsigned, RecordOverflow>(size.height()) * stride;
if (numBytes.hasOverflowed())
return nullptr;
Modified: trunk/Source/WebCore/platform/graphics/win/ImageBufferDirect2DBackend.cpp (260053 => 260054)
--- trunk/Source/WebCore/platform/graphics/win/ImageBufferDirect2DBackend.cpp 2020-04-14 01:30:00 UTC (rev 260053)
+++ trunk/Source/WebCore/platform/graphics/win/ImageBufferDirect2DBackend.cpp 2020-04-14 01:40:46 UTC (rev 260054)
@@ -123,7 +123,7 @@
if (copyBehavior == CopyBackingStore && m_data.data.isEmpty())
copyBehavior = DontCopyBackingStore;
- Checked<size_t, RecordOverflow> numBytes = Checked<unsigned, RecordOverflow>(m_data.backingStoreSize.height()) * m_data.bytesPerRow;
+ CheckedSize numBytes = Checked<unsigned, RecordOverflow>(m_data.backingStoreSize.height()) * m_data.bytesPerRow;
if (numBytes.hasOverflowed())
return nullptr;
Modified: trunk/Source/WebKit/ChangeLog (260053 => 260054)
--- trunk/Source/WebKit/ChangeLog 2020-04-14 01:30:00 UTC (rev 260053)
+++ trunk/Source/WebKit/ChangeLog 2020-04-14 01:40:46 UTC (rev 260054)
@@ -1,3 +1,16 @@
+2020-04-13 David Kilzer <[email protected]>
+
+ Replace use of Checked<size_t, RecordOverflow> with CheckedSize
+ <https://webkit.org/b/210461>
+
+ Reviewed by Mark Lam.
+
+ * Platform/IPC/cocoa/MachMessage.cpp:
+ (IPC::MachMessage::messageSize):
+ * Platform/IPC/cocoa/MachMessage.h:
+ * WebProcess/Network/WebSocketChannel.cpp:
+ (WebKit::WebSocketChannel::increaseBufferedAmount):
+
2020-04-13 Per Arne Vollan <[email protected]>
[iOS] Update message filters in the WebContent sandbox
Modified: trunk/Source/WebKit/Platform/IPC/cocoa/MachMessage.cpp (260053 => 260054)
--- trunk/Source/WebKit/Platform/IPC/cocoa/MachMessage.cpp 2020-04-14 01:30:00 UTC (rev 260053)
+++ trunk/Source/WebKit/Platform/IPC/cocoa/MachMessage.cpp 2020-04-14 01:40:46 UTC (rev 260054)
@@ -51,9 +51,9 @@
::mach_msg_destroy(header());
}
-Checked<size_t, RecordOverflow> MachMessage::messageSize(size_t bodySize, size_t portDescriptorCount, size_t memoryDescriptorCount)
+CheckedSize MachMessage::messageSize(size_t bodySize, size_t portDescriptorCount, size_t memoryDescriptorCount)
{
- Checked<size_t, RecordOverflow> messageSize = sizeof(mach_msg_header_t);
+ CheckedSize messageSize = sizeof(mach_msg_header_t);
messageSize += bodySize;
if (portDescriptorCount || memoryDescriptorCount) {
Modified: trunk/Source/WebKit/Platform/IPC/cocoa/MachMessage.h (260053 => 260054)
--- trunk/Source/WebKit/Platform/IPC/cocoa/MachMessage.h 2020-04-14 01:30:00 UTC (rev 260053)
+++ trunk/Source/WebKit/Platform/IPC/cocoa/MachMessage.h 2020-04-14 01:40:46 UTC (rev 260054)
@@ -40,7 +40,7 @@
static std::unique_ptr<MachMessage> create(CString&& messageReceiverName, CString&& messageName, size_t);
~MachMessage();
- static Checked<size_t, RecordOverflow> messageSize(size_t bodySize, size_t portDescriptorCount, size_t memoryDescriptorCount);
+ static CheckedSize messageSize(size_t bodySize, size_t portDescriptorCount, size_t memoryDescriptorCount);
size_t size() const { return m_size; }
mach_msg_header_t* header() { return m_messageHeader; }
Modified: trunk/Source/WebKit/WebProcess/Network/WebSocketChannel.cpp (260053 => 260054)
--- trunk/Source/WebKit/WebProcess/Network/WebSocketChannel.cpp 2020-04-14 01:30:00 UTC (rev 260053)
+++ trunk/Source/WebKit/WebProcess/Network/WebSocketChannel.cpp 2020-04-14 01:40:46 UTC (rev 260054)
@@ -124,7 +124,7 @@
if (!byteLength)
return true;
- Checked<size_t, RecordOverflow> checkedNewBufferedAmount = m_bufferedAmount;
+ CheckedSize checkedNewBufferedAmount = m_bufferedAmount;
checkedNewBufferedAmount += byteLength;
if (UNLIKELY(checkedNewBufferedAmount.hasOverflowed())) {
fail("Failed to send WebSocket frame: buffer has no more space");
