Title: [215350] trunk/Source/WebCore
Revision
215350
Author
achristen...@apple.com
Date
2017-04-13 16:54:04 -0700 (Thu, 13 Apr 2017)

Log Message

Remove unused SharedBuffer constructor
https://bugs.webkit.org/show_bug.cgi?id=170828

Reviewed by Brady Eidson.

* platform/SharedBuffer.cpp:
(WebCore::SharedBuffer::append):
* platform/SharedBuffer.h:
(WebCore::SharedBuffer::create):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (215349 => 215350)


--- trunk/Source/WebCore/ChangeLog	2017-04-13 23:51:41 UTC (rev 215349)
+++ trunk/Source/WebCore/ChangeLog	2017-04-13 23:54:04 UTC (rev 215350)
@@ -1,3 +1,15 @@
+2017-04-13  Alex Christensen  <achristen...@webkit.org>
+
+        Remove unused SharedBuffer constructor
+        https://bugs.webkit.org/show_bug.cgi?id=170828
+
+        Reviewed by Brady Eidson.
+
+        * platform/SharedBuffer.cpp:
+        (WebCore::SharedBuffer::append):
+        * platform/SharedBuffer.h:
+        (WebCore::SharedBuffer::create):
+
 2017-04-13  Antti Koivisto  <an...@apple.com>
 
         Don't invalidate composition for style changes in non-composited layers

Modified: trunk/Source/WebCore/platform/SharedBuffer.cpp (215349 => 215350)


--- trunk/Source/WebCore/platform/SharedBuffer.cpp	2017-04-13 23:51:41 UTC (rev 215349)
+++ trunk/Source/WebCore/platform/SharedBuffer.cpp	2017-04-13 23:54:04 UTC (rev 215350)
@@ -66,12 +66,6 @@
 {
 }
 
-SharedBuffer::SharedBuffer(unsigned size)
-    : m_size(size)
-    , m_buffer(adoptRef(*new DataBuffer))
-{
-}
-
 SharedBuffer::SharedBuffer(const char* data, unsigned size)
     : m_buffer(adoptRef(*new DataBuffer))
 {
@@ -233,6 +227,7 @@
 
 void SharedBuffer::append(Vector<char>&& data)
 {
+    // This copies data unnecessarily right now. We should just use the Vector instead of always copying it.
     append(data.data(), data.size());
 }
 

Modified: trunk/Source/WebCore/platform/SharedBuffer.h (215349 => 215350)


--- trunk/Source/WebCore/platform/SharedBuffer.h	2017-04-13 23:51:41 UTC (rev 215349)
+++ trunk/Source/WebCore/platform/SharedBuffer.h	2017-04-13 23:54:04 UTC (rev 215350)
@@ -52,7 +52,6 @@
 class SharedBuffer : public RefCounted<SharedBuffer> {
 public:
     static Ref<SharedBuffer> create() { return adoptRef(*new SharedBuffer); }
-    static Ref<SharedBuffer> create(unsigned size) { return adoptRef(*new SharedBuffer(size)); }
     static Ref<SharedBuffer> create(const char* c, unsigned i) { return adoptRef(*new SharedBuffer(c, i)); }
     static Ref<SharedBuffer> create(const unsigned char* data, unsigned size) { return adoptRef(*new SharedBuffer(data, size)); }
 
@@ -123,7 +122,6 @@
 
 private:
     WEBCORE_EXPORT SharedBuffer();
-    explicit SharedBuffer(unsigned);
     WEBCORE_EXPORT SharedBuffer(const char*, unsigned);
     WEBCORE_EXPORT SharedBuffer(const unsigned char*, unsigned);
     explicit SharedBuffer(MappedFileData&&);

Modified: trunk/Source/WebCore/platform/graphics/freetype/FontPlatformDataFreeType.cpp (215349 => 215350)


--- trunk/Source/WebCore/platform/graphics/freetype/FontPlatformDataFreeType.cpp	2017-04-13 23:51:41 UTC (rev 215349)
+++ trunk/Source/WebCore/platform/graphics/freetype/FontPlatformDataFreeType.cpp	2017-04-13 23:54:04 UTC (rev 215350)
@@ -362,16 +362,13 @@
     if (FT_Load_Sfnt_Table(freeTypeFace, tag, 0, 0, &tableSize))
         return nullptr;
 
-    RefPtr<SharedBuffer> buffer = SharedBuffer::create(tableSize);
-    if (buffer->size() != tableSize)
-        return nullptr;
-
+    Vector<char> data(tableSize);
     FT_ULong expectedTableSize = tableSize;
-    FT_Error error = FT_Load_Sfnt_Table(freeTypeFace, tag, 0, reinterpret_cast<FT_Byte*>(const_cast<char*>(buffer->data())), &tableSize);
+    FT_Error error = FT_Load_Sfnt_Table(freeTypeFace, tag, 0, reinterpret_cast<FT_Byte*>(data.data()), &tableSize);
     if (error || tableSize != expectedTableSize)
         return nullptr;
 
-    return buffer;
+    return SharedBuffer::create(WTFMove(data));
 }
 
 } // namespace WebCore
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to