Title: [215319] trunk
- Revision
- 215319
- Author
- [email protected]
- Date
- 2017-04-13 08:28:15 -0700 (Thu, 13 Apr 2017)
Log Message
Clean up SharedBuffer public functions
https://bugs.webkit.org/show_bug.cgi?id=170795
Reviewed by Andreas Kling.
Source/WebCore:
Make some member functions that are now only used internally private.
* platform/SharedBuffer.cpp:
(WebCore::SharedBuffer::append):
(WebCore::SharedBuffer::platformDataSize): Deleted.
* platform/SharedBuffer.h:
Tools:
* TestWebKitAPI/Tests/WebCore/SharedBuffer.cpp:
(TestWebKitAPI::TEST_F):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (215318 => 215319)
--- trunk/Source/WebCore/ChangeLog 2017-04-13 14:17:00 UTC (rev 215318)
+++ trunk/Source/WebCore/ChangeLog 2017-04-13 15:28:15 UTC (rev 215319)
@@ -1,3 +1,17 @@
+2017-04-12 Alex Christensen <[email protected]>
+
+ Clean up SharedBuffer public functions
+ https://bugs.webkit.org/show_bug.cgi?id=170795
+
+ Reviewed by Andreas Kling.
+
+ Make some member functions that are now only used internally private.
+
+ * platform/SharedBuffer.cpp:
+ (WebCore::SharedBuffer::append):
+ (WebCore::SharedBuffer::platformDataSize): Deleted.
+ * platform/SharedBuffer.h:
+
2017-04-12 Dan Bernstein <[email protected]>
[Mac] Future-proof .xcconfig files
Modified: trunk/Source/WebCore/loader/archive/mhtml/MHTMLParser.cpp (215318 => 215319)
--- trunk/Source/WebCore/loader/archive/mhtml/MHTMLParser.cpp 2017-04-13 14:17:00 UTC (rev 215318)
+++ trunk/Source/WebCore/loader/archive/mhtml/MHTMLParser.cpp 2017-04-13 15:28:15 UTC (rev 215319)
@@ -154,7 +154,7 @@
LOG_ERROR("Binary contents requires end of part");
return nullptr;
}
- content->append(part);
+ content->append(WTFMove(part));
m_lineReader.setSeparator("\r\n");
Vector<char> nextChars;
if (m_lineReader.peek(nextChars, 2) != 2) {
Modified: trunk/Source/WebCore/platform/SharedBuffer.cpp (215318 => 215319)
--- trunk/Source/WebCore/platform/SharedBuffer.cpp 2017-04-13 14:17:00 UTC (rev 215318)
+++ trunk/Source/WebCore/platform/SharedBuffer.cpp 2017-04-13 15:28:15 UTC (rev 215319)
@@ -231,7 +231,7 @@
#endif
}
-void SharedBuffer::append(const Vector<char>& data)
+void SharedBuffer::append(Vector<char>&& data)
{
append(data.data(), data.size());
}
@@ -416,13 +416,6 @@
return nullptr;
}
-inline unsigned SharedBuffer::platformDataSize() const
-{
- ASSERT_NOT_REACHED();
-
- return 0;
-}
-
inline bool SharedBuffer::maybeAppendPlatformData(SharedBuffer&)
{
return false;
Modified: trunk/Source/WebCore/platform/SharedBuffer.h (215318 => 215319)
--- trunk/Source/WebCore/platform/SharedBuffer.h 2017-04-13 14:17:00 UTC (rev 215318)
+++ trunk/Source/WebCore/platform/SharedBuffer.h 2017-04-13 15:28:15 UTC (rev 215319)
@@ -69,8 +69,8 @@
#endif
#if USE(CF)
WEBCORE_EXPORT RetainPtr<CFDataRef> createCFData();
- WEBCORE_EXPORT CFDataRef existingCFData();
WEBCORE_EXPORT static Ref<SharedBuffer> wrapCFData(CFDataRef);
+ WEBCORE_EXPORT void append(CFDataRef);
#endif
#if USE(SOUP)
@@ -88,21 +88,14 @@
WEBCORE_EXPORT unsigned size() const;
-
bool isEmpty() const { return !size(); }
WEBCORE_EXPORT void append(SharedBuffer&);
WEBCORE_EXPORT void append(const char*, unsigned);
- WEBCORE_EXPORT void append(const Vector<char>&);
+ WEBCORE_EXPORT void append(Vector<char>&&);
WEBCORE_EXPORT void clear();
- const char* platformData() const;
- unsigned platformDataSize() const;
-#if USE(NETWORK_CFDATA_ARRAY_CALLBACK)
- WEBCORE_EXPORT void append(CFDataRef);
-#endif
-
WEBCORE_EXPORT Ref<SharedBuffer> copy() const;
// Return the number of consecutive bytes after "position". "data"
@@ -166,9 +159,13 @@
mutable Vector<char*> m_segments;
#endif
+ unsigned platformDataSize() const;
+ const char* platformData() const;
+
#if USE(CF)
explicit SharedBuffer(CFDataRef);
RetainPtr<CFDataRef> m_cfData;
+ CFDataRef existingCFData();
#endif
#if USE(SOUP)
Modified: trunk/Tools/ChangeLog (215318 => 215319)
--- trunk/Tools/ChangeLog 2017-04-13 14:17:00 UTC (rev 215318)
+++ trunk/Tools/ChangeLog 2017-04-13 15:28:15 UTC (rev 215319)
@@ -1,3 +1,13 @@
+2017-04-12 Alex Christensen <[email protected]>
+
+ Clean up SharedBuffer public functions
+ https://bugs.webkit.org/show_bug.cgi?id=170795
+
+ Reviewed by Andreas Kling.
+
+ * TestWebKitAPI/Tests/WebCore/SharedBuffer.cpp:
+ (TestWebKitAPI::TEST_F):
+
2017-04-12 Dan Bernstein <[email protected]>
[Mac] Future-proof .xcconfig files
Modified: trunk/Tools/TestWebKitAPI/Tests/WebCore/SharedBuffer.cpp (215318 => 215319)
--- trunk/Tools/TestWebKitAPI/Tests/WebCore/SharedBuffer.cpp 2017-04-13 14:17:00 UTC (rev 215318)
+++ trunk/Tools/TestWebKitAPI/Tests/WebCore/SharedBuffer.cpp 2017-04-13 15:28:15 UTC (rev 215319)
@@ -108,8 +108,8 @@
Vector<char> vector2(0x4000, 'c');
RefPtr<SharedBuffer> sharedBuffer = SharedBuffer::create(WTFMove(vector0));
- sharedBuffer->append(vector1);
- sharedBuffer->append(vector2);
+ sharedBuffer->append(WTFMove(vector1));
+ sharedBuffer->append(WTFMove(vector2));
RefPtr<ArrayBuffer> arrayBuffer = sharedBuffer->createArrayBuffer();
ASSERT_EQ(0x4000U + 0x4000U + 0x4000U, arrayBuffer->byteLength());
int position = 0;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
