Changeset 215299 in webkit

Timestamp:

Apr 12, 2017, 3:26:38 PM (8 years ago)

Author:

achristensen@apple.com

Message:

Remove unused SharedBuffer::wrapCFDataArray
​https://bugs.webkit.org/show_bug.cgi?id=170794

Reviewed by Brady Eidson.

Source/WebCore:

It's unused since r215280.

• platform/SharedBuffer.h:
• platform/cf/SharedBufferCF.cpp:

(WebCore::SharedBuffer::wrapCFDataArray): Deleted.

Tools:

• TestWebKitAPI/Tests/WebCore/cocoa/SharedBuffer.mm:

(TestWebKitAPI::TEST_F):

Location:

trunk

Files:

• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/SharedBuffer.h (modified) (2 diffs)
• Source/WebCore/platform/cf/SharedBufferCF.cpp (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/Tests/WebCore/cocoa/SharedBuffer.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-04-12  Alex Christensen  <achristensen@webkit.org>
+
+        Remove unused SharedBuffer::wrapCFDataArray
+        https://bugs.webkit.org/show_bug.cgi?id=170794
+
+        Reviewed by Brady Eidson.
+
+        It's unused since r215280.
+
+        * platform/SharedBuffer.h:
+        * platform/cf/SharedBufferCF.cpp:
+        (WebCore::SharedBuffer::wrapCFDataArray): Deleted.
+
 2017-04-12  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebCore/platform/SharedBuffer.h

@@ -101 +101 @@
 
 #if USE(NETWORK_CFDATA_ARRAY_CALLBACK)
-    WEBCORE_EXPORT static Ref<SharedBuffer> wrapCFDataArray(CFArrayRef);
     WEBCORE_EXPORT void append(CFDataRef);
 #endif
@@ -160 +159 @@
 
 #if USE(NETWORK_CFDATA_ARRAY_CALLBACK)
-    explicit SharedBuffer(CFArrayRef);
     mutable Vector<RetainPtr<CFDataRef>> m_dataArray;
     unsigned copySomeDataFromDataArray(const char*& someData, unsigned position) const;

trunk/Source/WebCore/platform/cf/SharedBufferCF.cpp

@@ -119 +119 @@
 
 #if USE(NETWORK_CFDATA_ARRAY_CALLBACK)
-Ref<SharedBuffer> SharedBuffer::wrapCFDataArray(CFArrayRef cfDataArray)
-{
-    return adoptRef(*new SharedBuffer(cfDataArray));
-}
-
-SharedBuffer::SharedBuffer(CFArrayRef cfDataArray)
-    : m_buffer(adoptRef(*new DataBuffer))
-    , m_cfData(nullptr)
-{
-    CFIndex dataArrayCount = CFArrayGetCount(cfDataArray);
-    for (CFIndex index = 0; index < dataArrayCount; ++index)
-        append(checked_cf_cast<CFDataRef>(CFArrayGetValueAtIndex(cfDataArray, index)));
-}
-
 void SharedBuffer::append(CFDataRef data)
 {

trunk/Tools/ChangeLog

@@ +1 @@
+2017-04-12  Alex Christensen  <achristensen@webkit.org>
+
+        Remove unused SharedBuffer::wrapCFDataArray
+        https://bugs.webkit.org/show_bug.cgi?id=170794
+
+        Reviewed by Brady Eidson.
+
+        * TestWebKitAPI/Tests/WebCore/cocoa/SharedBuffer.mm:
+        (TestWebKitAPI::TEST_F):
+
 2017-04-12  Yusuke Suzuki  <utatane.tea@gmail.com>
 

trunk/Tools/TestWebKitAPI/Tests/WebCore/cocoa/SharedBuffer.mm

@@ -63 +63 @@
         expectDataArraysEqual(@[ worldData ], SharedBuffer::wrapCFData((CFDataRef)worldData)->createNSDataArray().get());
 
-        NSArray<NSData *> *dataArray = @[ [NSData dataWithBytes:"one" length:3], [NSData dataWithBytes:"two" length:3], [NSData dataWithBytes:"three" length:5] ];
-        auto wrappedDataArray = SharedBuffer::wrapCFDataArray((CFArrayRef)dataArray);
-        expectDataArraysEqual(dataArray, wrappedDataArray->createNSDataArray().get());
-
-        NSArray<NSData *> *secondDataArray = @[ [NSData dataWithBytes:"four" length:4], [NSData dataWithBytes:"five" length:4], [NSData dataWithBytes:"six" length:3] ];
-        wrappedDataArray->append(SharedBuffer::wrapCFDataArray((CFArrayRef)secondDataArray).get());
-        expectDataArraysEqual([dataArray arrayByAddingObjectsFromArray:secondDataArray], wrappedDataArray->createNSDataArray().get());
-
         expectDataArraysEqual(@[ [NSData dataWithContentsOfFile:tempFilePath()] ], SharedBuffer::createWithContentsOfFile(tempFilePath())->createNSDataArray().get());
     }