Changeset 84836 in webkit
- Timestamp:
- Apr 25, 2011 4:36:53 PM (13 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r84835 r84836 1 2011-04-25 Adrienne Walker <enne@google.com> 2 3 Reviewed by David Levin. 4 5 WebCore/css/CSS* files should play nice with strict OwnPtrs 6 https://bugs.webkit.org/show_bug.cgi?id=59382 7 8 * css/CSSFontFaceSource.cpp: 9 (WebCore::CSSFontFaceSource::getFontData): 10 * css/CSSParser.cpp: 11 (WebCore::CSSParser::addProperty): 12 (WebCore::CSSParser::parseValue): 13 1 14 2011-04-25 Adam Barth <abarth@webkit.org> 2 15 -
trunk/Source/WebCore/css/CSSFontFaceSource.cpp
r83896 r84836 155 155 } 156 156 157 fontData .set(new SimpleFontData(adoptPtr(new SVGFontData(fontFaceElement)), fontDescription.computedPixelSize(), syntheticBold, syntheticItalic));157 fontData = adoptPtr(new SimpleFontData(adoptPtr(new SVGFontData(fontFaceElement)), fontDescription.computedPixelSize(), syntheticBold, syntheticItalic)); 158 158 } 159 159 } else … … 164 164 return 0; 165 165 166 fontData .set(new SimpleFontData(m_font->platformDataFromCustomData(fontDescription.computedPixelSize(), syntheticBold, syntheticItalic, fontDescription.orientation(),166 fontData = adoptPtr(new SimpleFontData(m_font->platformDataFromCustomData(fontDescription.computedPixelSize(), syntheticBold, syntheticItalic, fontDescription.orientation(), 167 167 fontDescription.textOrientation(), fontDescription.widthVariant(), fontDescription.renderingMode()), true, false)); 168 168 } … … 171 171 // In-Document SVG Fonts 172 172 if (m_svgFontFaceElement) 173 fontData .set(new SimpleFontData(adoptPtr(new SVGFontData(m_svgFontFaceElement.get())), fontDescription.computedPixelSize(), syntheticBold, syntheticItalic));173 fontData = adoptPtr(new SimpleFontData(adoptPtr(new SVGFontData(m_svgFontFaceElement.get())), fontDescription.computedPixelSize(), syntheticBold, syntheticItalic)); 174 174 #endif 175 175 } … … 183 183 tempData = fontCache()->getLastResortFallbackFont(fontDescription); 184 184 185 fontData .set(new SimpleFontData(tempData->platformData(), true, true));185 fontData = adoptPtr(new SimpleFontData(tempData->platformData(), true, true)); 186 186 } 187 187 -
trunk/Source/WebCore/css/CSSParser.cpp
r83122 r84836 582 582 void CSSParser::addProperty(int propId, PassRefPtr<CSSValue> value, bool important) 583 583 { 584 OwnPtr<CSSProperty> prop( new CSSProperty(propId, value, important, m_currentShorthand, m_implicitShorthand));584 OwnPtr<CSSProperty> prop(adoptPtr(new CSSProperty(propId, value, important, m_currentShorthand, m_implicitShorthand))); 585 585 if (m_numParsedProperties >= m_maxParsedProperties) { 586 586 m_maxParsedProperties += 32; … … 1130 1130 propId == CSSPropertyWebkitMaskPosition || 1131 1131 propId == CSSPropertyWebkitMaskRepeat) { 1132 shorthandScope .set(new ShorthandScope(this, propId));1132 shorthandScope = adoptPtr(new ShorthandScope(this, propId)); 1133 1133 } 1134 1134 addProperty(propId1, val1.release(), important);
Note: See TracChangeset
for help on using the changeset viewer.