Title: [200944] trunk/Source/WebCore
- Revision
- 200944
- Author
- beid...@apple.com
- Date
- 2016-05-16 10:22:13 -0700 (Mon, 16 May 2016)
Log Message
Random CachedFont.cpp cleanup.
https://bugs.webkit.org/show_bug.cgi?id=157740
Reviewed by Myles C. Maxfield.
No new tests (Refactor/cleanup, no behavior change)
* loader/cache/CachedFont.cpp:
(WebCore::CachedFont::ensureCustomFontData): Remove unneeded local RefPtr<>
(WebCore::CachedFont::createCustomFontData): Refactor to not require unnecessary Ref-churn in the common case.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (200943 => 200944)
--- trunk/Source/WebCore/ChangeLog 2016-05-16 16:37:26 UTC (rev 200943)
+++ trunk/Source/WebCore/ChangeLog 2016-05-16 17:22:13 UTC (rev 200944)
@@ -1,3 +1,16 @@
+2016-05-16 Brady Eidson <beid...@apple.com>
+
+ Random CachedFont.cpp cleanup.
+ https://bugs.webkit.org/show_bug.cgi?id=157740
+
+ Reviewed by Myles C. Maxfield.
+
+ No new tests (Refactor/cleanup, no behavior change)
+
+ * loader/cache/CachedFont.cpp:
+ (WebCore::CachedFont::ensureCustomFontData): Remove unneeded local RefPtr<>
+ (WebCore::CachedFont::createCustomFontData): Refactor to not require unnecessary Ref-churn in the common case.
+
2016-05-16 Chris Dumez <cdu...@apple.com>
Modernize Track classes' code
Modified: trunk/Source/WebCore/loader/cache/CachedFont.cpp (200943 => 200944)
--- trunk/Source/WebCore/loader/cache/CachedFont.cpp 2016-05-16 16:37:26 UTC (rev 200943)
+++ trunk/Source/WebCore/loader/cache/CachedFont.cpp 2016-05-16 17:22:13 UTC (rev 200944)
@@ -91,9 +91,8 @@
bool CachedFont::ensureCustomFontData(SharedBuffer* data)
{
if (!m_fontCustomPlatformData && !errorOccurred() && !isLoading() && data) {
- RefPtr<SharedBuffer> buffer(data);
bool wrapping;
- m_fontCustomPlatformData = createCustomFontData(*buffer, wrapping);
+ m_fontCustomPlatformData = createCustomFontData(*data, wrapping);
m_hasCreatedFontDataWrappingResource = m_fontCustomPlatformData && wrapping;
if (!m_fontCustomPlatformData)
setStatus(DecodeError);
@@ -104,21 +103,21 @@
std::unique_ptr<FontCustomPlatformData> CachedFont::createCustomFontData(SharedBuffer& bytes, bool& wrapping)
{
- RefPtr<SharedBuffer> buffer = &bytes;
wrapping = true;
#if !PLATFORM(COCOA)
- if (isWOFF(*buffer)) {
- Vector<char> convertedFont;
- if (!convertWOFFToSfnt(*buffer, convertedFont))
- buffer = nullptr;
- else
- buffer = SharedBuffer::adoptVector(convertedFont);
+ if (isWOFF(bytes)) {
wrapping = false;
+ Vector<char> convertedFont;
+ if (!convertWOFFToSfnt(bytes, convertedFont))
+ return nullptr;
+
+ auto buffer = SharedBuffer::adoptVector(convertedFont);
+ return createFontCustomPlatformData(*buffer);
}
#endif
- return buffer ? createFontCustomPlatformData(*buffer) : nullptr;
+ return createFontCustomPlatformData(bytes);
}
RefPtr<Font> CachedFont::createFont(const FontDescription& fontDescription, const AtomicString&, bool syntheticBold, bool syntheticItalic, const FontFeatureSettings& fontFaceFeatures, const FontVariantSettings& fontFaceVariantSettings)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
