Title: [237487] trunk/Source/WebCore
- Revision
- 237487
- Author
- [email protected]
- Date
- 2018-10-27 03:01:04 -0700 (Sat, 27 Oct 2018)
Log Message
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:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (237486 => 237487)
--- trunk/Source/WebCore/ChangeLog 2018-10-26 23:34:01 UTC (rev 237486)
+++ trunk/Source/WebCore/ChangeLog 2018-10-27 10:01:04 UTC (rev 237487)
@@ -1,3 +1,19 @@
+2018-10-27 Charlie Turner <[email protected]>
+
+ 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 <[email protected]>
Unreviewed, rolling out r237458.
Modified: trunk/Source/WebCore/platform/graphics/Font.cpp (237486 => 237487)
--- trunk/Source/WebCore/platform/graphics/Font.cpp 2018-10-26 23:34:01 UTC (rev 237486)
+++ trunk/Source/WebCore/platform/graphics/Font.cpp 2018-10-27 10:01:04 UTC (rev 237487)
@@ -454,7 +454,7 @@
return *derivedFontData.brokenIdeographFont;
}
-#ifndef NDEBUG
+#if !LOG_DISABLED
String Font::description() const
{
if (origin() == Origin::Remote)
Modified: trunk/Source/WebCore/platform/graphics/Font.h (237486 => 237487)
--- trunk/Source/WebCore/platform/graphics/Font.h 2018-10-26 23:34:01 UTC (rev 237486)
+++ trunk/Source/WebCore/platform/graphics/Font.h 2018-10-27 10:01:04 UTC (rev 237487)
@@ -185,7 +185,7 @@
bool isInterstitial() const { return m_isInterstitial; }
Visibility visibility() const { return m_visibility; }
-#ifndef NDEBUG
+#if !LOG_DISABLED
String description() const;
#endif
Modified: trunk/Source/WebCore/platform/graphics/FontPlatformData.h (237486 => 237487)
--- trunk/Source/WebCore/platform/graphics/FontPlatformData.h 2018-10-26 23:34:01 UTC (rev 237486)
+++ trunk/Source/WebCore/platform/graphics/FontPlatformData.h 2018-10-27 10:01:04 UTC (rev 237487)
@@ -203,7 +203,7 @@
RefPtr<SharedBuffer> openTypeTable(uint32_t table) const;
#endif
-#ifndef NDEBUG
+#if !LOG_DISABLED
String description() const;
#endif
Modified: trunk/Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm (237486 => 237487)
--- trunk/Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm 2018-10-26 23:34:01 UTC (rev 237486)
+++ trunk/Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm 2018-10-27 10:01:04 UTC (rev 237487)
@@ -196,7 +196,7 @@
return nullptr;
}
-#ifndef NDEBUG
+#if !LOG_DISABLED
String FontPlatformData::description() const
{
auto fontDescription = adoptCF(CFCopyDescription(font()));
Modified: trunk/Source/WebCore/platform/graphics/freetype/FontPlatformDataFreeType.cpp (237486 => 237487)
--- trunk/Source/WebCore/platform/graphics/freetype/FontPlatformDataFreeType.cpp 2018-10-26 23:34:01 UTC (rev 237486)
+++ trunk/Source/WebCore/platform/graphics/freetype/FontPlatformDataFreeType.cpp 2018-10-27 10:01:04 UTC (rev 237487)
@@ -265,7 +265,7 @@
return m_scaledFont == other.m_scaledFont;
}
-#ifndef NDEBUG
+#if !LOG_DISABLED
String FontPlatformData::description() const
{
return String();
Modified: trunk/Source/WebCore/platform/graphics/win/FontPlatformDataWin.cpp (237486 => 237487)
--- trunk/Source/WebCore/platform/graphics/win/FontPlatformDataWin.cpp 2018-10-26 23:34:01 UTC (rev 237486)
+++ trunk/Source/WebCore/platform/graphics/win/FontPlatformDataWin.cpp 2018-10-27 10:01:04 UTC (rev 237487)
@@ -88,7 +88,7 @@
return buffer;
}
-#ifndef NDEBUG
+#if !LOG_DISABLED
String FontPlatformData::description() const
{
return String();
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
