Title: [215299] trunk
- Revision
- 215299
- Author
- [email protected]
- Date
- 2017-04-12 15:26:38 -0700 (Wed, 12 Apr 2017)
Log 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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (215298 => 215299)
--- trunk/Source/WebCore/ChangeLog 2017-04-12 22:23:12 UTC (rev 215298)
+++ trunk/Source/WebCore/ChangeLog 2017-04-12 22:26:38 UTC (rev 215299)
@@ -1,3 +1,16 @@
+2017-04-12 Alex Christensen <[email protected]>
+
+ 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 <[email protected]>
Tweak WebCore::setMetadataURL function
Modified: trunk/Source/WebCore/platform/SharedBuffer.h (215298 => 215299)
--- trunk/Source/WebCore/platform/SharedBuffer.h 2017-04-12 22:23:12 UTC (rev 215298)
+++ trunk/Source/WebCore/platform/SharedBuffer.h 2017-04-12 22:26:38 UTC (rev 215299)
@@ -100,7 +100,6 @@
unsigned platformDataSize() const;
#if USE(NETWORK_CFDATA_ARRAY_CALLBACK)
- WEBCORE_EXPORT static Ref<SharedBuffer> wrapCFDataArray(CFArrayRef);
WEBCORE_EXPORT void append(CFDataRef);
#endif
@@ -159,7 +158,6 @@
mutable Ref<DataBuffer> m_buffer;
#if USE(NETWORK_CFDATA_ARRAY_CALLBACK)
- explicit SharedBuffer(CFArrayRef);
mutable Vector<RetainPtr<CFDataRef>> m_dataArray;
unsigned copySomeDataFromDataArray(const char*& someData, unsigned position) const;
const char *singleDataArrayBuffer() const;
Modified: trunk/Source/WebCore/platform/cf/SharedBufferCF.cpp (215298 => 215299)
--- trunk/Source/WebCore/platform/cf/SharedBufferCF.cpp 2017-04-12 22:23:12 UTC (rev 215298)
+++ trunk/Source/WebCore/platform/cf/SharedBufferCF.cpp 2017-04-12 22:26:38 UTC (rev 215299)
@@ -118,20 +118,6 @@
}
#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)
{
ASSERT(data);
Modified: trunk/Tools/ChangeLog (215298 => 215299)
--- trunk/Tools/ChangeLog 2017-04-12 22:23:12 UTC (rev 215298)
+++ trunk/Tools/ChangeLog 2017-04-12 22:26:38 UTC (rev 215299)
@@ -1,3 +1,13 @@
+2017-04-12 Alex Christensen <[email protected]>
+
+ 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 <[email protected]>
[WTF] Introduce Thread class and use RefPtr<Thread> and align Windows Threading implementation semantics to Pthread one
Modified: trunk/Tools/TestWebKitAPI/Tests/WebCore/cocoa/SharedBuffer.mm (215298 => 215299)
--- trunk/Tools/TestWebKitAPI/Tests/WebCore/cocoa/SharedBuffer.mm 2017-04-12 22:23:12 UTC (rev 215298)
+++ trunk/Tools/TestWebKitAPI/Tests/WebCore/cocoa/SharedBuffer.mm 2017-04-12 22:26:38 UTC (rev 215299)
@@ -62,14 +62,6 @@
expectDataArraysEqual(@[ helloData ], SharedBuffer::wrapNSData(helloData)->createNSDataArray().get());
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());
}
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes