Fix release build with -DLOG_DISABLED=0
authorcturner@igalia.com <cturner@igalia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 27 Oct 2018 10:01:04 +0000 (10:01 +0000)
committercturner@igalia.com <cturner@igalia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 27 Oct 2018 10:01:04 +0000 (10:01 +0000)
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:

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

Source/WebCore/ChangeLog
Source/WebCore/platform/graphics/Font.cpp
Source/WebCore/platform/graphics/Font.h
Source/WebCore/platform/graphics/FontPlatformData.h
Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm
Source/WebCore/platform/graphics/freetype/FontPlatformDataFreeType.cpp
Source/WebCore/platform/graphics/win/FontPlatformDataWin.cpp

index 6486b02..402adeb 100644 (file)
@@ -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-10-26  Commit Queue  <commit-queue@webkit.org>
 
         Unreviewed, rolling out r237458.
index 1d99065..0eacd19 100644 (file)
@@ -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)
index 9890bee..23a62d1 100644 (file)
@@ -185,7 +185,7 @@ public:
     bool isInterstitial() const { return m_isInterstitial; }
     Visibility visibility() const { return m_visibility; }
 
-#ifndef NDEBUG
+#if !LOG_DISABLED
     String description() const;
 #endif
 
index 2750102..d5ab7c5 100644 (file)
@@ -203,7 +203,7 @@ public:
     RefPtr<SharedBuffer> openTypeTable(uint32_t table) const;
 #endif
 
-#ifndef NDEBUG
+#if !LOG_DISABLED
     String description() const;
 #endif
 
index cc2582b..c5e2740 100644 (file)
@@ -196,7 +196,7 @@ RefPtr<SharedBuffer> FontPlatformData::openTypeTable(uint32_t table) const
     return nullptr;
 }
 
-#ifndef NDEBUG
+#if !LOG_DISABLED
 String FontPlatformData::description() const
 {
     auto fontDescription = adoptCF(CFCopyDescription(font()));
index 1cfc5f2..f77d6a4 100644 (file)
@@ -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();
index 8a981fb..26c0421 100644 (file)
@@ -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();