Diff
Modified: tags/Safari-606.1.20/Source/WTF/ChangeLog (232552 => 232553)
--- tags/Safari-606.1.20/Source/WTF/ChangeLog 2018-06-06 18:27:27 UTC (rev 232552)
+++ tags/Safari-606.1.20/Source/WTF/ChangeLog 2018-06-06 20:13:12 UTC (rev 232553)
@@ -1,3 +1,7 @@
+2018-06-06 Kocsen Chung <[email protected]>
+
+ Revert r232528. rdar://problem/40858098
+
2018-06-05 Darin Adler <[email protected]>
[Cocoa] Retire DispatchPtr, and add more move semantics and simpler #ifs to other smart pointers
Modified: tags/Safari-606.1.20/Source/WTF/WTF.xcodeproj/project.pbxproj (232552 => 232553)
--- tags/Safari-606.1.20/Source/WTF/WTF.xcodeproj/project.pbxproj 2018-06-06 18:27:27 UTC (rev 232552)
+++ tags/Safari-606.1.20/Source/WTF/WTF.xcodeproj/project.pbxproj 2018-06-06 20:13:12 UTC (rev 232553)
@@ -453,6 +453,7 @@
A8A4727B151A825A004123FF /* DecimalNumber.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DecimalNumber.cpp; sourceTree = "<group>"; };
A8A4727C151A825A004123FF /* DecimalNumber.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DecimalNumber.h; sourceTree = "<group>"; };
A8A4727E151A825A004123FF /* Deque.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Deque.h; sourceTree = "<group>"; };
+ A8A4727F151A825A004123FF /* DispatchPtr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DispatchPtr.h; sourceTree = "<group>"; };
A8A47280151A825A004123FF /* DoublyLinkedList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DoublyLinkedList.h; sourceTree = "<group>"; };
A8A47282151A825A004123FF /* bignum-dtoa.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = "bignum-dtoa.cc"; sourceTree = "<group>"; };
A8A47283151A825A004123FF /* bignum-dtoa.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "bignum-dtoa.h"; sourceTree = "<group>"; };
@@ -864,6 +865,7 @@
A561F30F1DF2642100FF675D /* DeprecatedOptional.h */,
A8A4727E151A825A004123FF /* Deque.h */,
A9A4727F151A825A004123FF /* DisallowCType.h */,
+ A8A4727F151A825A004123FF /* DispatchPtr.h */,
0F4570421BE5B58F0062A629 /* Dominators.h */,
A8A47280151A825A004123FF /* DoublyLinkedList.h */,
A8A47297151A825A004123FF /* dtoa.cpp */,
@@ -1217,8 +1219,8 @@
A8A4732C151A825B004123FF /* TextPosition.h */,
A3E4DD911F3A803400DED0B4 /* TextStream.cpp */,
A3E4DD921F3A803400DED0B4 /* TextStream.h */,
+ FEF295BF20B49DCB00CF283A /* UTF8ConversionError.h */,
70ECA60C1B02426800449739 /* UniquedStringImpl.h */,
- FEF295BF20B49DCB00CF283A /* UTF8ConversionError.h */,
A3AB6E6A1F3E1AD6009C14B1 /* ValueToString.h */,
A8A4732D151A825B004123FF /* WTFString.cpp */,
A8A4732E151A825B004123FF /* WTFString.h */,
Modified: tags/Safari-606.1.20/Source/WTF/wtf/BlockPtr.h (232552 => 232553)
--- tags/Safari-606.1.20/Source/WTF/wtf/BlockPtr.h 2018-06-06 18:27:27 UTC (rev 232552)
+++ tags/Safari-606.1.20/Source/WTF/wtf/BlockPtr.h 2018-06-06 20:13:12 UTC (rev 232553)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2016-2018 Apple Inc. All rights reserved.
+ * Copyright (C) 2016 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -97,13 +97,14 @@
new (&block->f) F { std::move(function) };
-#if __has_feature(objc_arc)
- return BlockPtr { (__bridge_transfer BlockType)block };
+#if defined(__OBJC__) && __has_feature(objc_arc)
+ BlockPtr blockPtr { (__bridge_transfer BlockType)block };
#else
BlockPtr blockPtr;
blockPtr.m_block = reinterpret_cast<BlockType>(block);
+#endif
+
return blockPtr;
-#endif
}
BlockPtr()
@@ -112,8 +113,8 @@
}
BlockPtr(BlockType block)
-#if __has_feature(objc_arc)
- : m_block(WTFMove(block))
+#if defined(__OBJC__) && __has_feature(objc_arc)
+ : m_block(block)
#else
: m_block(Block_copy(block))
#endif
@@ -121,7 +122,7 @@
}
BlockPtr(const BlockPtr& other)
-#if __has_feature(objc_arc)
+#if defined(__OBJC__) && __has_feature(objc_arc)
: m_block(other.m_block)
#else
: m_block(Block_copy(other.m_block))
@@ -136,7 +137,7 @@
~BlockPtr()
{
-#if !__has_feature(objc_arc)
+#if !defined(__OBJC__) || !__has_feature(objc_arc)
Block_release(m_block);
#endif
}
@@ -143,7 +144,7 @@
BlockPtr& operator=(const BlockPtr& other)
{
-#if __has_feature(objc_arc)
+#if defined(__OBJC__) && __has_feature(objc_arc)
m_block = other.m_block;
#else
if (this != &other) {
@@ -159,7 +160,7 @@
{
ASSERT(this != &other);
-#if !__has_feature(objc_arc)
+#if !defined(__OBJC__) || !__has_feature(objc_arc)
Block_release(m_block);
#endif
m_block = std::exchange(other.m_block, nullptr);
Modified: tags/Safari-606.1.20/Source/WTF/wtf/CMakeLists.txt (232552 => 232553)
--- tags/Safari-606.1.20/Source/WTF/wtf/CMakeLists.txt 2018-06-06 18:27:27 UTC (rev 232552)
+++ tags/Safari-606.1.20/Source/WTF/wtf/CMakeLists.txt 2018-06-06 20:13:12 UTC (rev 232553)
@@ -50,6 +50,7 @@
DeprecatedOptional.h
Deque.h
DisallowCType.h
+ DispatchPtr.h
Dominators.h
DoublyLinkedList.h
DumbPtrTraits.h
Added: tags/Safari-606.1.20/Source/WTF/wtf/DispatchPtr.h (0 => 232553)
--- tags/Safari-606.1.20/Source/WTF/wtf/DispatchPtr.h (rev 0)
+++ tags/Safari-606.1.20/Source/WTF/wtf/DispatchPtr.h 2018-06-06 20:13:12 UTC (rev 232553)
@@ -0,0 +1,115 @@
+/*
+ * Copyright (C) 2015-2018 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#pragma once
+
+#include <wtf/Assertions.h>
+#include <wtf/StdLibExtras.h>
+
+namespace WTF {
+
+// FIXME: Use OSObjectPtr instead in the three places this is used and then
+// delete this. When this class template was originally created os_retain
+// did not yet work with dispatch_data_t, but it now does on versions of
+// Cocoa platforms that WebKit supports and WebKit already uses OSObjectPtr
+// for dispatch_data_t in multiple places.
+
+template<typename T> class DispatchPtr;
+template<typename T> DispatchPtr<T> adoptDispatch(T dispatchObject);
+
+template<typename T> class DispatchPtr {
+public:
+ DispatchPtr()
+ : m_ptr(nullptr)
+ {
+ }
+ explicit DispatchPtr(T ptr)
+ : m_ptr(ptr)
+ {
+#if !defined(__OBJC__) || !__has_feature(objc_arc)
+ if (m_ptr)
+ dispatch_retain(m_ptr);
+#endif
+ }
+ DispatchPtr(const DispatchPtr& other)
+ : m_ptr(other.m_ptr)
+ {
+#if !defined(__OBJC__) || !__has_feature(objc_arc)
+ if (m_ptr)
+ dispatch_retain(m_ptr);
+
+#endif
+ }
+ ~DispatchPtr()
+ {
+#if !defined(__OBJC__) || !__has_feature(objc_arc)
+ if (m_ptr)
+ dispatch_release(m_ptr);
+#endif
+ }
+
+ DispatchPtr& operator=(const DispatchPtr& other)
+ {
+ auto copy = other;
+ std::swap(m_ptr, copy.m_ptr);
+ return *this;
+ }
+
+ DispatchPtr& operator=(std::nullptr_t)
+ {
+#if defined(__OBJC__) && __has_feature(objc_arc)
+ m_ptr = nullptr;
+#else
+ auto ptr = std::exchange(m_ptr, nullptr);
+ if (LIKELY(ptr != nullptr))
+ dispatch_release(ptr);
+#endif
+ return *this;
+ }
+
+ T get() const { return m_ptr; }
+ explicit operator bool() const { return m_ptr; }
+
+ friend DispatchPtr adoptDispatch<T>(T);
+
+private:
+ struct Adopt { };
+ DispatchPtr(Adopt, T data)
+ : m_ptr(data)
+ {
+ }
+
+ T m_ptr;
+};
+
+template <typename T> DispatchPtr<T> adoptDispatch(T dispatchObject)
+{
+ return DispatchPtr<T>(typename DispatchPtr<T>::Adopt { }, dispatchObject);
+}
+
+} // namespace WTF
+
+using WTF::DispatchPtr;
+using WTF::adoptDispatch;
Modified: tags/Safari-606.1.20/Source/WTF/wtf/OSObjectPtr.h (232552 => 232553)
--- tags/Safari-606.1.20/Source/WTF/wtf/OSObjectPtr.h 2018-06-06 18:27:27 UTC (rev 232552)
+++ tags/Safari-606.1.20/Source/WTF/wtf/OSObjectPtr.h 2018-06-06 20:13:12 UTC (rev 232553)
@@ -26,16 +26,18 @@
#pragma once
#include <os/object.h>
+#include <wtf/Assertions.h>
#include <wtf/StdLibExtras.h>
namespace WTF {
-template<typename> class OSObjectPtr;
+template<typename T> class OSObjectPtr;
template<typename T> OSObjectPtr<T> adoptOSObject(T);
-template<typename T> static inline void retainOSObject(T ptr)
+template<typename T>
+static inline void retainOSObject(T ptr)
{
-#if __has_feature(objc_arc)
+#if defined(__OBJC__) && __has_feature(objc_arc)
UNUSED_PARAM(ptr);
#else
os_retain(ptr);
@@ -42,9 +44,10 @@
#endif
}
-template<typename T> static inline void releaseOSObject(T ptr)
+template<typename T>
+static inline void releaseOSObject(T ptr)
{
-#if __has_feature(objc_arc)
+#if defined(__OBJC__) && __has_feature(objc_arc)
UNUSED_PARAM(ptr);
#else
os_release(ptr);
@@ -77,13 +80,13 @@
}
OSObjectPtr(OSObjectPtr&& other)
- : m_ptr(WTFMove(other.m_ptr))
+ : m_ptr(other.m_ptr)
{
other.m_ptr = nullptr;
}
OSObjectPtr(T ptr)
- : m_ptr(WTFMove(ptr))
+ : m_ptr(ptr)
{
if (m_ptr)
retainOSObject(m_ptr);
@@ -108,12 +111,13 @@
if (m_ptr)
releaseOSObject(m_ptr);
m_ptr = nullptr;
+
return *this;
}
OSObjectPtr& operator=(T other)
{
- OSObjectPtr ptr = WTFMove(other);
+ OSObjectPtr ptr = other;
swap(ptr);
return *this;
}
@@ -133,7 +137,7 @@
private:
struct AdoptOSObject { };
OSObjectPtr(AdoptOSObject, T ptr)
- : m_ptr(WTFMove(ptr))
+ : m_ptr(ptr)
{
}
@@ -142,7 +146,7 @@
template<typename T> inline OSObjectPtr<T> adoptOSObject(T ptr)
{
- return OSObjectPtr<T> { typename OSObjectPtr<T>::AdoptOSObject { }, WTFMove(ptr) };
+ return OSObjectPtr<T>(typename OSObjectPtr<T>::AdoptOSObject { }, ptr);
}
} // namespace WTF
Modified: tags/Safari-606.1.20/Source/WebCore/ChangeLog (232552 => 232553)
--- tags/Safari-606.1.20/Source/WebCore/ChangeLog 2018-06-06 18:27:27 UTC (rev 232552)
+++ tags/Safari-606.1.20/Source/WebCore/ChangeLog 2018-06-06 20:13:12 UTC (rev 232553)
@@ -1,3 +1,7 @@
+2018-06-06 Kocsen Chung <[email protected]>
+
+ Revert r232528. rdar://problem/40858098
+
2018-06-06 Jer Noble <[email protected]>
Regions outside of the fullscreen window are exposed during zoom operations
Modified: tags/Safari-606.1.20/Source/WebCore/platform/FileMonitor.h (232552 => 232553)
--- tags/Safari-606.1.20/Source/WebCore/platform/FileMonitor.h 2018-06-06 18:27:27 UTC (rev 232552)
+++ tags/Safari-606.1.20/Source/WebCore/platform/FileMonitor.h 2018-06-06 20:13:12 UTC (rev 232553)
@@ -31,7 +31,7 @@
#if USE(COCOA_EVENT_LOOP)
#include <dispatch/dispatch.h>
-#include <wtf/OSObjectPtr.h>
+#include <wtf/DispatchPtr.h>
#endif
#if USE(GLIB)
@@ -43,7 +43,10 @@
class FileMonitor {
public:
- enum class FileChangeType { Modification, Removal };
+ enum class FileChangeType {
+ Modification,
+ Removal
+ };
WEBCORE_EXPORT FileMonitor(const String&, Ref<WorkQueue>&& handlerQueue, WTF::Function<void(FileChangeType)>&& modificationHandler);
WEBCORE_EXPORT ~FileMonitor();
@@ -50,7 +53,7 @@
private:
#if USE(COCOA_EVENT_LOOP)
- OSObjectPtr<dispatch_source_t> m_platformMonitor;
+ DispatchPtr<dispatch_source_t> m_platformMonitor;
#endif
#if USE(GLIB)
static void fileChangedCallback(GFileMonitor*, GFile*, GFile*, GFileMonitorEvent, FileMonitor*);
Modified: tags/Safari-606.1.20/Source/WebCore/platform/cocoa/FileMonitorCocoa.mm (232552 => 232553)
--- tags/Safari-606.1.20/Source/WebCore/platform/cocoa/FileMonitorCocoa.mm 2018-06-06 18:27:27 UTC (rev 232552)
+++ tags/Safari-606.1.20/Source/WebCore/platform/cocoa/FileMonitorCocoa.mm 2018-06-06 20:13:12 UTC (rev 232553)
@@ -50,7 +50,7 @@
}
// The source (platformMonitor) retains the dispatch queue.
- m_platformMonitor = adoptOSObject(dispatch_source_create(DISPATCH_SOURCE_TYPE_VNODE, handle, monitorMask, handlerQueue->dispatchQueue()));
+ m_platformMonitor = adoptDispatch(dispatch_source_create(DISPATCH_SOURCE_TYPE_VNODE, handle, monitorMask, handlerQueue->dispatchQueue()));
LOG(ResourceLoadStatistics, "Creating monitor %p", m_platformMonitor.get());
Modified: tags/Safari-606.1.20/Source/WebKit/ChangeLog (232552 => 232553)
--- tags/Safari-606.1.20/Source/WebKit/ChangeLog 2018-06-06 18:27:27 UTC (rev 232552)
+++ tags/Safari-606.1.20/Source/WebKit/ChangeLog 2018-06-06 20:13:12 UTC (rev 232553)
@@ -1,3 +1,7 @@
+2018-06-06 Kocsen Chung <[email protected]>
+
+ Revert r232528. rdar://problem/40858098
+
2018-06-05 Per Arne Vollan <[email protected]>
Move OpenGL display mask to screen data struct.
Modified: tags/Safari-606.1.20/Source/WebKit/NetworkProcess/cache/NetworkCacheData.h (232552 => 232553)
--- tags/Safari-606.1.20/Source/WebKit/NetworkProcess/cache/NetworkCacheData.h 2018-06-06 18:27:27 UTC (rev 232552)
+++ tags/Safari-606.1.20/Source/WebKit/NetworkProcess/cache/NetworkCacheData.h 2018-06-06 20:13:12 UTC (rev 232553)
@@ -23,7 +23,8 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#pragma once
+#ifndef NetworkCacheData_h
+#define NetworkCacheData_h
#include <wtf/FunctionDispatcher.h>
#include <wtf/SHA1.h>
@@ -31,7 +32,7 @@
#include <wtf/text/WTFString.h>
#if PLATFORM(COCOA)
-#include <wtf/OSObjectPtr.h>
+#include <wtf/DispatchPtr.h>
#endif
#if USE(SOUP)
@@ -56,7 +57,7 @@
#if PLATFORM(COCOA)
enum class Backing { Buffer, Map };
- Data(OSObjectPtr<dispatch_data_t>&&, Backing = Backing::Buffer);
+ Data(DispatchPtr<dispatch_data_t>, Backing = Backing::Buffer);
#endif
#if USE(SOUP)
Data(GRefPtr<SoupBuffer>&&, int fd = -1);
@@ -84,7 +85,7 @@
#endif
private:
#if PLATFORM(COCOA)
- mutable OSObjectPtr<dispatch_data_t> m_dispatchData;
+ mutable DispatchPtr<dispatch_data_t> m_dispatchData;
#endif
#if USE(SOUP)
mutable GRefPtr<SoupBuffer> m_buffer;
@@ -106,5 +107,6 @@
SHA1::Digest computeSHA1(const Data&, const Salt&);
}
+}
-}
+#endif
Modified: tags/Safari-606.1.20/Source/WebKit/NetworkProcess/cache/NetworkCacheDataCocoa.mm (232552 => 232553)
--- tags/Safari-606.1.20/Source/WebKit/NetworkProcess/cache/NetworkCacheDataCocoa.mm 2018-06-06 18:27:27 UTC (rev 232552)
+++ tags/Safari-606.1.20/Source/WebKit/NetworkProcess/cache/NetworkCacheDataCocoa.mm 2018-06-06 20:13:12 UTC (rev 232553)
@@ -35,13 +35,13 @@
namespace NetworkCache {
Data::Data(const uint8_t* data, size_t size)
- : m_dispatchData(adoptOSObject(dispatch_data_create(data, size, nullptr, DISPATCH_DATA_DESTRUCTOR_DEFAULT)))
+ : m_dispatchData(adoptDispatch(dispatch_data_create(data, size, nullptr, DISPATCH_DATA_DESTRUCTOR_DEFAULT)))
, m_size(size)
{
}
-Data::Data(OSObjectPtr<dispatch_data_t>&& dispatchData, Backing backing)
- : m_dispatchData(WTFMove(dispatchData))
+Data::Data(DispatchPtr<dispatch_data_t> dispatchData, Backing backing)
+ : m_dispatchData(dispatchData)
, m_size(m_dispatchData ? dispatch_data_get_size(m_dispatchData.get()) : 0)
, m_isMap(m_size && backing == Backing::Map)
{
@@ -49,7 +49,7 @@
Data Data::empty()
{
- return { OSObjectPtr<dispatch_data_t> { dispatch_data_empty } };
+ return { DispatchPtr<dispatch_data_t>(dispatch_data_empty) };
}
const uint8_t* Data::data() const
@@ -57,7 +57,7 @@
if (!m_data && m_dispatchData) {
const void* data;
size_t size;
- m_dispatchData = adoptOSObject(dispatch_data_create_map(m_dispatchData.get(), &data, &size));
+ m_dispatchData = adoptDispatch(dispatch_data_create_map(m_dispatchData.get(), &data, &size));
ASSERT(size == m_size);
m_data = static_cast<const uint8_t*>(data);
}
@@ -80,7 +80,7 @@
Data Data::subrange(size_t offset, size_t size) const
{
- return { adoptOSObject(dispatch_data_create_subrange(dispatchData(), offset, size)) };
+ return { adoptDispatch(dispatch_data_create_subrange(dispatchData(), offset, size)) };
}
Data concatenate(const Data& a, const Data& b)
@@ -89,18 +89,17 @@
return b;
if (b.isNull())
return a;
- return { adoptOSObject(dispatch_data_create_concat(a.dispatchData(), b.dispatchData())) };
+ return { adoptDispatch(dispatch_data_create_concat(a.dispatchData(), b.dispatchData())) };
}
Data Data::adoptMap(void* map, size_t size, int fd)
{
- ASSERT(map);
- ASSERT(map != MAP_FAILED);
+ ASSERT(map && map != MAP_FAILED);
close(fd);
- auto bodyMap = adoptOSObject(dispatch_data_create(map, size, dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), [map, size] {
+ auto bodyMap = adoptDispatch(dispatch_data_create(map, size, dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), [map, size] {
munmap(map, size);
}));
- return { WTFMove(bodyMap), Data::Backing::Map };
+ return { bodyMap, Data::Backing::Map };
}
RefPtr<SharedMemory> Data::tryCreateSharedMemory() const
Modified: tags/Safari-606.1.20/Source/WebKit/NetworkProcess/cache/NetworkCacheIOChannel.h (232552 => 232553)
--- tags/Safari-606.1.20/Source/WebKit/NetworkProcess/cache/NetworkCacheIOChannel.h 2018-06-06 18:27:27 UTC (rev 232552)
+++ tags/Safari-606.1.20/Source/WebKit/NetworkProcess/cache/NetworkCacheIOChannel.h 2018-06-06 20:13:12 UTC (rev 232553)
@@ -69,7 +69,7 @@
int m_fileDescriptor { 0 };
std::atomic<bool> m_wasDeleted { false }; // Try to narrow down a crash, https://bugs.webkit.org/show_bug.cgi?id=165659
#if PLATFORM(COCOA)
- OSObjectPtr<dispatch_io_t> m_dispatchIO;
+ DispatchPtr<dispatch_io_t> m_dispatchIO;
#endif
#if USE(SOUP)
GRefPtr<GInputStream> m_inputStream;
Modified: tags/Safari-606.1.20/Source/WebKit/NetworkProcess/cache/NetworkCacheIOChannelCocoa.mm (232552 => 232553)
--- tags/Safari-606.1.20/Source/WebKit/NetworkProcess/cache/NetworkCacheIOChannelCocoa.mm 2018-06-06 18:27:27 UTC (rev 232552)
+++ tags/Safari-606.1.20/Source/WebKit/NetworkProcess/cache/NetworkCacheIOChannelCocoa.mm 2018-06-06 20:13:12 UTC (rev 232553)
@@ -67,7 +67,7 @@
int fd = ::open(path.data(), oflag, mode);
m_fileDescriptor = fd;
- m_dispatchIO = adoptOSObject(dispatch_io_create(DISPATCH_IO_RANDOM, fd, dispatch_get_global_queue(useLowIOPriority ? DISPATCH_QUEUE_PRIORITY_BACKGROUND : DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), [fd](int) {
+ m_dispatchIO = adoptDispatch(dispatch_io_create(DISPATCH_IO_RANDOM, fd, dispatch_get_global_queue(useLowIOPriority ? DISPATCH_QUEUE_PRIORITY_BACKGROUND : DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), [fd](int) {
close(fd);
}));
ASSERT(m_dispatchIO.get());
@@ -95,7 +95,8 @@
ASSERT_UNUSED(done, done || !didCallCompletionHandler);
if (didCallCompletionHandler)
return;
- Data data { OSObjectPtr<dispatch_data_t> { fileData } };
+ DispatchPtr<dispatch_data_t> fileDataPtr(fileData);
+ Data data(fileDataPtr);
auto callback = WTFMove(completionHandler);
callback(data, error);
didCallCompletionHandler = true;
