Merged r237487 - Fix release build with -DLOG_DISABLED=0

https://bugs.webkit.org/show_bug.cgi?id=190866 Reviewed by Xabier Rodriguez-Calvar. No new tests since no functionality changed. * platform/graphics/Font.cpp: * platform/graphics/Font.h: * platform/graphics/FontPlatformData.h: * platform/graphics/cocoa/FontPlatformDataCocoa.mm: * platform/graphics/freetype/FontPlatformDataFreeType.cpp: * platform/graphics/win/FontPlatformDataWin.cpp:
WebKit · Nov 17, 2018 · 4350c03 · 4350c03
1 parent cd6b344
commit 4350c03
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 6 deletions.
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
@@ -1,3 +1,19 @@
+2018-10-27  Charlie Turner  <cturner@igalia.com>
+
+        Fix release build with -DLOG_DISABLED=0
+        https://bugs.webkit.org/show_bug.cgi?id=190866
+
+        Reviewed by Xabier Rodriguez-Calvar.
+
+        No new tests since no functionality changed.
+
+        * platform/graphics/Font.cpp:
+        * platform/graphics/Font.h:
+        * platform/graphics/FontPlatformData.h:
+        * platform/graphics/cocoa/FontPlatformDataCocoa.mm:
+        * platform/graphics/freetype/FontPlatformDataFreeType.cpp:
+        * platform/graphics/win/FontPlatformDataWin.cpp:
+
 2018-11-16  Jer Noble  <jer.noble@apple.com>
 
         An early return from updateSchedulingInfo can leave some variables uninitialized.

diff --git a/Source/WebCore/platform/graphics/Font.cpp b/Source/WebCore/platform/graphics/Font.cpp
@@ -454,7 +454,7 @@ const Font& Font::brokenIdeographFont() const
     return *derivedFontData.brokenIdeographFont;
 }
 
-#ifndef NDEBUG
+#if !LOG_DISABLED
 String Font::description() const
 {
     if (origin() == Origin::Remote)

diff --git a/Source/WebCore/platform/graphics/Font.h b/Source/WebCore/platform/graphics/Font.h
@@ -185,7 +185,7 @@ class Font : public RefCounted<Font> {
     bool isInterstitial() const { return m_isInterstitial; }
     Visibility visibility() const { return m_visibility; }
 
-#ifndef NDEBUG
+#if !LOG_DISABLED
     String description() const;
 #endif
 

diff --git a/Source/WebCore/platform/graphics/FontPlatformData.h b/Source/WebCore/platform/graphics/FontPlatformData.h
@@ -199,7 +199,7 @@ class FontPlatformData {
     RefPtr<SharedBuffer> openTypeTable(uint32_t table) const;
 #endif
 
-#ifndef NDEBUG
+#if !LOG_DISABLED
     String description() const;
 #endif
 

diff --git a/Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm b/Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm
@@ -196,7 +196,7 @@ static CFDictionaryRef cascadeToLastResortAttributesDictionary()
     return nullptr;
 }
 
-#ifndef NDEBUG
+#if !LOG_DISABLED
 String FontPlatformData::description() const
 {
     auto fontDescription = adoptCF(CFCopyDescription(font()));

diff --git a/Source/WebCore/platform/graphics/freetype/FontPlatformDataFreeType.cpp b/Source/WebCore/platform/graphics/freetype/FontPlatformDataFreeType.cpp
@@ -265,7 +265,7 @@ bool FontPlatformData::platformIsEqual(const FontPlatformData& other) const
     return m_scaledFont == other.m_scaledFont;
 }
 
-#ifndef NDEBUG
+#if !LOG_DISABLED
 String FontPlatformData::description() const
 {
     return String();

diff --git a/Source/WebCore/platform/graphics/win/FontPlatformDataWin.cpp b/Source/WebCore/platform/graphics/win/FontPlatformDataWin.cpp
@@ -88,7 +88,7 @@ RefPtr<SharedBuffer> FontPlatformData::openTypeTable(uint32_t table) const
     return buffer;
 }
 
-#ifndef NDEBUG
+#if !LOG_DISABLED
 String FontPlatformData::description() const
 {
     return String();