Changeset 84836 in webkit


Ignore:
Timestamp:
Apr 25, 2011 4:36:53 PM (13 years ago)
Author:
enne@google.com
Message:

2011-04-25 Adrienne Walker <enne@google.com>

Reviewed by David Levin.

WebCore/css/CSS* files should play nice with strict OwnPtrs
https://bugs.webkit.org/show_bug.cgi?id=59382

  • css/CSSFontFaceSource.cpp: (WebCore::CSSFontFaceSource::getFontData):
  • css/CSSParser.cpp: (WebCore::CSSParser::addProperty): (WebCore::CSSParser::parseValue):
Location:
trunk/Source/WebCore
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r84835 r84836  
     12011-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
    1142011-04-25  Adam Barth  <abarth@webkit.org>
    215
  • trunk/Source/WebCore/css/CSSFontFaceSource.cpp

    r83896 r84836  
    155155                    }
    156156
    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));
    158158                }
    159159            } else
     
    164164                    return 0;
    165165
    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(),
    167167                                                                                   fontDescription.textOrientation(), fontDescription.widthVariant(), fontDescription.renderingMode()), true, false));
    168168            }
     
    171171            // In-Document SVG Fonts
    172172            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));
    174174#endif
    175175        }
     
    183183            tempData = fontCache()->getLastResortFallbackFont(fontDescription);
    184184
    185         fontData.set(new SimpleFontData(tempData->platformData(), true, true));
     185        fontData = adoptPtr(new SimpleFontData(tempData->platformData(), true, true));
    186186    }
    187187
  • trunk/Source/WebCore/css/CSSParser.cpp

    r83122 r84836  
    582582void CSSParser::addProperty(int propId, PassRefPtr<CSSValue> value, bool important)
    583583{
    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)));
    585585    if (m_numParsedProperties >= m_maxParsedProperties) {
    586586        m_maxParsedProperties += 32;
     
    11301130                propId == CSSPropertyWebkitMaskPosition ||
    11311131                propId == CSSPropertyWebkitMaskRepeat) {
    1132                 shorthandScope.set(new ShorthandScope(this, propId));
     1132                shorthandScope = adoptPtr(new ShorthandScope(this, propId));
    11331133            }
    11341134            addProperty(propId1, val1.release(), important);
Note: See TracChangeset for help on using the changeset viewer.