Simplify members of CoreIPCData

https://bugs.webkit.org/show_bug.cgi?id=264782 rdar://118364914 Reviewed by David Kilzer. * Source/WebKit/Shared/Cocoa/CoreIPCData.h: (WebKit::CoreIPCData::CoreIPCData): (WebKit::CoreIPCData::data const): (WebKit::CoreIPCData::dataReference const): (WebKit::CoreIPCData::toID const): (WebKit::CoreIPCData::createData const): Deleted. (WebKit::CoreIPCData::get const): Deleted. * Source/WebKit/Shared/Cocoa/CoreIPCData.serialization.in: * Source/WebKit/Shared/cf/CFTypes.serialization.in: Canonical link: https://commits.webkit.org/270721@main
WebKit · Nov 14, 2023 · 47a57e4 · 47a57e4
1 parent e1fa6b5
commit 47a57e4
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 10 deletions.
diff --git a/Source/WebKit/Shared/Cocoa/CoreIPCData.h b/Source/WebKit/Shared/Cocoa/CoreIPCData.h
@@ -47,33 +47,31 @@ class CoreIPCData {
 
     CoreIPCData(CFDataRef cfData)
         : m_cfData(cfData)
-        , m_reference(CFDataGetBytePtr(cfData), CFDataGetLength(cfData))
     {
     }
 
     CoreIPCData(const IPC::DataReference& data)
-        : m_reference(data)
+        : m_cfData(adoptCF(CFDataCreate(kCFAllocatorDefault, data.data(), data.size())))
     {
     }
 
-    RetainPtr<CFDataRef> createData() const
+    RetainPtr<CFDataRef> data() const
     {
-        return adoptCF(CFDataCreate(0, m_reference.data(), m_reference.size()));
+        return m_cfData;
     }
 
-    IPC::DataReference get() const
+    IPC::DataReference dataReference() const
     {
-        return m_reference;
+        return { CFDataGetBytePtr(m_cfData.get()), static_cast<size_t>(CFDataGetLength(m_cfData.get())) };
     }
 
     RetainPtr<id> toID() const
     {
-        return bridge_cast(createData().get());
+        return bridge_cast(data());
     }
 
 private:
     RetainPtr<CFDataRef> m_cfData;
-    IPC::DataReference m_reference;
 };
 
 }

diff --git a/Source/WebKit/Shared/Cocoa/CoreIPCData.serialization.in b/Source/WebKit/Shared/Cocoa/CoreIPCData.serialization.in
@@ -25,7 +25,7 @@
 webkit_platform_headers: "CoreIPCData.h"
 
 [WebKitPlatform, AdditionalEncoder=StreamConnectionEncoder] class WebKit::CoreIPCData {
-    IPC::DataReference get();
+    IPC::DataReference dataReference();
 }
 
 #endif // USE(CF)
diff --git a/Source/WebKit/Shared/cf/CFTypes.serialization.in b/Source/WebKit/Shared/cf/CFTypes.serialization.in
@@ -22,7 +22,7 @@
 
 #if USE(CF)
 
-[WebKitPlatform, AdditionalEncoder=StreamConnectionEncoder, ToCFMethod=result->createData()] CFDataRef wrapped by WebKit::CoreIPCData {
+[WebKitPlatform, AdditionalEncoder=StreamConnectionEncoder, ToCFMethod=result->data()] CFDataRef wrapped by WebKit::CoreIPCData {
 }
 
 [WebKitPlatform, CustomHeader, AdditionalEncoder=StreamConnectionEncoder, ToCFMethod=result->createCFString()] CFStringRef wrapped by WTF::String {