Fix build before merge.

prepare for removal of Stirng::format
haiku · Mar 2, 2019 · d1d9c29 · d1d9c29
1 parent 5b1ce4b
commit d1d9c29
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 15 deletions.
diff --git a/Source/WebCore/platform/graphics/haiku/FontPlatformDataHaiku.cpp b/Source/WebCore/platform/graphics/haiku/FontPlatformDataHaiku.cpp
@@ -147,10 +147,7 @@ FontPlatformData FontPlatformData::cloneWithSize(const FontPlatformData& source,
 
 unsigned FontPlatformData::hash() const
 {
-	if (isHashTableDeletedValue())
-		return 1;
-	String hashString = description();
-	return StringHasher::hashMemory<sizeof(hashString.length())>(hashString.utf8().data());
+	return PtrHash<BFont*>::hash(m_font.get());
 }
 
 
@@ -170,15 +167,6 @@ bool FontPlatformData::isFixedPitch() const
 	return m_font->Spacing() == B_FIXED_SPACING;
 }
 
-String FontPlatformData::description() const
-{
-	font_family fontFamily;
-	font_style fontStyle;
-	m_font->GetFamilyAndStyle(&fontFamily, &fontStyle);
-	return String(fontFamily) + "/" + String(fontStyle)
-		+ String::format("/%.1f/%d&%d", m_size, m_syntheticBold, m_syntheticOblique);
-}
-
 void
 FontPlatformData::SetFallBackSerifFont(const BString& font)
 {

diff --git a/Source/WebCore/platform/graphics/haiku/ImageBufferHaiku.cpp b/Source/WebCore/platform/graphics/haiku/ImageBufferHaiku.cpp
@@ -441,8 +441,7 @@ String ImageBuffer::toDataURL(const String& mimeType, Optional<double> quality,
     Vector<char> encodedBuffer;
     base64Encode(binaryBuffer, encodedBuffer);
 
-    return String::format("data:%s;base64,%.*s", mimeType.utf8().data(),
-        (int)encodedBuffer.size(), encodedBuffer.data());
+	return "data:" + mimeType + ";base64;" + encodedBuffer;
 }