Changeset 84815 in webkit


Ignore:
Timestamp:
Apr 25, 2011 3:54:02 PM (13 years ago)
Author:
jamesr@google.com
Message:

2011-04-25 James Robinson <jamesr@chromium.org>

Reviewed by Adam Barth.

Fix strict OwnPtr violations in Render*.cpp
https://bugs.webkit.org/show_bug.cgi?id=59361

  • rendering/RenderBlock.cpp: (WebCore::RenderBlock::RenderBlock): (WebCore::RenderBlock::finishDelayUpdateScrollInfo):
  • rendering/RenderBox.cpp: (WebCore::RenderBox::addLayoutOverflow): (WebCore::RenderBox::addVisualOverflow):
  • rendering/RenderButton.cpp: (WebCore::RenderButton::styleDidChange):
  • rendering/RenderLayer.cpp: (WebCore::RenderLayer::updateTransform): (WebCore::RenderLayer::paintChildLayerIntoColumns): (WebCore::RenderLayer::hitTestChildLayerColumns): (WebCore::RenderLayer::ensureBacking):
  • rendering/RenderTable.cpp: (WebCore::RenderTable::styleDidChange):
  • rendering/RenderView.cpp: (WebCore::RenderView::compositor):
  • rendering/style/RenderStyle.cpp: (WebCore::RenderStyle::addCachedPseudoStyle): (WebCore::RenderStyle::accessCounterDirectives): (WebCore::RenderStyle::accessAnimations): (WebCore::RenderStyle::accessTransitions):
  • rendering/svg/RenderSVGResourceFilter.cpp: (WebCore::RenderSVGResourceFilter::applyResource):
  • rendering/svg/SVGResources.cpp: (WebCore::SVGResources::SVGResources):
Location:
trunk/Source/WebCore
Files:
10 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r84814 r84815  
     12011-04-25  James Robinson  <jamesr@chromium.org>
     2
     3        Reviewed by Adam Barth.
     4
     5        Fix strict OwnPtr violations in Render*.cpp
     6        https://bugs.webkit.org/show_bug.cgi?id=59361
     7
     8        * rendering/RenderBlock.cpp:
     9        (WebCore::RenderBlock::RenderBlock):
     10        (WebCore::RenderBlock::finishDelayUpdateScrollInfo):
     11        * rendering/RenderBox.cpp:
     12        (WebCore::RenderBox::addLayoutOverflow):
     13        (WebCore::RenderBox::addVisualOverflow):
     14        * rendering/RenderButton.cpp:
     15        (WebCore::RenderButton::styleDidChange):
     16        * rendering/RenderLayer.cpp:
     17        (WebCore::RenderLayer::updateTransform):
     18        (WebCore::RenderLayer::paintChildLayerIntoColumns):
     19        (WebCore::RenderLayer::hitTestChildLayerColumns):
     20        (WebCore::RenderLayer::ensureBacking):
     21        * rendering/RenderTable.cpp:
     22        (WebCore::RenderTable::styleDidChange):
     23        * rendering/RenderView.cpp:
     24        (WebCore::RenderView::compositor):
     25        * rendering/style/RenderStyle.cpp:
     26        (WebCore::RenderStyle::addCachedPseudoStyle):
     27        (WebCore::RenderStyle::accessCounterDirectives):
     28        (WebCore::RenderStyle::accessAnimations):
     29        (WebCore::RenderStyle::accessTransitions):
     30        * rendering/svg/RenderSVGResourceFilter.cpp:
     31        (WebCore::RenderSVGResourceFilter::applyResource):
     32        * rendering/svg/SVGResources.cpp:
     33        (WebCore::SVGResources::SVGResources):
     34
    1352011-04-25  Adam Barth  <abarth@webkit.org>
    236
  • trunk/Source/WebCore/rendering/RenderBlock.cpp

    r84589 r84815  
    113113RenderBlock::RenderBlock(Node* node)
    114114      : RenderBox(node)
    115       , m_floatingObjects(0)
    116       , m_positionedObjects(0)
    117       , m_rareData(0)
    118115      , m_lineHeight(-1)
    119116      , m_beingDestroyed(false)
     
    10931090        ASSERT(gDelayedUpdateScrollInfoSet);
    10941091
    1095         OwnPtr<DelayedUpdateScrollInfoSet> infoSet(gDelayedUpdateScrollInfoSet);
     1092        OwnPtr<DelayedUpdateScrollInfoSet> infoSet(adoptPtr(gDelayedUpdateScrollInfoSet));
    10961093        gDelayedUpdateScrollInfoSet = 0;
    10971094
  • trunk/Source/WebCore/rendering/RenderBox.cpp

    r84516 r84815  
    32703270
    32713271    if (!m_overflow)
    3272         m_overflow.set(new RenderOverflow(clientBox, borderBoxRect()));
     3272        m_overflow = adoptPtr(new RenderOverflow(clientBox, borderBoxRect()));
    32733273   
    32743274    m_overflow->addLayoutOverflow(overflowRect);
     
    32823282       
    32833283    if (!m_overflow)
    3284         m_overflow.set(new RenderOverflow(clientBoxRect(), borderBox));
     3284        m_overflow = adoptPtr(new RenderOverflow(clientBoxRect(), borderBox));
    32853285   
    32863286    m_overflow->addVisualOverflow(rect);
  • trunk/Source/WebCore/rendering/RenderButton.cpp

    r75537 r84815  
    9696    if (!m_default && theme()->isDefault(this)) {
    9797        if (!m_timer)
    98             m_timer.set(new Timer<RenderButton>(this, &RenderButton::timerFired));
     98            m_timer = adoptPtr(new Timer<RenderButton>(this, &RenderButton::timerFired));
    9999        m_timer->startRepeating(0.03);
    100100        m_default = true;
  • trunk/Source/WebCore/rendering/RenderLayer.cpp

    r84538 r84815  
    427427    if (hasTransform != hadTransform) {
    428428        if (hasTransform)
    429             m_transform.set(new TransformationMatrix);
     429            m_transform = adoptPtr(new TransformationMatrix);
    430430        else
    431431            m_transform.clear();
     
    27652765                newTransform.translateRight(offset.width(), offset.height());
    27662766               
    2767                 childLayer->m_transform.set(new TransformationMatrix(newTransform));
     2767                childLayer->m_transform = adoptPtr(new TransformationMatrix(newTransform));
    27682768                childLayer->paintLayer(rootLayer, context, localDirtyRect, paintBehavior, paintingRoot, overlapTestRequests, paintFlags);
    27692769                if (oldHasTransform)
    2770                     childLayer->m_transform.set(new TransformationMatrix(oldTransform));
     2770                    childLayer->m_transform = adoptPtr(new TransformationMatrix(oldTransform));
    27712771                else
    27722772                    childLayer->m_transform.clear();
     
    32493249                newTransform.translateRight(offset.width(), offset.height());
    32503250               
    3251                 childLayer->m_transform.set(new TransformationMatrix(newTransform));
     3251                childLayer->m_transform = adoptPtr(new TransformationMatrix(newTransform));
    32523252                hitLayer = childLayer->hitTestLayer(rootLayer, columnLayers[0], request, result, localClipRect, hitTestPoint, false, transformState, zOffset);
    32533253                if (oldHasTransform)
    3254                     childLayer->m_transform.set(new TransformationMatrix(oldTransform));
     3254                    childLayer->m_transform = adoptPtr(new TransformationMatrix(oldTransform));
    32553255                else
    32563256                    childLayer->m_transform.clear();
     
    36103610{
    36113611    if (!m_backing)
    3612         m_backing.set(new RenderLayerBacking(this));
     3612        m_backing = adoptPtr(new RenderLayerBacking(this));
    36133613    return m_backing.get();
    36143614}
  • trunk/Source/WebCore/rendering/RenderTable.cpp

    r82123 r84815  
    8686        // explicit width is specified on the table.  Auto width implies auto table layout.
    8787        if (style()->tableLayout() == TFIXED && !style()->logicalWidth().isAuto())
    88             m_tableLayout.set(new FixedTableLayout(this));
     88            m_tableLayout = adoptPtr(new FixedTableLayout(this));
    8989        else
    90             m_tableLayout.set(new AutoTableLayout(this));
     90            m_tableLayout = adoptPtr(new AutoTableLayout(this));
    9191    }
    9292}
  • trunk/Source/WebCore/rendering/RenderView.cpp

    r84454 r84815  
    783783{
    784784    if (!m_compositor)
    785         m_compositor.set(new RenderLayerCompositor(this));
     785        m_compositor = adoptPtr(new RenderLayerCompositor(this));
    786786
    787787    return m_compositor.get();
  • trunk/Source/WebCore/rendering/style/RenderStyle.cpp

    r84273 r84815  
    251251
    252252    if (!m_cachedPseudoStyles)
    253         m_cachedPseudoStyles.set(new PseudoStyleCache);
     253        m_cachedPseudoStyles = adoptPtr(new PseudoStyleCache);
    254254
    255255    m_cachedPseudoStyles->append(pseudo);
     
    850850    OwnPtr<CounterDirectiveMap>& map = rareNonInheritedData.access()->m_counterDirectives;
    851851    if (!map)
    852         map.set(new CounterDirectiveMap);
    853     return *map.get();
     852        map = adoptPtr(new CounterDirectiveMap);
     853    return *map;
    854854}
    855855
     
    997997{
    998998    if (!rareNonInheritedData.access()->m_animations)
    999         rareNonInheritedData.access()->m_animations.set(new AnimationList());
     999        rareNonInheritedData.access()->m_animations = adoptPtr(new AnimationList());
    10001000    return rareNonInheritedData->m_animations.get();
    10011001}
     
    10041004{
    10051005    if (!rareNonInheritedData.access()->m_transitions)
    1006         rareNonInheritedData.access()->m_transitions.set(new AnimationList());
     1006        rareNonInheritedData.access()->m_transitions = adoptPtr(new AnimationList());
    10071007    return rareNonInheritedData->m_transitions.get();
    10081008}
  • trunk/Source/WebCore/rendering/svg/RenderSVGResourceFilter.cpp

    r84101 r84815  
    154154    }
    155155
    156     OwnPtr<FilterData> filterData(new FilterData);
     156    OwnPtr<FilterData> filterData(adoptPtr(new FilterData));
    157157    FloatRect targetBoundingBox = object->objectBoundingBox();
    158158
  • trunk/Source/WebCore/rendering/svg/SVGResources.cpp

    r79985 r84815  
    3737
    3838SVGResources::SVGResources()
    39     : m_clipperFilterMaskerData(0)
    40     , m_markerData(0)
    41     , m_fillStrokeData(0)
    42     , m_linkedResource(0)
     39    : m_linkedResource(0)
    4340{
    4441}
Note: See TracChangeset for help on using the changeset viewer.