Changeset 179006 in webkit

Timestamp:

Jan 23, 2015 2:33:33 AM (9 years ago)

Author:

commit-queue@webkit.org

Message:

Initialization for some member variable of FontPlatformData
​https://bugs.webkit.org/show_bug.cgi?id=136327

Patch by Byeongha Cho <​byeongha.cho@samsung.com> on 2015-01-23
Reviewed by Myles C. Maxfield.

No new tests. There's no functional change.

• platform/graphics/freetype/FontPlatformDataFreeType.cpp:

(WebCore::FontPlatformData::FontPlatformData):
(WebCore::FontPlatformData::operator=):
(WebCore::FontPlatformData::~FontPlatformData):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/freetype/FontPlatformDataFreeType.cpp (modified) (7 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-01-23  Byeongha Cho  <byeongha.cho@samsung.com>
+
+        Initialization for some member variable of FontPlatformData
+        https://bugs.webkit.org/show_bug.cgi?id=136327
+
+        Reviewed by Myles C. Maxfield.
+
+        No new tests. There's no functional change.
+
+        * platform/graphics/freetype/FontPlatformDataFreeType.cpp:
+        (WebCore::FontPlatformData::FontPlatformData):
+        (WebCore::FontPlatformData::operator=):
+        (WebCore::FontPlatformData::~FontPlatformData):
+
 2015-01-23  Grzegorz Czajkowski  <g.czajkowski@samsung.com>
 

trunk/Source/WebCore/platform/graphics/freetype/FontPlatformDataFreeType.cpp

@@ -128 +128 @@
 FontPlatformData::FontPlatformData(FcPattern* pattern, const FontDescription& fontDescription)
     : m_pattern(pattern)
-    , m_fallbacks(0)
+    , m_fallbacks(nullptr)
     , m_size(fontDescription.computedPixelSize())
     , m_syntheticBold(false)
     , m_syntheticOblique(false)
     , m_fixedWidth(false)
-    , m_scaledFont(0)
+    , m_scaledFont(nullptr)
     , m_orientation(fontDescription.orientation())
 {
@@ -157 +157 @@
 
 FontPlatformData::FontPlatformData(float size, bool bold, bool italic)
-    : m_fallbacks(0)
+    : m_fallbacks(nullptr)
     , m_size(size)
     , m_syntheticBold(bold)
     , m_syntheticOblique(italic)
     , m_fixedWidth(false)
-    , m_scaledFont(0)
+    , m_scaledFont(nullptr)
     , m_orientation(Horizontal)
 {
@@ -169 +169 @@
 
 FontPlatformData::FontPlatformData(cairo_font_face_t* fontFace, float size, bool bold, bool italic, FontOrientation orientation)
-    : m_fallbacks(0)
+    : m_fallbacks(nullptr)
     , m_size(size)
     , m_syntheticBold(bold)
     , m_syntheticOblique(italic)
     , m_fixedWidth(false)
-    , m_scaledFont(0)
+    , m_scaledFont(nullptr)
     , m_orientation(orientation)
 {
@@ -203 +203 @@
         FcFontSetDestroy(m_fallbacks);
         // This will be re-created on demand.
-        m_fallbacks = 0;
+        m_fallbacks = nullptr;
     }
 
@@ -216 +216 @@
 
 FontPlatformData::FontPlatformData(const FontPlatformData& other)
-    : m_fallbacks(0)
-    , m_scaledFont(0)
+    : m_fallbacks(nullptr)
+    , m_scaledFont(nullptr)
     , m_harfBuzzFace(other.m_harfBuzzFace)
 {
@@ -224 +224 @@
 
 FontPlatformData::FontPlatformData(const FontPlatformData& other, float size)
-    : m_harfBuzzFace(other.m_harfBuzzFace)
+    : m_fallbacks(nullptr)
+    , m_scaledFont(nullptr)
+    , m_harfBuzzFace(other.m_harfBuzzFace)
 {
     *this = other;
@@ -238 +240 @@
     if (m_fallbacks) {
         FcFontSetDestroy(m_fallbacks);
-        m_fallbacks = 0;
+        m_fallbacks = nullptr;
     }