[Win] m_isCompositeFontReference is uninitialized.

https://bugs.webkit.org/show_bug.cgi?id=124170

Reviewed by Tim Horton.

Initialize value to false, as is done in the other constructors for this data type.

* platform/graphics/win/FontPlatformDataCGWin.cpp:
(WebCore::FontPlatformData::FontPlatformData):
* platform/graphics/win/FontPlatformDataCairoWin.cpp:
(WebCore::FontPlatformData::FontPlatformData):
* platform/graphics/win/FontPlatformDataWin.cpp:
(WebCore::FontPlatformData::FontPlatformData):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@159081 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index adffb48b108c716623eb353edb60fccc870332fa..9272442586a6d7a91f3f76669fa5bad865750719 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,19 @@
+2013-11-11  Brent Fulgham  <bfulgham@apple.com>
+
+        [Win] m_isCompositeFontReference is uninitialized.
+        https://bugs.webkit.org/show_bug.cgi?id=124170
+
+        Reviewed by Tim Horton.
+
+        Initialize value to false, as is done in the other constructors for this data type.
+
+        * platform/graphics/win/FontPlatformDataCGWin.cpp:
+        (WebCore::FontPlatformData::FontPlatformData): 
+        * platform/graphics/win/FontPlatformDataCairoWin.cpp:
+        (WebCore::FontPlatformData::FontPlatformData):
+        * platform/graphics/win/FontPlatformDataWin.cpp:
+        (WebCore::FontPlatformData::FontPlatformData):
+
 2013-11-11  Myles C. Maxfield  <mmaxfield@apple.com>
 
         [Mac] Characters too close together in complex Arabic text

diff --git a/Source/WebCore/platform/graphics/win/FontPlatformDataCGWin.cpp b/Source/WebCore/platform/graphics/win/FontPlatformDataCGWin.cpp
index 3c0622ed4c87faee77d28dcc7e5c907f824444e3..286be083be6e6d7a0283fa666eb56c943ae5bc73 100644 (file)
--- a/Source/WebCore/platform/graphics/win/FontPlatformDataCGWin.cpp
+++ b/Source/WebCore/platform/graphics/win/FontPlatformDataCGWin.cpp
@@ -124,6 +124,7 @@ FontPlatformData::FontPlatformData(GDIObject<HFONT> hfont, CGFontRef font, float
     , m_font(SharedGDIObject<HFONT>::create(std::move(hfont)))
     , m_cgFont(font)
     , m_isColorBitmapFont(false)
+    , m_isCompositeFontReference(false)
     , m_useGDI(useGDI)
 {
 }

diff --git a/Source/WebCore/platform/graphics/win/FontPlatformDataCairoWin.cpp b/Source/WebCore/platform/graphics/win/FontPlatformDataCairoWin.cpp
index 7a6932c493194ff535d90eafbf527fff904e59b3..d8f817794a45db3c9f7db69444187987c31122cd 100644 (file)
--- a/Source/WebCore/platform/graphics/win/FontPlatformDataCairoWin.cpp
+++ b/Source/WebCore/platform/graphics/win/FontPlatformDataCairoWin.cpp
@@ -62,6 +62,7 @@ FontPlatformData::FontPlatformData(GDIObject<HFONT> font, cairo_font_face_t* fon
     , m_orientation(Horizontal)
     , m_widthVariant(RegularWidth)
     , m_scaledFont(0)
+    , m_isCompositeFontReference(false)
     , m_isColorBitmapFont(false)
     , m_syntheticBold(bold)
     , m_syntheticOblique(oblique)

diff --git a/Source/WebCore/platform/graphics/win/FontPlatformDataWin.cpp b/Source/WebCore/platform/graphics/win/FontPlatformDataWin.cpp
index 38394e1cec8b03850d01d0fcf6ec3a1fe3429921..8519427ca0eb941295caa9e05971142e8f347c26 100644 (file)
--- a/Source/WebCore/platform/graphics/win/FontPlatformDataWin.cpp
+++ b/Source/WebCore/platform/graphics/win/FontPlatformDataWin.cpp
@@ -48,6 +48,7 @@ FontPlatformData::FontPlatformData(GDIObject<HFONT> font, float size, bool bold,
     , m_scaledFont(0)
 #endif
     , m_isColorBitmapFont(false)
+    , m_isCompositeFontReference(false)
     , m_syntheticBold(bold)
     , m_syntheticOblique(oblique)
     , m_useGDI(useGDI)