diff options
| author | Leon Clarke <leonclarke@google.com> | 2010-07-15 12:03:35 +0100 |
|---|---|---|
| committer | Leon Clarke <leonclarke@google.com> | 2010-07-20 16:57:23 +0100 |
| commit | e458d70a0d18538346f41b503114c9ebe6b2ce12 (patch) | |
| tree | 86f1637deca2c524432a822e5fcedd4bef221091 /WebCore/css/CSSFontFaceSource.cpp | |
| parent | f43eabc081f7ce6af24b9df4953498a3cd6ca24d (diff) | |
| download | external_webkit-e458d70a0d18538346f41b503114c9ebe6b2ce12.zip external_webkit-e458d70a0d18538346f41b503114c9ebe6b2ce12.tar.gz external_webkit-e458d70a0d18538346f41b503114c9ebe6b2ce12.tar.bz2 | |
Merge WebKit at r63173 : Initial merge by git.
Change-Id: Ife5af0c7c6261fbbc8ae6bc08c390efa9ef10b44
Diffstat (limited to 'WebCore/css/CSSFontFaceSource.cpp')
| -rw-r--r-- | WebCore/css/CSSFontFaceSource.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/WebCore/css/CSSFontFaceSource.cpp b/WebCore/css/CSSFontFaceSource.cpp index 921b149..00dfcba 100644 --- a/WebCore/css/CSSFontFaceSource.cpp +++ b/WebCore/css/CSSFontFaceSource.cpp @@ -42,6 +42,7 @@ #include "HTMLNames.h" #include "SVGFontData.h" #include "SVGFontElement.h" +#include "SVGFontFaceElement.h" #include "SVGURIReference.h" #endif @@ -187,9 +188,10 @@ SimpleFontData* CSSFontFaceSource::getFontData(const FontDescription& fontDescri fontData.set(new SimpleFontData(tempData->platformData(), true, true)); } - m_fontDataTable.set(hashKey, fontData.get()); - return fontData.release(); -} + SimpleFontData* fontDataRawPtr = fontData.leakPtr(); + m_fontDataTable.set(hashKey, fontDataRawPtr); + return fontDataRawPtr; } +} |