Title: [248152] trunk/Source/WebCore
Revision
248152
Author
[email protected]
Date
2019-08-02 03:20:48 -0700 (Fri, 02 Aug 2019)

Log Message

Remove constructors and operators of FontPlatformData defined only for Freetype
https://bugs.webkit.org/show_bug.cgi?id=200379

Reviewed by Carlos Garcia Campos.

These methods only make maintenance harder, as all data fields are
trivially copyable. Constructors generated by compiler should be used
instead.

* platform/graphics/FontPlatformData.h:
* platform/graphics/freetype/FontPlatformDataFreeType.cpp:

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (248151 => 248152)


--- trunk/Source/WebCore/ChangeLog	2019-08-02 08:58:35 UTC (rev 248151)
+++ trunk/Source/WebCore/ChangeLog	2019-08-02 10:20:48 UTC (rev 248152)
@@ -1,5 +1,19 @@
 2019-08-02  Konstantin Tokarev  <[email protected]>
 
+        Remove constructors and operators of FontPlatformData defined only for Freetype
+        https://bugs.webkit.org/show_bug.cgi?id=200379
+
+        Reviewed by Carlos Garcia Campos.
+
+        These methods only make maintenance harder, as all data fields are
+        trivially copyable. Constructors generated by compiler should be used
+        instead.
+
+        * platform/graphics/FontPlatformData.h:
+        * platform/graphics/freetype/FontPlatformDataFreeType.cpp:
+
+2019-08-02  Konstantin Tokarev  <[email protected]>
+
         Remove unused constructor declaration from FontPlatformData
         https://bugs.webkit.org/show_bug.cgi?id=200371
 

Modified: trunk/Source/WebCore/platform/graphics/FontPlatformData.h (248151 => 248152)


--- trunk/Source/WebCore/platform/graphics/FontPlatformData.h	2019-08-02 08:58:35 UTC (rev 248151)
+++ trunk/Source/WebCore/platform/graphics/FontPlatformData.h	2019-08-02 10:20:48 UTC (rev 248152)
@@ -112,11 +112,6 @@
 
 #if USE(FREETYPE)
     FontPlatformData(cairo_font_face_t*, FcPattern*, float size, bool fixedWidth, bool syntheticBold, bool syntheticOblique, FontOrientation);
-    FontPlatformData(const FontPlatformData&);
-    FontPlatformData(FontPlatformData&&) = default;
-    FontPlatformData& operator=(const FontPlatformData&);
-    FontPlatformData& operator=(FontPlatformData&&) = default;
-    ~FontPlatformData();
 #endif
 
 #if PLATFORM(WIN)

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


--- trunk/Source/WebCore/platform/graphics/freetype/FontPlatformDataFreeType.cpp	2019-08-02 08:58:35 UTC (rev 248151)
+++ trunk/Source/WebCore/platform/graphics/freetype/FontPlatformDataFreeType.cpp	2019-08-02 10:20:48 UTC (rev 248152)
@@ -126,38 +126,6 @@
 #endif
 }
 
-FontPlatformData::FontPlatformData(const FontPlatformData& other)
-{
-    *this = other;
-}
-
-FontPlatformData& FontPlatformData::operator=(const FontPlatformData& other)
-{
-    // Check for self-assignment.
-    if (this == &other)
-        return *this;
-
-    m_size = other.m_size;
-    m_orientation = other.m_orientation;
-    m_widthVariant = other.m_widthVariant;
-    m_textRenderingMode = other.m_textRenderingMode;
-
-    m_syntheticBold = other.m_syntheticBold;
-    m_syntheticOblique = other.m_syntheticOblique;
-    m_isColorBitmapFont = other.m_isColorBitmapFont;
-    m_isHashTableDeletedValue = other.m_isHashTableDeletedValue;
-    m_isSystemFont = other.m_isSystemFont;
-
-    m_fixedWidth = other.m_fixedWidth;
-    m_pattern = other.m_pattern;
-
-    m_scaledFont = other.m_scaledFont;
-
-    return *this;
-}
-
-FontPlatformData::~FontPlatformData() = default;
-
 FontPlatformData FontPlatformData::cloneWithOrientation(const FontPlatformData& source, FontOrientation orientation)
 {
     FontPlatformData copy(source);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to