Diff
Modified: trunk/Source/WTF/ChangeLog (286814 => 286815)
--- trunk/Source/WTF/ChangeLog 2021-12-10 00:21:17 UTC (rev 286814)
+++ trunk/Source/WTF/ChangeLog 2021-12-10 00:23:53 UTC (rev 286815)
@@ -1,3 +1,14 @@
+2021-12-09 Alex Christensen <[email protected]>
+
+ Use Span for IPC::ArrayReference and DataReference
+ https://bugs.webkit.org/show_bug.cgi?id=233931
+
+ Reviewed by Wenson Hsieh.
+
+ * wtf/Vector.h:
+ (WTF::Vector::Vector):
+ (WTF::Vector::span const):
+
2021-12-09 Robert Jenner <[email protected]>
Unreviewed, reverting r286754.
Modified: trunk/Source/WTF/wtf/Vector.h (286814 => 286815)
--- trunk/Source/WTF/wtf/Vector.h 2021-12-10 00:21:17 UTC (rev 286814)
+++ trunk/Source/WTF/wtf/Vector.h 2021-12-10 00:23:53 UTC (rev 286815)
@@ -654,6 +654,9 @@
TypeOperations::uninitializedCopy(data, data + dataSize, begin());
}
+ Vector(Span<const T> span)
+ : Vector(span.data(), span.size()) { }
+
Vector(std::initializer_list<T> initializerList)
{
reserveInitialCapacity(initializerList.size());
@@ -707,6 +710,7 @@
static ptrdiff_t sizeMemoryOffset() { return OBJECT_OFFSETOF(Vector, m_size); }
size_t capacity() const { return Base::capacity(); }
bool isEmpty() const { return !size(); }
+ Span<const T> span() const { return { data(), size() }; }
T& at(size_t i)
{
Modified: trunk/Source/WebKit/ChangeLog (286814 => 286815)
--- trunk/Source/WebKit/ChangeLog 2021-12-10 00:21:17 UTC (rev 286814)
+++ trunk/Source/WebKit/ChangeLog 2021-12-10 00:23:53 UTC (rev 286815)
@@ -1,3 +1,59 @@
+2021-12-09 Alex Christensen <[email protected]>
+
+ Use Span for IPC::ArrayReference and DataReference
+ https://bugs.webkit.org/show_bug.cgi?id=233931
+
+ Reviewed by Wenson Hsieh.
+
+ No change in behavior, just simplifying some code.
+
+ * Platform/IPC/ArgumentCoders.h:
+ * Platform/IPC/ArrayReference.h:
+ (): Deleted.
+ (IPC::ArrayReference::ArrayReference): Deleted.
+ (IPC::ArrayReference::isEmpty const): Deleted.
+ (IPC::ArrayReference::size const): Deleted.
+ (IPC::ArrayReference::data const): Deleted.
+ (IPC::ArrayReference::vector const): Deleted.
+ * Platform/IPC/DataReference.h:
+ * Platform/IPC/SharedBufferDataReference.cpp:
+ (IPC::SharedBufferDataReference::encode const):
+ * Shared/API/APIData.cpp:
+ (API::Data::create):
+ * Shared/Cocoa/SandboxExtensionCocoa.mm:
+ (WebKit::SandboxExtension::Handle::decode):
+ * Shared/UserData.cpp:
+ (WebKit::UserData::decode):
+ * Shared/cf/ArgumentCodersCF.cpp:
+ (IPC::ArgumentCoder<RetainPtr<CFURLRef>>::decode):
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView createPDFWithConfiguration:completionHandler:]):
+ * UIProcess/Downloads/DownloadProxy.cpp:
+ (WebKit::createData):
+ * UIProcess/ProvisionalPageProxy.cpp:
+ (WebKit::ProvisionalPageProxy::registerWebProcessAccessibilityToken):
+ * UIProcess/UserContent/WebUserContentControllerProxy.cpp:
+ (WebKit::WebUserContentControllerProxy::didPostMessage):
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::loadData):
+ (WebKit::WebPageProxy::loadSimulatedRequest):
+ (WebKit::WebPageProxy::runJavaScriptInFrameInScriptWorld):
+ (WebKit::WebPageProxy::wrapCryptoKey):
+ (WebKit::WebPageProxy::unwrapCryptoKey):
+ * UIProcess/ios/WKContentView.mm:
+ (-[WKContentView _wk_pageCountForPrintFormatter:]):
+ * UIProcess/mac/WebPageProxyMac.mm:
+ (WebKit::WebPageProxy::savePDFToTemporaryFolderAndOpenWithNativeApplication):
+ * WebProcess/GPU/graphics/RemoteGraphicsContextGLProxyFunctionsGenerated.cpp:
+ (WebKit::RemoteGraphicsContextGLProxy::getShaderPrecisionFormat):
+ * WebProcess/Network/WebSocketChannel.cpp:
+ (WebKit::WebSocketChannel::didReceiveBinaryData):
+ * WebProcess/Network/webrtc/RTCDataChannelRemoteManager.cpp:
+ (WebKit::RTCDataChannelRemoteManager::receiveData):
+ * WebProcess/UserContent/WebUserContentController.cpp:
+ * WebProcess/WebPage/mac/WebPageMac.mm:
+ (WebKit::WebPage::replaceSelectionWithPasteboardData):
+
2021-12-09 Robert Jenner <[email protected]>
Unreviewed, reverting r286754.
Modified: trunk/Source/WebKit/Platform/IPC/ArgumentCoders.h (286814 => 286815)
--- trunk/Source/WebKit/Platform/IPC/ArgumentCoders.h 2021-12-10 00:21:17 UTC (rev 286814)
+++ trunk/Source/WebKit/Platform/IPC/ArgumentCoders.h 2021-12-10 00:23:53 UTC (rev 286815)
@@ -57,46 +57,28 @@
}
};
-template<typename T, size_t Extent> struct ArgumentCoder<ArrayReference<T, Extent>> {
- using ArrayReferenceType = ArrayReference<T, Extent>;
+template<typename T, size_t Extent> struct ArgumentCoder<Span<T, Extent>> {
template<typename Encoder>
- static void encode(Encoder& encoder, const ArrayReferenceType& arrayReference)
+ static void encode(Encoder& encoder, const Span<T, Extent>& span)
{
- if (!Extent)
- return;
- encoder.encodeFixedLengthData(reinterpret_cast<const uint8_t*>(arrayReference.data()), arrayReference.size() * sizeof(T), alignof(T));
+ if constexpr (Extent == WTF::dynamic_extent)
+ encoder << static_cast<uint64_t>(span.size());
+ encoder.encodeFixedLengthData(reinterpret_cast<const uint8_t*>(span.data()), span.size() * sizeof(T), alignof(T));
}
template<typename Decoder>
- static std::optional<ArrayReferenceType> decode(Decoder& decoder)
+ static std::optional<Span<T, Extent>> decode(Decoder& decoder)
{
- if (!Extent)
- return ArrayReferenceType();
- const uint8_t* data = "" * sizeof(T), alignof(T));
- if (!data)
- return std::nullopt;
- return ArrayReferenceType(reinterpret_cast<const T*>(data), Extent);
- }
-};
-
-template<typename T> struct ArgumentCoder<ArrayReference<T, arrayReferenceDynamicExtent>> {
- using ArrayReferenceType = ArrayReference<T, arrayReferenceDynamicExtent>;
- template<typename Encoder>
- static void encode(Encoder& encoder, const ArrayReferenceType& arrayReference)
- {
- encoder << static_cast<uint64_t>(arrayReference.size());
- if (!arrayReference.size())
- return;
- encoder.encodeFixedLengthData(reinterpret_cast<const uint8_t*>(arrayReference.data()), arrayReference.size() * sizeof(T), alignof(T));
- }
- template<typename Decoder>
- static std::optional<ArrayReferenceType> decode(Decoder& decoder)
- {
std::optional<uint64_t> size;
- decoder >> size;
- if (!size)
- return std::nullopt;
- if (!*size)
- return ArrayReferenceType();
+ if constexpr (Extent == WTF::dynamic_extent) {
+ decoder >> size;
+ if (!size)
+ return std::nullopt;
+ if (!*size)
+ return Span<T, Extent>();
+ } else {
+ size = Extent;
+ static_assert(Extent, "Can't decode a fixed size of 0");
+ }
auto dataSize = CheckedSize { *size } * sizeof(T);
if (UNLIKELY(dataSize.hasOverflowed()))
@@ -105,7 +87,7 @@
const uint8_t* data = "" alignof(T));
if (!data)
return std::nullopt;
- return ArrayReferenceType(reinterpret_cast<const T*>(data), static_cast<size_t>(*size));
+ return Span<T, Extent>(reinterpret_cast<const T*>(data), static_cast<size_t>(*size));
}
};
Modified: trunk/Source/WebKit/Platform/IPC/ArrayReference.h (286814 => 286815)
--- trunk/Source/WebKit/Platform/IPC/ArrayReference.h 2021-12-10 00:21:17 UTC (rev 286814)
+++ trunk/Source/WebKit/Platform/IPC/ArrayReference.h 2021-12-10 00:23:53 UTC (rev 286815)
@@ -26,95 +26,11 @@
#pragma once
#include <limits>
+#include <wtf/Span.h>
#include <wtf/Vector.h>
namespace IPC {
-inline constexpr size_t arrayReferenceDynamicExtent = std::numeric_limits<size_t>::max();
+template <typename T, size_t Extent = WTF::dynamic_extent> using ArrayReference = Span<const T, Extent>;
-template <typename T, size_t Extent = arrayReferenceDynamicExtent>
-class ArrayReference;
-
-template <typename T>
-class ArrayReference<T, arrayReferenceDynamicExtent> {
-public:
- ArrayReference() = default;
-
- ArrayReference(const T* data, size_t size)
- : m_data(data)
- , m_size(size)
- {
- }
-
- template <size_t inlineCapacity>
- ArrayReference(const Vector<T, inlineCapacity>& vector)
- : m_data(vector.data())
- , m_size(vector.size())
- {
- }
-
- bool isEmpty() const { return !m_size; }
-
- size_t size() const { return m_size; }
- const T* data() const
- {
- if (isEmpty())
- return nullptr;
- return m_data;
- }
-
- Vector<T> vector() const
- {
- Vector<T> result;
- result.append(m_data, m_size);
-
- return result;
- }
-
-private:
- const T* m_data { nullptr };
- size_t m_size { 0 };
-};
-
-template <typename T, size_t Extent>
-class ArrayReference {
-public:
- ArrayReference() = default;
-
- ArrayReference(const T* data, size_t size)
- : m_data(data)
- {
- ASSERT_UNUSED(size, size == Extent);
- }
-
- template <size_t inlineCapacity>
- ArrayReference(const Vector<T, inlineCapacity>& vector)
- : m_data(vector.data())
- {
- ASSERT(vector.size() == Extent);
- }
-
- constexpr bool isEmpty() const { return !Extent; }
-
- constexpr size_t size() const { return Extent; }
-
- const T* data() const
- {
- if (isEmpty())
- return nullptr;
- return m_data;
- }
-
- Vector<T> vector() const
- {
- return { m_data, Extent };
- }
-
-private:
- const T* m_data { nullptr };
-};
-
-template<typename T, size_t inlineCapacity>
-ArrayReference(const WTF::Vector<T, inlineCapacity>&) -> ArrayReference<T>;
-
} // namespace IPC
Modified: trunk/Source/WebKit/Platform/IPC/DataReference.h (286814 => 286815)
--- trunk/Source/WebKit/Platform/IPC/DataReference.h 2021-12-10 00:21:17 UTC (rev 286814)
+++ trunk/Source/WebKit/Platform/IPC/DataReference.h 2021-12-10 00:23:53 UTC (rev 286815)
@@ -29,6 +29,6 @@
namespace IPC {
-using DataReference = ArrayReference<uint8_t, arrayReferenceDynamicExtent>;
+using DataReference = Span<const uint8_t>;
} // namespace IPC
Modified: trunk/Source/WebKit/Platform/IPC/SharedBufferDataReference.cpp (286814 => 286815)
--- trunk/Source/WebKit/Platform/IPC/SharedBufferDataReference.cpp 2021-12-10 00:21:17 UTC (rev 286814)
+++ trunk/Source/WebKit/Platform/IPC/SharedBufferDataReference.cpp 2021-12-10 00:23:53 UTC (rev 286815)
@@ -33,7 +33,7 @@
void SharedBufferDataReference::encode(Encoder& encoder) const
{
- if (m_data.isEmpty()) {
+ if (m_data.empty()) {
SharedBufferCopy::encode(encoder);
return;
}
Modified: trunk/Source/WebKit/Shared/API/APIData.cpp (286814 => 286815)
--- trunk/Source/WebKit/Shared/API/APIData.cpp 2021-12-10 00:21:17 UTC (rev 286814)
+++ trunk/Source/WebKit/Shared/API/APIData.cpp 2021-12-10 00:23:53 UTC (rev 286815)
@@ -35,7 +35,7 @@
RefPtr<Data> Data::create(const IPC::DataReference& data)
{
- if (data.isEmpty())
+ if (data.empty())
return nullptr;
return create(data.data(), data.size());
}
Modified: trunk/Source/WebKit/Shared/Cocoa/SandboxExtensionCocoa.mm (286814 => 286815)
--- trunk/Source/WebKit/Shared/Cocoa/SandboxExtensionCocoa.mm 2021-12-10 00:21:17 UTC (rev 286814)
+++ trunk/Source/WebKit/Shared/Cocoa/SandboxExtensionCocoa.mm 2021-12-10 00:23:53 UTC (rev 286815)
@@ -167,7 +167,7 @@
if (!decoder.decode(dataReference))
return std::nullopt;
- if (dataReference.isEmpty())
+ if (dataReference.empty())
return {{ }};
Handle handle;
Modified: trunk/Source/WebKit/Shared/UserData.cpp (286814 => 286815)
--- trunk/Source/WebKit/Shared/UserData.cpp 2021-12-10 00:21:17 UTC (rev 286814)
+++ trunk/Source/WebKit/Shared/UserData.cpp 2021-12-10 00:23:53 UTC (rev 286815)
@@ -440,7 +440,7 @@
if (!decoder.decode(dataReference))
return false;
- result = API::SerializedScriptValue::adopt(dataReference.vector());
+ result = API::SerializedScriptValue::adopt({ dataReference });
break;
}
Modified: trunk/Source/WebKit/Shared/cf/ArgumentCodersCF.cpp (286814 => 286815)
--- trunk/Source/WebKit/Shared/cf/ArgumentCodersCF.cpp 2021-12-10 00:21:17 UTC (rev 286814)
+++ trunk/Source/WebKit/Shared/cf/ArgumentCodersCF.cpp 2021-12-10 00:23:53 UTC (rev 286815)
@@ -672,7 +672,7 @@
#if USE(FOUNDATION)
// FIXME: Move this to ArgumentCodersCFMac.mm and change this file back to be C++
// instead of Objective-C++.
- if (urlBytes->isEmpty()) {
+ if (urlBytes->empty()) {
// CFURL can't hold an empty URL, unlike NSURL.
// FIXME: This discards base URL, which seems incorrect.
return {{ (__bridge CFURLRef)[NSURL URLWithString:@""] }};
@@ -685,7 +685,7 @@
return WTFMove(result);
}
-enum class CGColorSpaceEncodingScheme { Name, PropertyList };
+enum class CGColorSpaceEncodingScheme : bool { Name, PropertyList };
template<typename Encoder>
void ArgumentCoder<CGColorSpaceRef>::encode(Encoder& encoder, CGColorSpaceRef colorSpace)
@@ -900,12 +900,4 @@
>;
};
-template<> struct EnumTraits<IPC::CGColorSpaceEncodingScheme> {
- using values = EnumValues<
- IPC::CGColorSpaceEncodingScheme,
- IPC::CGColorSpaceEncodingScheme::Name,
- IPC::CGColorSpaceEncodingScheme::PropertyList
- >;
-};
-
} // namespace WTF
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm (286814 => 286815)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm 2021-12-10 00:21:17 UTC (rev 286814)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm 2021-12-10 00:23:53 UTC (rev 286815)
@@ -1640,7 +1640,7 @@
floatRect = WebCore::FloatRect(pdfConfiguration.rect);
_page->drawToPDF(frameID, floatRect, [handler = makeBlockPtr(completionHandler)](const IPC::DataReference& pdfData) {
- if (pdfData.isEmpty()) {
+ if (pdfData.empty()) {
handler(nil, createNSError(WKErrorUnknown).get());
return;
}
Modified: trunk/Source/WebKit/UIProcess/Downloads/DownloadProxy.cpp (286814 => 286815)
--- trunk/Source/WebKit/UIProcess/Downloads/DownloadProxy.cpp 2021-12-10 00:21:17 UTC (rev 286814)
+++ trunk/Source/WebKit/UIProcess/Downloads/DownloadProxy.cpp 2021-12-10 00:23:53 UTC (rev 286815)
@@ -67,7 +67,7 @@
static RefPtr<API::Data> createData(const IPC::DataReference& data)
{
- if (data.isEmpty())
+ if (data.empty())
return nullptr;
return API::Data::create(data.data(), data.size());
}
Modified: trunk/Source/WebKit/UIProcess/ProvisionalPageProxy.cpp (286814 => 286815)
--- trunk/Source/WebKit/UIProcess/ProvisionalPageProxy.cpp 2021-12-10 00:21:17 UTC (rev 286814)
+++ trunk/Source/WebKit/UIProcess/ProvisionalPageProxy.cpp 2021-12-10 00:23:53 UTC (rev 286815)
@@ -439,7 +439,7 @@
#if PLATFORM(COCOA)
void ProvisionalPageProxy::registerWebProcessAccessibilityToken(const IPC::DataReference& data)
{
- m_accessibilityToken = data.vector();
+ m_accessibilityToken = Vector(data);
}
#endif
Modified: trunk/Source/WebKit/UIProcess/UserContent/WebUserContentControllerProxy.cpp (286814 => 286815)
--- trunk/Source/WebKit/UIProcess/UserContent/WebUserContentControllerProxy.cpp 2021-12-10 00:21:17 UTC (rev 286814)
+++ trunk/Source/WebKit/UIProcess/UserContent/WebUserContentControllerProxy.cpp 2021-12-10 00:23:53 UTC (rev 286815)
@@ -343,12 +343,12 @@
return;
if (!handler->client().supportsAsyncReply()) {
- handler->client().didPostMessage(*page, WTFMove(frameInfoData), handler->world(), WebCore::SerializedScriptValue::adopt(dataReference.vector()));
+ handler->client().didPostMessage(*page, WTFMove(frameInfoData), handler->world(), WebCore::SerializedScriptValue::adopt({ dataReference }));
reply({ }, { });
return;
}
- handler->client().didPostMessageWithAsyncReply(*page, WTFMove(frameInfoData), handler->world(), WebCore::SerializedScriptValue::adopt(dataReference.vector()), [reply = WTFMove(reply)](API::SerializedScriptValue* value, const String& errorMessage) mutable {
+ handler->client().didPostMessageWithAsyncReply(*page, WTFMove(frameInfoData), handler->world(), WebCore::SerializedScriptValue::adopt({ dataReference }), [reply = WTFMove(reply)](API::SerializedScriptValue* value, const String& errorMessage) mutable {
if (errorMessage.isNull()) {
ASSERT(value);
reply({ value->internalRepresentation().toWireBytes() }, { });
Modified: trunk/Source/WebKit/UIProcess/WebPageProxy.cpp (286814 => 286815)
--- trunk/Source/WebKit/UIProcess/WebPageProxy.cpp 2021-12-10 00:21:17 UTC (rev 286814)
+++ trunk/Source/WebKit/UIProcess/WebPageProxy.cpp 2021-12-10 00:23:53 UTC (rev 286815)
@@ -1522,7 +1522,7 @@
if (!hasRunningProcess())
launchProcess({ }, ProcessLaunchReason::InitialProcess);
- auto navigation = m_navigationState->createLoadDataNavigation(makeUnique<API::SubstituteData>(data.vector(), MIMEType, encoding, baseURL, userData));
+ auto navigation = m_navigationState->createLoadDataNavigation(makeUnique<API::SubstituteData>(Vector(data), MIMEType, encoding, baseURL, userData));
if (shouldForceForegroundPriorityForClientNavigation())
navigation->setClientNavigationActivity(process().throttler().foregroundActivity("Client navigation"_s));
@@ -1583,7 +1583,7 @@
if (!hasRunningProcess())
launchProcess(RegistrableDomain { simulatedRequest.url() }, ProcessLaunchReason::InitialProcess);
- auto navigation = m_navigationState->createSimulatedLoadWithDataNavigation(ResourceRequest(simulatedRequest), makeUnique<API::SubstituteData>(data.vector(), ResourceResponse(simulatedResponse), WebCore::SubstituteData::SessionHistoryVisibility::Visible), m_backForwardList->currentItem());
+ auto navigation = m_navigationState->createSimulatedLoadWithDataNavigation(ResourceRequest(simulatedRequest), makeUnique<API::SubstituteData>(Vector(data), ResourceResponse(simulatedResponse), WebCore::SubstituteData::SessionHistoryVisibility::Visible), m_backForwardList->currentItem());
if (shouldForceForegroundPriorityForClientNavigation())
navigation->setClientNavigationActivity(process().throttler().foregroundActivity("Client navigation"_s));
@@ -4339,7 +4339,7 @@
sendWithAsyncReply(Messages::WebPage::RunJavaScriptInFrameInScriptWorld(parameters, frameID, world.worldData()), [activity = WTFMove(activity), callbackFunction = WTFMove(callbackFunction)] (const IPC::DataReference& dataReference, std::optional<ExceptionDetails>&& details) mutable {
if (details)
return callbackFunction(makeUnexpected(WTFMove(*details)));
- if (dataReference.isEmpty())
+ if (dataReference.empty())
return callbackFunction({ nullptr });
Vector<uint8_t> data;
data.reserveInitialCapacity(dataReference.size());
@@ -9250,7 +9250,7 @@
Vector<uint8_t> masterKey;
if (auto keyData = m_navigationClient->webCryptoMasterKey(*this))
- masterKey = keyData->dataReference().vector();
+ masterKey = Vector(keyData->dataReference());
Vector<uint8_t> wrappedKey;
bool succeeded = wrapSerializedCryptoKey(masterKey, key, wrappedKey);
@@ -9264,7 +9264,7 @@
Vector<uint8_t> masterKey;
if (auto keyData = m_navigationClient->webCryptoMasterKey(*this))
- masterKey = keyData->dataReference().vector();
+ masterKey = Vector(keyData->dataReference());
Vector<uint8_t> key;
bool succeeded = unwrapSerializedCryptoKey(masterKey, wrappedKey, key);
Modified: trunk/Source/WebKit/UIProcess/ios/WKContentView.mm (286814 => 286815)
--- trunk/Source/WebKit/UIProcess/ios/WKContentView.mm 2021-12-10 00:21:17 UTC (rev 286814)
+++ trunk/Source/WebKit/UIProcess/ios/WKContentView.mm 2021-12-10 00:23:53 UTC (rev 286815)
@@ -899,7 +899,7 @@
auto retainedSelf = retainPtr(self);
auto pair = _page->computePagesForPrintingAndDrawToPDF(frameID, printInfo, [retainedSelf](const IPC::DataReference& pdfData) {
retainedSelf->_pdfPrintCallbackID = 0;
- if (pdfData.isEmpty())
+ if (pdfData.empty())
return;
auto data = "" pdfData.data(), pdfData.size()));
Modified: trunk/Source/WebKit/UIProcess/mac/WebPageProxyMac.mm (286814 => 286815)
--- trunk/Source/WebKit/UIProcess/mac/WebPageProxyMac.mm 2021-12-10 00:21:17 UTC (rev 286814)
+++ trunk/Source/WebKit/UIProcess/mac/WebPageProxyMac.mm 2021-12-10 00:23:53 UTC (rev 286815)
@@ -460,7 +460,7 @@
void WebPageProxy::savePDFToTemporaryFolderAndOpenWithNativeApplication(const String& suggestedFilename, FrameInfoData&& frameInfo, const IPC::DataReference& data, const String& pdfUUID)
{
- if (data.isEmpty()) {
+ if (data.empty()) {
WTFLogAlways("Cannot save empty PDF file to the temporary directory.");
return;
}
Modified: trunk/Source/WebKit/WebProcess/GPU/graphics/RemoteGraphicsContextGLProxyFunctionsGenerated.cpp (286814 => 286815)
--- trunk/Source/WebKit/WebProcess/GPU/graphics/RemoteGraphicsContextGLProxyFunctionsGenerated.cpp 2021-12-10 00:21:17 UTC (rev 286814)
+++ trunk/Source/WebKit/WebProcess/GPU/graphics/RemoteGraphicsContextGLProxyFunctionsGenerated.cpp 2021-12-10 00:23:53 UTC (rev 286815)
@@ -686,7 +686,7 @@
void RemoteGraphicsContextGLProxy::getShaderPrecisionFormat(GCGLenum shaderType, GCGLenum precisionType, GCGLSpan<GCGLint, 2> range, GCGLint* precision)
{
- IPC::ArrayReference<int32_t, 2> rangeReply;
+ IPC::ArrayReference<int32_t, 2> rangeReply { { } };
int32_t precisionReply = { };
if (!isContextLost()) {
auto sendResult = sendSync(Messages::RemoteGraphicsContextGL::GetShaderPrecisionFormat(shaderType, precisionType), Messages::RemoteGraphicsContextGL::GetShaderPrecisionFormat::Reply(rangeReply, precisionReply));
Modified: trunk/Source/WebKit/WebProcess/Network/WebSocketChannel.cpp (286814 => 286815)
--- trunk/Source/WebKit/WebProcess/Network/WebSocketChannel.cpp 2021-12-10 00:21:17 UTC (rev 286814)
+++ trunk/Source/WebKit/WebProcess/Network/WebSocketChannel.cpp 2021-12-10 00:23:53 UTC (rev 286815)
@@ -294,7 +294,7 @@
m_inspector.didReceiveWebSocketFrame(m_document.get(), createWebSocketFrameForWebInspector(data.data(), data.size(), WebSocketFrame::OpCode::OpCodeBinary));
- m_client->didReceiveBinaryData(data.vector());
+ m_client->didReceiveBinaryData({ data });
}
void WebSocketChannel::didClose(unsigned short code, String&& reason)
Modified: trunk/Source/WebKit/WebProcess/Network/webrtc/RTCDataChannelRemoteManager.cpp (286814 => 286815)
--- trunk/Source/WebKit/WebProcess/Network/webrtc/RTCDataChannelRemoteManager.cpp 2021-12-10 00:21:17 UTC (rev 286814)
+++ trunk/Source/WebKit/WebProcess/Network/webrtc/RTCDataChannelRemoteManager.cpp 2021-12-10 00:23:53 UTC (rev 286815)
@@ -146,7 +146,7 @@
Vector<uint8_t> buffer;
String text;
if (isRaw)
- buffer = data.vector();
+ buffer = Vector(data);
else
text = String::fromUTF8(data.data(), data.size());
Modified: trunk/Source/WebKit/WebProcess/UserContent/WebUserContentController.cpp (286814 => 286815)
--- trunk/Source/WebKit/WebProcess/UserContent/WebUserContentController.cpp 2021-12-10 00:21:17 UTC (rev 286814)
+++ trunk/Source/WebKit/WebProcess/UserContent/WebUserContentController.cpp 2021-12-10 00:23:53 UTC (rev 286815)
@@ -274,7 +274,7 @@
return;
}
- auto value = SerializedScriptValue::createFromWireBytes(resultValue.vector());
+ auto value = SerializedScriptValue::createFromWireBytes({ resultValue });
completionHandler(value.ptr(), { });
};
Modified: trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp (286814 => 286815)
--- trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp 2021-12-10 00:21:17 UTC (rev 286814)
+++ trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp 2021-12-10 00:23:53 UTC (rev 286815)
@@ -4794,7 +4794,7 @@
RELEASE_ASSERT(!sandbox_check(getpid(), "mach-lookup", static_cast<enum sandbox_filter_type>(SANDBOX_FILTER_GLOBAL_NAME | SANDBOX_CHECK_NO_REPORT), "com.apple.iconservices"));
RefPtr<Icon> icon;
- if (!iconData.isEmpty()) {
+ if (!iconData.empty()) {
RetainPtr<CFDataRef> dataRef = adoptCF(CFDataCreate(nullptr, iconData.data(), iconData.size()));
RetainPtr<CGDataProviderRef> imageProviderRef = adoptCF(CGDataProviderCreateWithCFData(dataRef.get()));
RetainPtr<CGImageRef> imageRef = adoptCF(CGImageCreateWithJPEGDataProvider(imageProviderRef.get(), nullptr, true, kCGRenderingIntentDefault));
Modified: trunk/Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm (286814 => 286815)
--- trunk/Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm 2021-12-10 00:21:17 UTC (rev 286814)
+++ trunk/Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm 2021-12-10 00:23:53 UTC (rev 286815)
@@ -509,7 +509,7 @@
void WebPage::replaceSelectionWithPasteboardData(const Vector<String>& types, const IPC::DataReference& data)
{
for (auto& type : types)
- WebPasteboardOverrides::sharedPasteboardOverrides().addOverride(replaceSelectionPasteboardName(), type, data.vector());
+ WebPasteboardOverrides::sharedPasteboardOverrides().addOverride(replaceSelectionPasteboardName(), type, { data });
readSelectionFromPasteboard(replaceSelectionPasteboardName(), [](bool) { });
