Changeset 215319 in webkit

Timestamp:

Apr 13, 2017, 8:28:15 AM (8 years ago)

Author:

achristensen@apple.com

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):

Location:

trunk

Files:

• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/loader/archive/mhtml/MHTMLParser.cpp (modified) (1 diff)
• Source/WebCore/platform/SharedBuffer.cpp (modified) (2 diffs)
• Source/WebCore/platform/SharedBuffer.h (modified) (3 diffs)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/Tests/WebCore/SharedBuffer.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-04-12  Alex Christensen  <achristensen@webkit.org>
+
+        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  <mitz@apple.com>
 

trunk/Source/WebCore/loader/archive/mhtml/MHTMLParser.cpp

@@ -155 +155 @@
             return nullptr;
         }
-        content->append(part);
+        content->append(WTFMove(part));
         m_lineReader.setSeparator("\r\n");
         Vector<char> nextChars;

trunk/Source/WebCore/platform/SharedBuffer.cpp

@@ -232 +232 @@
 }
 
-void SharedBuffer::append(const Vector<char>& data)
+void SharedBuffer::append(Vector<char>&& data)
 {
     append(data.data(), data.size());
@@ -415 +415 @@
 
     return nullptr;
-}
-
-inline unsigned SharedBuffer::platformDataSize() const
-{
-    ASSERT_NOT_REACHED();
-    
-    return 0;
 }
 

trunk/Source/WebCore/platform/SharedBuffer.h

@@ -70 +70 @@
 #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
 
@@ -89 +89 @@
     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;
@@ -167 +160 @@
 #endif
 
+    unsigned platformDataSize() const;
+    const char* platformData() const;
+
 #if USE(CF)
     explicit SharedBuffer(CFDataRef);
     RetainPtr<CFDataRef> m_cfData;
+    CFDataRef existingCFData();
 #endif
 

trunk/Tools/ChangeLog

@@ +1 @@
+2017-04-12  Alex Christensen  <achristensen@webkit.org>
+
+        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  <mitz@apple.com>
 

trunk/Tools/TestWebKitAPI/Tests/WebCore/SharedBuffer.cpp

@@ -109 +109 @@
 
     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());