Remove debug output formatting from GlyphPageTreeNode and friends

BUG=412478

Review URL: https://codereview.chromium.org/551373002

git-svn-id: svn://svn.chromium.org/blink/trunk@181673 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent 21896279
......@@ -59,10 +59,6 @@ public:
void setMaxGlyphPageTreeLevel(unsigned level) const { m_maxGlyphPageTreeLevel = level; }
unsigned maxGlyphPageTreeLevel() const { return m_maxGlyphPageTreeLevel; }
#ifndef NDEBUG
virtual String description() const = 0;
#endif
private:
mutable unsigned m_maxGlyphPageTreeLevel;
};
......
......@@ -139,10 +139,6 @@ public:
PassRefPtr<SharedBuffer> openTypeTable(uint32_t table) const;
#endif
#ifndef NDEBUG
String description() const;
#endif
#if !OS(MACOSX)
// The returned styles are all actual styles without FontRenderStyle::NoPreference.
const FontRenderStyle& fontRenderStyle() const { return m_style; }
......
......@@ -383,41 +383,5 @@ void GlyphPageTreeNode::pruneFontData(const SimpleFontData* fontData, unsigned l
it->value->pruneFontData(fontData, level);
}
#ifndef NDEBUG
void GlyphPageTreeNode::showSubtree()
{
Vector<char> indent(level());
indent.fill('\t', level());
indent.append(0);
GlyphPageTreeNodeMap::iterator end = m_children.end();
for (GlyphPageTreeNodeMap::iterator it = m_children.begin(); it != end; ++it) {
printf("%s\t%p %s\n", indent.data(), it->key, it->key->description().utf8().data());
it->value->showSubtree();
}
if (m_systemFallbackChild) {
printf("%s\t* fallback\n", indent.data());
m_systemFallbackChild->showSubtree();
}
}
#endif
} // namespace blink
#ifndef NDEBUG
void showGlyphPageTrees()
{
printf("Page 0:\n");
showGlyphPageTree(0);
HashMap<int, blink::GlyphPageTreeNode*>::iterator end = blink::GlyphPageTreeNode::roots->end();
for (HashMap<int, blink::GlyphPageTreeNode*>::iterator it = blink::GlyphPageTreeNode::roots->begin(); it != end; ++it) {
printf("\nPage %d:\n", it->key);
showGlyphPageTree(it->key);
}
}
void showGlyphPageTree(unsigned pageNumber)
{
blink::GlyphPageTreeNode::getRoot(pageNumber)->showSubtree();
}
#endif
......@@ -37,11 +37,6 @@
#include "wtf/RefCounted.h"
#include "wtf/unicode/Unicode.h"
#ifndef NDEBUG
void PLATFORM_EXPORT showGlyphPageTrees();
void PLATFORM_EXPORT showGlyphPageTree(unsigned pageNumber);
#endif
namespace blink {
class FontData;
......@@ -131,10 +126,6 @@ private:
#if ENABLE(ASSERT)
unsigned m_pageNumber;
#endif
#ifndef NDEBUG
friend void ::showGlyphPageTrees();
friend void ::showGlyphPageTree(unsigned pageNumber);
#endif
};
} // namespace blink
......
......@@ -99,11 +99,4 @@ bool SegmentedFontData::shouldSkipDrawing() const
return false;
}
#ifndef NDEBUG
String SegmentedFontData::description() const
{
return "[segmented font]";
}
#endif
} // namespace blink
......@@ -64,10 +64,6 @@ public:
const FontDataRange& rangeAt(unsigned i) const { return m_ranges[i]; }
bool containsCharacter(UChar32) const;
#ifndef NDEBUG
virtual String description() const OVERRIDE;
#endif
private:
SegmentedFontData() { }
......
......@@ -218,18 +218,6 @@ PassRefPtr<SimpleFontData> SimpleFontData::brokenIdeographFontData() const
return m_derivedFontData->brokenIdeograph;
}
#ifndef NDEBUG
String SimpleFontData::description() const
{
if (isSVGFont())
return "[SVG font]";
if (isCustomFont())
return "[custom font]";
return platformData().description();
}
#endif
PassOwnPtr<SimpleFontData::DerivedFontData> SimpleFontData::DerivedFontData::create(bool forCustomFont)
{
return adoptPtr(new DerivedFontData(forCustomFont));
......
......@@ -147,10 +147,6 @@ public:
const GlyphData& missingGlyphData() const { return m_missingGlyphData; }
void setMissingGlyphData(const GlyphData& glyphData) { m_missingGlyphData = glyphData; }
#ifndef NDEBUG
virtual String description() const OVERRIDE;
#endif
#if OS(MACOSX)
const SimpleFontData* getCompositeFontReferenceFontData(NSFont *key) const;
NSFont* getNSFont() const { return m_platformData.font(); }
......
......@@ -327,13 +327,5 @@ HarfBuzzFace* FontPlatformData::harfBuzzFace() const
return m_harfBuzzFace.get();
}
#ifndef NDEBUG
String FontPlatformData::description() const
{
RetainPtr<CFStringRef> cgFontDescription(AdoptCF, CFCopyDescription(cgFont()));
return String(cgFontDescription.get()) + " " + String::number(m_textSize)
+ (m_syntheticBold ? " synthetic bold" : "") + (m_syntheticItalic ? " synthetic oblique" : "") + (m_orientation ? " vertical orientation" : "");
}
#endif
} // namespace blink
......@@ -170,13 +170,6 @@ const FontPlatformData& FontPlatformData::operator=(const FontPlatformData& src)
return *this;
}
#ifndef NDEBUG
String FontPlatformData::description() const
{
return String();
}
#endif
SkFontID FontPlatformData::uniqueID() const
{
return m_typeface->uniqueID();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment