Changeset 207814 in webkit


Ignore:
Timestamp:
Oct 25, 2016 3:27:12 AM (8 years ago)
Author:
akling@apple.com
Message:

More PassRefPtr purging in WebCore.
<​https://webkit.org/b/163895>

Reviewed by Antti Koivisto.

Source/WebCore:

Remove PassRefPtr usage in RenderStyle, RenderTheme and Scrollbar, then fix up all the fallout.

  • css/CSSComputedStyleDeclaration.cpp:

(WebCore::contentToCSSValue):
(WebCore::shapePropertyValue):
(WebCore::ComputedStyleExtractor::propertyValue):

  • css/StyleBuilderConverter.h:

(WebCore::StyleBuilderConverter::convertQuotes):

  • html/HTMLSelectElement.cpp:

(WebCore::HTMLSelectElement::usesMenuList):
(WebCore::HTMLSelectElement::platformHandleKeydownEvent):
(WebCore::HTMLSelectElement::menuListDefaultEventHandler):

  • html/InputType.cpp:

(WebCore::InputType::themeSupportsDataListUI):

  • html/TextFieldInputType.cpp:

(WebCore::TextFieldInputType::shouldHaveSpinButton):
(WebCore::TextFieldInputType::shouldHaveCapsLockIndicator):

  • loader/SubframeLoader.cpp:

(WebCore::SubframeLoader::loadPlugin):

  • page/FrameView.cpp:

(WebCore::FrameView::createScrollbar):

  • page/FrameView.h:
  • page/animation/CSSPropertyAnimation.cpp:

(WebCore::RefCountedPropertyWrapper::RefCountedPropertyWrapper):
(WebCore::PropertyWrapperClipPath::PropertyWrapperClipPath):
(WebCore::PropertyWrapperShape::PropertyWrapperShape):
(WebCore::StyleImagePropertyWrapper::StyleImagePropertyWrapper):
(WebCore::FillLayerRefCountedPropertyWrapper::FillLayerRefCountedPropertyWrapper):
(WebCore::FillLayerStyleImagePropertyWrapper::FillLayerStyleImagePropertyWrapper):

  • platform/PopupMenuClient.h:
  • platform/ScrollView.cpp:

(WebCore::ScrollView::createScrollbar):

  • platform/ScrollView.h:
  • platform/Scrollbar.cpp:

(WebCore::Scrollbar::createNativeScrollbar):

  • platform/Scrollbar.h:
  • rendering/FilterEffectRenderer.cpp:

(WebCore::FilterEffectRenderer::buildReferenceFilter):

  • rendering/FilterEffectRenderer.h:
  • rendering/RenderLayer.cpp:

(WebCore::RenderLayer::createScrollbar):
(WebCore::RenderLayer::createLocalTransformState):
(WebCore::RenderLayer::hitTestLayerByApplyingTransform):

  • rendering/RenderLayer.h:
  • rendering/RenderListBox.cpp:

(WebCore::RenderListBox::createScrollbar):

  • rendering/RenderListBox.h:
  • rendering/RenderMenuList.cpp:

(RenderMenuList::createScrollbar):

  • rendering/RenderMenuList.h:
  • rendering/RenderScrollbar.cpp:

(WebCore::RenderScrollbar::createCustomScrollbar):

  • rendering/RenderScrollbar.h:
  • rendering/RenderSearchField.cpp:

(WebCore::RenderSearchField::createScrollbar):

  • rendering/RenderSearchField.h:
  • rendering/RenderTheme.h:

(WebCore::RenderTheme::defaultTheme):

  • rendering/RenderThemeEfl.cpp:

(WebCore::RenderThemeEfl::create):
(WebCore::RenderTheme::themeForPage):

  • rendering/RenderThemeEfl.h:
  • rendering/RenderThemeGtk.cpp:

(WebCore::RenderTheme::themeForPage):

  • rendering/RenderThemeIOS.mm:

(WebCore::RenderTheme::themeForPage):

  • rendering/RenderThemeMac.mm:

(WebCore::RenderTheme::themeForPage):

  • rendering/RenderThemeWin.cpp:

(WebCore::RenderTheme::themeForPage):

  • rendering/RenderWidget.cpp:

(WebCore::RenderWidget::setWidget):

  • rendering/RenderWidget.h:
  • rendering/style/CursorData.h:

(WebCore::CursorData::CursorData):
(WebCore::CursorData::setImage):

  • rendering/style/FillLayer.h:

(WebCore::FillLayer::setImage):

  • rendering/style/QuotesData.cpp:

(WebCore::QuotesData::create):

  • rendering/style/QuotesData.h:
  • rendering/style/RenderStyle.cpp:

(WebCore::RenderStyle::addCursor):
(WebCore::RenderStyle::setCursorList):
(WebCore::RenderStyle::setQuotes):
(WebCore::RenderStyle::setWillChange):
(WebCore::RenderStyle::setContent):
(WebCore::RenderStyle::setListStyleImage):
(WebCore::RenderStyle::setBorderImageSource):

  • rendering/style/RenderStyle.h:

(WebCore::RenderStyle::setMaskImage):
(WebCore::RenderStyle::setMaskBoxImageSource):
(WebCore::RenderStyle::setBoxReflect):
(WebCore::RenderStyle::setShapeOutside):
(WebCore::RenderStyle::setClipPath):

  • rendering/style/StyleCachedImage.cpp:

(WebCore::StyleCachedImage::cssValue):

  • rendering/style/StyleCachedImage.h:
  • rendering/style/StyleGeneratedImage.cpp:

(WebCore::StyleGeneratedImage::cssValue):

  • rendering/style/StyleGeneratedImage.h:
  • rendering/style/StyleImage.h:
  • rendering/style/StyleMultiColData.h:
  • rendering/style/StyleRareInheritedData.h:

Source/WebKit2:

  • WebProcess/Plugins/PDF/DeprecatedPDFPlugin.h:
  • WebProcess/Plugins/PDF/DeprecatedPDFPlugin.mm:

(WebKit::PDFPlugin::createScrollbar):

Location:
trunk/Source
Files:
52 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r207810 r207814  
     12016-10-25  Andreas Kling  <akling@apple.com>
     2
     3        More PassRefPtr purging in WebCore.
     4        <https://webkit.org/b/163895>
     5
     6        Reviewed by Antti Koivisto.
     7
     8        Remove PassRefPtr usage in RenderStyle, RenderTheme and Scrollbar, then fix up all the fallout.
     9
     10        * css/CSSComputedStyleDeclaration.cpp:
     11        (WebCore::contentToCSSValue):
     12        (WebCore::shapePropertyValue):
     13        (WebCore::ComputedStyleExtractor::propertyValue):
     14        * css/StyleBuilderConverter.h:
     15        (WebCore::StyleBuilderConverter::convertQuotes):
     16        * html/HTMLSelectElement.cpp:
     17        (WebCore::HTMLSelectElement::usesMenuList):
     18        (WebCore::HTMLSelectElement::platformHandleKeydownEvent):
     19        (WebCore::HTMLSelectElement::menuListDefaultEventHandler):
     20        * html/InputType.cpp:
     21        (WebCore::InputType::themeSupportsDataListUI):
     22        * html/TextFieldInputType.cpp:
     23        (WebCore::TextFieldInputType::shouldHaveSpinButton):
     24        (WebCore::TextFieldInputType::shouldHaveCapsLockIndicator):
     25        * loader/SubframeLoader.cpp:
     26        (WebCore::SubframeLoader::loadPlugin):
     27        * page/FrameView.cpp:
     28        (WebCore::FrameView::createScrollbar):
     29        * page/FrameView.h:
     30        * page/animation/CSSPropertyAnimation.cpp:
     31        (WebCore::RefCountedPropertyWrapper::RefCountedPropertyWrapper):
     32        (WebCore::PropertyWrapperClipPath::PropertyWrapperClipPath):
     33        (WebCore::PropertyWrapperShape::PropertyWrapperShape):
     34        (WebCore::StyleImagePropertyWrapper::StyleImagePropertyWrapper):
     35        (WebCore::FillLayerRefCountedPropertyWrapper::FillLayerRefCountedPropertyWrapper):
     36        (WebCore::FillLayerStyleImagePropertyWrapper::FillLayerStyleImagePropertyWrapper):
     37        * platform/PopupMenuClient.h:
     38        * platform/ScrollView.cpp:
     39        (WebCore::ScrollView::createScrollbar):
     40        * platform/ScrollView.h:
     41        * platform/Scrollbar.cpp:
     42        (WebCore::Scrollbar::createNativeScrollbar):
     43        * platform/Scrollbar.h:
     44        * rendering/FilterEffectRenderer.cpp:
     45        (WebCore::FilterEffectRenderer::buildReferenceFilter):
     46        * rendering/FilterEffectRenderer.h:
     47        * rendering/RenderLayer.cpp:
     48        (WebCore::RenderLayer::createScrollbar):
     49        (WebCore::RenderLayer::createLocalTransformState):
     50        (WebCore::RenderLayer::hitTestLayerByApplyingTransform):
     51        * rendering/RenderLayer.h:
     52        * rendering/RenderListBox.cpp:
     53        (WebCore::RenderListBox::createScrollbar):
     54        * rendering/RenderListBox.h:
     55        * rendering/RenderMenuList.cpp:
     56        (RenderMenuList::createScrollbar):
     57        * rendering/RenderMenuList.h:
     58        * rendering/RenderScrollbar.cpp:
     59        (WebCore::RenderScrollbar::createCustomScrollbar):
     60        * rendering/RenderScrollbar.h:
     61        * rendering/RenderSearchField.cpp:
     62        (WebCore::RenderSearchField::createScrollbar):
     63        * rendering/RenderSearchField.h:
     64        * rendering/RenderTheme.h:
     65        (WebCore::RenderTheme::defaultTheme):
     66        * rendering/RenderThemeEfl.cpp:
     67        (WebCore::RenderThemeEfl::create):
     68        (WebCore::RenderTheme::themeForPage):
     69        * rendering/RenderThemeEfl.h:
     70        * rendering/RenderThemeGtk.cpp:
     71        (WebCore::RenderTheme::themeForPage):
     72        * rendering/RenderThemeIOS.mm:
     73        (WebCore::RenderTheme::themeForPage):
     74        * rendering/RenderThemeMac.mm:
     75        (WebCore::RenderTheme::themeForPage):
     76        * rendering/RenderThemeWin.cpp:
     77        (WebCore::RenderTheme::themeForPage):
     78        * rendering/RenderWidget.cpp:
     79        (WebCore::RenderWidget::setWidget):
     80        * rendering/RenderWidget.h:
     81        * rendering/style/CursorData.h:
     82        (WebCore::CursorData::CursorData):
     83        (WebCore::CursorData::setImage):
     84        * rendering/style/FillLayer.h:
     85        (WebCore::FillLayer::setImage):
     86        * rendering/style/QuotesData.cpp:
     87        (WebCore::QuotesData::create):
     88        * rendering/style/QuotesData.h:
     89        * rendering/style/RenderStyle.cpp:
     90        (WebCore::RenderStyle::addCursor):
     91        (WebCore::RenderStyle::setCursorList):
     92        (WebCore::RenderStyle::setQuotes):
     93        (WebCore::RenderStyle::setWillChange):
     94        (WebCore::RenderStyle::setContent):
     95        (WebCore::RenderStyle::setListStyleImage):
     96        (WebCore::RenderStyle::setBorderImageSource):
     97        * rendering/style/RenderStyle.h:
     98        (WebCore::RenderStyle::setMaskImage):
     99        (WebCore::RenderStyle::setMaskBoxImageSource):
     100        (WebCore::RenderStyle::setBoxReflect):
     101        (WebCore::RenderStyle::setShapeOutside):
     102        (WebCore::RenderStyle::setClipPath):
     103        * rendering/style/StyleCachedImage.cpp:
     104        (WebCore::StyleCachedImage::cssValue):
     105        * rendering/style/StyleCachedImage.h:
     106        * rendering/style/StyleGeneratedImage.cpp:
     107        (WebCore::StyleGeneratedImage::cssValue):
     108        * rendering/style/StyleGeneratedImage.h:
     109        * rendering/style/StyleImage.h:
     110        * rendering/style/StyleMultiColData.h:
     111        * rendering/style/StyleRareInheritedData.h:
     112
    11132016-10-24  Ryosuke Niwa  <rniwa@webkit.org>
    2114

  • trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp

    r207757 r207814  
    18621862            list.get().append(cssValuePool.createValue(downcast<CounterContentData>(*contentData).counter().identifier(), CSSPrimitiveValue::CSS_COUNTER_NAME));
    18631863        else if (is<ImageContentData>(*contentData))
    1864             list.get().append(*downcast<ImageContentData>(*contentData).image().cssValue());
     1864            list.get().append(downcast<ImageContentData>(*contentData).image().cssValue());
    18651865        else if (is<TextContentData>(*contentData))
    18661866            list.get().append(cssValuePool.createValue(downcast<TextContentData>(*contentData).text(), CSSPrimitiveValue::CSS_STRING));
    … …  
    24382438    if (shapeValue->type() == ShapeValue::Type::Image) {
    24392439        if (shapeValue->image())
    2440             return *shapeValue->image()->cssValue();
     2440            return shapeValue->image()->cssValue();
    24412441        return CSSValuePool::singleton().createIdentifierValue(CSSValueNone);
    24422442    }
    … …  
    25852585            for (const FillLayer* currLayer = layers; currLayer; currLayer = currLayer->next()) {
    25862586                if (currLayer->image())
    2587                     list->append(*currLayer->image()->cssValue());
     2587                    list->append(currLayer->image()->cssValue());
    25882588                else
    25892589                    list->append(cssValuePool.createIdentifierValue(CSSValueNone));
    … …  
    28382838                for (unsigned i = 0; i < cursors->size(); ++i)
    28392839                    if (StyleImage* image = cursors->at(i).image())
    2840                         list->append(*image->cssValue());
     2840                        list->append(image->cssValue());
    28412841            }
    28422842            auto value = cssValuePool.createValue(style->cursor());

  • trunk/Source/WebCore/css/StyleBuilderConverter.h

    r207499 r207814  
    8787    static int convertMarqueeRepetition(StyleResolver&, CSSValue&);
    8888    static int convertMarqueeSpeed(StyleResolver&, CSSValue&);
    89     static PassRefPtr<QuotesData> convertQuotes(StyleResolver&, CSSValue&);
     89    static Ref<QuotesData> convertQuotes(StyleResolver&, CSSValue&);
    9090    static TextUnderlinePosition convertTextUnderlinePosition(StyleResolver&, CSSValue&);
    9191    static RefPtr<StyleReflection> convertReflection(StyleResolver&, CSSValue&);
    … …  
    586586}
    587587
    588 inline PassRefPtr<QuotesData> StyleBuilderConverter::convertQuotes(StyleResolver&, CSSValue& value)
     588inline Ref<QuotesData> StyleBuilderConverter::convertQuotes(StyleResolver&, CSSValue& value)
    589589{
    590590    if (is<CSSPrimitiveValue>(value)) {

  • trunk/Source/WebCore/html/HTMLSelectElement.cpp

    r207627 r207814  
    197197{
    198198#if !PLATFORM(IOS)
    199     const Page* page = document().page();
    200     RefPtr<RenderTheme> renderTheme = page ? &page->theme() : RenderTheme::defaultTheme();
    201     if (renderTheme->delegatesMenuListRendering())
     199    if (RenderTheme::themeForPage(document().page())->delegatesMenuListRendering())
    202200        return true;
    203201
    … …  
    10931091bool HTMLSelectElement::platformHandleKeydownEvent(KeyboardEvent* event)
    10941092{
    1095     const Page* page = document().page();
    1096     RefPtr<RenderTheme> renderTheme = page ? &page->theme() : RenderTheme::defaultTheme();
    1097 
    1098     if (!renderTheme->popsMenuByArrowKeys())
     1093    if (!RenderTheme::themeForPage(document().page())->popsMenuByArrowKeys())
    10991094        return false;
    11001095
    … …  
    11301125    ASSERT(renderer()->isMenuList());
    11311126
    1132     const Page* page = document().page();
    1133     RefPtr<RenderTheme> renderTheme = page ? &page->theme() : RenderTheme::defaultTheme();
     1127    RefPtr<RenderTheme> renderTheme = RenderTheme::themeForPage(document().page());
    11341128
    11351129    if (event.type() == eventNames().keydownEvent) {

  • trunk/Source/WebCore/html/InputType.cpp

    r207458 r207814  
    174174{
    175175    Document& document = type->element().document();
    176     RefPtr<RenderTheme> theme = document.page() ? &document.page()->theme() : RenderTheme::defaultTheme();
    177     return theme->supportsDataListUI(type->formControlType());
     176    return RenderTheme::themeForPage(document.page())->supportsDataListUI(type->formControlType());
    178177}
    179178

  • trunk/Source/WebCore/html/TextFieldInputType.cpp

    r207458 r207814  
    245245bool TextFieldInputType::shouldHaveSpinButton() const
    246246{
    247     Document& document = element().document();
    248     RefPtr<RenderTheme> theme = document.page() ? &document.page()->theme() : RenderTheme::defaultTheme();
    249     return theme->shouldHaveSpinButton(element());
     247    return RenderTheme::themeForPage(element().document().page())->shouldHaveSpinButton(element());
    250248}
    251249
    252250bool TextFieldInputType::shouldHaveCapsLockIndicator() const
    253251{
    254     Document& document = element().document();
    255     RefPtr<RenderTheme> theme = document.page() ? &document.page()->theme() : RenderTheme::defaultTheme();
    256     return theme->shouldHaveCapsLockIndicator(element());
     252    return RenderTheme::themeForPage(element().document().page())->shouldHaveCapsLockIndicator(element());
    257253}
    258254

  • trunk/Source/WebCore/loader/SubframeLoader.cpp

    r206254 r207814  
    422422
    423423    pluginElement.subframeLoaderDidCreatePlugIn(*widget);
    424     renderer->setWidget(widget);
     424    renderer->setWidget(WTFMove(widget));
    425425    m_containsPlugins = true;
    426426    return true;

  • trunk/Source/WebCore/page/FrameView.cpp

    r207669 r207814  
    610610}
    611611
    612 PassRefPtr<Scrollbar> FrameView::createScrollbar(ScrollbarOrientation orientation)
     612Ref<Scrollbar> FrameView::createScrollbar(ScrollbarOrientation orientation)
    613613{
    614614    if (!frame().settings().allowCustomScrollbarInMainFrame() && frame().isMainFrame())

  • trunk/Source/WebCore/page/FrameView.h

    r205506 r207814  
    9999    WEBCORE_EXPORT void updateCanHaveScrollbars();
    100100
    101     PassRefPtr<Scrollbar> createScrollbar(ScrollbarOrientation) override;
     101    Ref<Scrollbar> createScrollbar(ScrollbarOrientation) override;
    102102
    103103    bool avoidScrollbarCreation() const override;

  • trunk/Source/WebCore/page/animation/CSSPropertyAnimation.cpp

    r207630 r207814  
    475475    WTF_MAKE_FAST_ALLOCATED;
    476476public:
    477     RefCountedPropertyWrapper(CSSPropertyID prop, T* (RenderStyle::*getter)() const, void (RenderStyle::*setter)(PassRefPtr<T>))
     477    RefCountedPropertyWrapper(CSSPropertyID prop, T* (RenderStyle::*getter)() const, void (RenderStyle::*setter)(RefPtr<T>&&))
    478478        : PropertyWrapperGetter<T*>(prop, getter)
    479479        , m_setter(setter)
    … …  
    487487
    488488protected:
    489     void (RenderStyle::*m_setter)(PassRefPtr<T>);
     489    void (RenderStyle::*m_setter)(RefPtr<T>&&);
    490490};
    491491
    … …  
    512512    WTF_MAKE_FAST_ALLOCATED;
    513513public:
    514     PropertyWrapperClipPath(CSSPropertyID prop, ClipPathOperation* (RenderStyle::*getter)() const, void (RenderStyle::*setter)(PassRefPtr<ClipPathOperation>))
     514    PropertyWrapperClipPath(CSSPropertyID prop, ClipPathOperation* (RenderStyle::*getter)() const, void (RenderStyle::*setter)(RefPtr<ClipPathOperation>&&))
    515515        : RefCountedPropertyWrapper<ClipPathOperation>(prop, getter, setter)
    516516    {
    … …  
    564564    WTF_MAKE_FAST_ALLOCATED;
    565565public:
    566     PropertyWrapperShape(CSSPropertyID prop, ShapeValue* (RenderStyle::*getter)() const, void (RenderStyle::*setter)(PassRefPtr<ShapeValue>))
     566    PropertyWrapperShape(CSSPropertyID prop, ShapeValue* (RenderStyle::*getter)() const, void (RenderStyle::*setter)(RefPtr<ShapeValue>&&))
    567567        : RefCountedPropertyWrapper<ShapeValue>(prop, getter, setter)
    568568    {
    … …  
    591591    WTF_MAKE_FAST_ALLOCATED;
    592592public:
    593     StyleImagePropertyWrapper(CSSPropertyID prop, StyleImage* (RenderStyle::*getter)() const, void (RenderStyle::*setter)(PassRefPtr<StyleImage>))
     593    StyleImagePropertyWrapper(CSSPropertyID prop, StyleImage* (RenderStyle::*getter)() const, void (RenderStyle::*setter)(RefPtr<StyleImage>&&))
    594594        : RefCountedPropertyWrapper<StyleImage>(prop, getter, setter)
    595595    {
    … …  
    10151015    WTF_MAKE_FAST_ALLOCATED;
    10161016public:
    1017     FillLayerRefCountedPropertyWrapper(T* (FillLayer::*getter)() const, void (FillLayer::*setter)(PassRefPtr<T>))
     1017    FillLayerRefCountedPropertyWrapper(T* (FillLayer::*getter)() const, void (FillLayer::*setter)(RefPtr<T>&&))
    10181018        : FillLayerPropertyWrapperGetter<T*>(getter)
    10191019        , m_setter(setter)
    … …  
    10271027
    10281028protected:
    1029     void (FillLayer::*m_setter)(PassRefPtr<T>);
     1029    void (FillLayer::*m_setter)(RefPtr<T>&&);
    10301030};
    10311031
    … …  
    10331033    WTF_MAKE_FAST_ALLOCATED;
    10341034public:
    1035     FillLayerStyleImagePropertyWrapper(StyleImage* (FillLayer::*getter)() const, void (FillLayer::*setter)(PassRefPtr<StyleImage>))
     1035    FillLayerStyleImagePropertyWrapper(StyleImage* (FillLayer::*getter)() const, void (FillLayer::*setter)(RefPtr<StyleImage>&&))
    10361036        : FillLayerRefCountedPropertyWrapper<StyleImage>(getter, setter)
    10371037    {

  • trunk/Source/WebCore/platform/PopupMenuClient.h

    r180474 r207814  
    7575    virtual HostWindow* hostWindow() const = 0;
    7676
    77     virtual PassRefPtr<Scrollbar> createScrollbar(ScrollableArea&, ScrollbarOrientation, ScrollbarControlSize) = 0;
     77    virtual Ref<Scrollbar> createScrollbar(ScrollableArea&, ScrollbarOrientation, ScrollbarControlSize) = 0;
    7878};
    7979

  • trunk/Source/WebCore/platform/ScrollView.cpp

    r203644 r207814  
    119119}
    120120
    121 PassRefPtr<Scrollbar> ScrollView::createScrollbar(ScrollbarOrientation orientation)
     121Ref<Scrollbar> ScrollView::createScrollbar(ScrollbarOrientation orientation)
    122122{
    123123    return Scrollbar::createNativeScrollbar(*this, orientation, RegularScrollbar);

  • trunk/Source/WebCore/platform/ScrollView.h

    r204717 r207814  
    141141
    142142    // Overridden by FrameView to create custom CSS scrollbars if applicable.
    143     virtual PassRefPtr<Scrollbar> createScrollbar(ScrollbarOrientation);
     143    virtual Ref<Scrollbar> createScrollbar(ScrollbarOrientation);
    144144
    145145    void styleDidChange();

  • trunk/Source/WebCore/platform/Scrollbar.cpp

    r198841 r207814  
    4444namespace WebCore {
    4545
    46 PassRefPtr<Scrollbar> Scrollbar::createNativeScrollbar(ScrollableArea& scrollableArea, ScrollbarOrientation orientation, ScrollbarControlSize size)
    47 {
    48     return adoptRef(new Scrollbar(scrollableArea, orientation, size));
     46Ref<Scrollbar> Scrollbar::createNativeScrollbar(ScrollableArea& scrollableArea, ScrollbarOrientation orientation, ScrollbarControlSize size)
     47{
     48    return adoptRef(*new Scrollbar(scrollableArea, orientation, size));
    4949}
    5050

  • trunk/Source/WebCore/platform/Scrollbar.h

    r197563 r207814  
    3030#include "Timer.h"
    3131#include "Widget.h"
    32 #include <wtf/PassRefPtr.h>
    3332#include <wtf/WeakPtr.h>
    3433
    … …  
    4443public:
    4544    // Must be implemented by platforms that can't simply use the Scrollbar base class.  Right now the only platform that is not using the base class is GTK.
    46     WEBCORE_EXPORT static PassRefPtr<Scrollbar> createNativeScrollbar(ScrollableArea&, ScrollbarOrientation, ScrollbarControlSize);
     45    WEBCORE_EXPORT static Ref<Scrollbar> createNativeScrollbar(ScrollableArea&, ScrollbarOrientation, ScrollbarControlSize);
    4746
    4847    virtual ~Scrollbar();

  • trunk/Source/WebCore/rendering/FilterEffectRenderer.cpp

    r207357 r207814  
    8686}
    8787
    88 PassRefPtr<FilterEffect> FilterEffectRenderer::buildReferenceFilter(RenderElement* renderer, PassRefPtr<FilterEffect> previousEffect, ReferenceFilterOperation* filterOperation)
     88RefPtr<FilterEffect> FilterEffectRenderer::buildReferenceFilter(RenderElement* renderer, PassRefPtr<FilterEffect> previousEffect, ReferenceFilterOperation* filterOperation)
    8989{
    9090    if (!renderer)

  • trunk/Source/WebCore/rendering/FilterEffectRenderer.h

    r207357 r207814  
    3737#include "SVGFilterBuilder.h"
    3838#include "SourceGraphic.h"
    39 #include <wtf/PassRefPtr.h>
    4039#include <wtf/RefCounted.h>
    4140#include <wtf/RefPtr.h>
    … …  
    109108
    110109    bool build(RenderElement*, const FilterOperations&, FilterConsumer);
    111     PassRefPtr<FilterEffect> buildReferenceFilter(RenderElement*, PassRefPtr<FilterEffect> previousEffect, ReferenceFilterOperation*);
     110    RefPtr<FilterEffect> buildReferenceFilter(RenderElement*, PassRefPtr<FilterEffect> previousEffect, ReferenceFilterOperation*);
    112111    bool updateBackingStoreRect(const FloatRect& filterRect);
    113112    void allocateBackingStoreIfNeeded(const GraphicsContext&);

  • trunk/Source/WebCore/rendering/RenderLayer.cpp

    r207458 r207814  
    31063106}
    31073107
    3108 PassRefPtr<Scrollbar> RenderLayer::createScrollbar(ScrollbarOrientation orientation)
     3108Ref<Scrollbar> RenderLayer::createScrollbar(ScrollbarOrientation orientation)
    31093109{
    31103110    RefPtr<Scrollbar> widget;
    … …  
    31223122    }
    31233123    renderer().view().frameView().addChild(widget.get());
    3124     return WTFMove(widget);
     3124    return widget.releaseNonNull();
    31253125}
    31263126
    … …  
    49274927}
    49284928
    4929 PassRefPtr<HitTestingTransformState> RenderLayer::createLocalTransformState(RenderLayer* rootLayer, RenderLayer* containerLayer,
     4929Ref<HitTestingTransformState> RenderLayer::createLocalTransformState(RenderLayer* rootLayer, RenderLayer* containerLayer,
    49304930                                        const LayoutRect& hitTestRect, const HitTestLocation& hitTestLocation,
    49314931                                        const HitTestingTransformState* containerTransformState,
    … …  
    49554955    }
    49564956   
    4957     return transformState;
     4957    return transformState.releaseNonNull();
    49584958}
    49594959
    … …  
    53095309{
    53105310    // Create a transform state to accumulate this transform.
    5311     RefPtr<HitTestingTransformState> newTransformState = createLocalTransformState(rootLayer, containerLayer, hitTestRect, hitTestLocation, transformState, translationOffset);
     5311    Ref<HitTestingTransformState> newTransformState = createLocalTransformState(rootLayer, containerLayer, hitTestRect, hitTestLocation, transformState, translationOffset);
    53125312
    53135313    // If the transform can't be inverted, then don't hit test this layer at all.
    … …  
    53315331
    53325332    // Now do a hit test with the root layer shifted to be us.
    5333     return hitTestLayer(this, containerLayer, request, result, localHitTestRect, newHitTestLocation, true, newTransformState.get(), zOffset);
     5333    return hitTestLayer(this, containerLayer, request, result, localHitTestRect, newHitTestLocation, true, newTransformState.ptr(), zOffset);
    53345334}
    53355335

  • trunk/Source/WebCore/rendering/RenderLayer.h

    r206639 r207814  
    214214    void setHasVerticalScrollbar(bool);
    215215
    216     PassRefPtr<Scrollbar> createScrollbar(ScrollbarOrientation);
     216    Ref<Scrollbar> createScrollbar(ScrollbarOrientation);
    217217    void destroyScrollbar(ScrollbarOrientation);
    218218
    … …  
    831831        bool depthSortDescendants);
    832832
    833     PassRefPtr<HitTestingTransformState> createLocalTransformState(RenderLayer* rootLayer, RenderLayer* containerLayer,
     833    Ref<HitTestingTransformState> createLocalTransformState(RenderLayer* rootLayer, RenderLayer* containerLayer,
    834834        const LayoutRect& hitTestRect, const HitTestLocation&,
    835835        const HitTestingTransformState* containerTransformState,

  • trunk/Source/WebCore/rendering/RenderListBox.cpp

    r202242 r207814  
    897897}
    898898
    899 PassRefPtr<Scrollbar> RenderListBox::createScrollbar()
     899Ref<Scrollbar> RenderListBox::createScrollbar()
    900900{
    901901    RefPtr<Scrollbar> widget;
    … …  
    912912    }
    913913    view().frameView().addChild(widget.get());
    914     return WTFMove(widget);
     914    return widget.releaseNonNull();
    915915}
    916916

  • trunk/Source/WebCore/rendering/RenderListBox.h

    r200342 r207814  
    148148
    149149    void setHasVerticalScrollbar(bool hasScrollbar);
    150     PassRefPtr<Scrollbar> createScrollbar();
     150    Ref<Scrollbar> createScrollbar();
    151151    void destroyScrollbar();
    152152   

  • trunk/Source/WebCore/rendering/RenderMenuList.cpp

    r205282 r207814  
    571571}
    572572
    573 PassRefPtr<Scrollbar> RenderMenuList::createScrollbar(ScrollableArea& scrollableArea, ScrollbarOrientation orientation, ScrollbarControlSize controlSize)
    574 {
    575     RefPtr<Scrollbar> widget;
     573Ref<Scrollbar> RenderMenuList::createScrollbar(ScrollableArea& scrollableArea, ScrollbarOrientation orientation, ScrollbarControlSize controlSize)
     574{
    576575    bool hasCustomScrollbarStyle = style().hasPseudoStyle(SCROLLBAR);
    577576    if (hasCustomScrollbarStyle)
    578         widget = RenderScrollbar::createCustomScrollbar(scrollableArea, orientation, &selectElement());
    579     else
    580         widget = Scrollbar::createNativeScrollbar(scrollableArea, orientation, controlSize);
    581     return WTFMove(widget);
     577        return RenderScrollbar::createCustomScrollbar(scrollableArea, orientation, &selectElement());
     578    return Scrollbar::createNativeScrollbar(scrollableArea, orientation, controlSize);
    582579}
    583580

  • trunk/Source/WebCore/rendering/RenderMenuList.h

    r200041 r207814  
    114114    FontSelector* fontSelector() const override;
    115115    HostWindow* hostWindow() const override;
    116     PassRefPtr<Scrollbar> createScrollbar(ScrollableArea&, ScrollbarOrientation, ScrollbarControlSize) override;
     116    Ref<Scrollbar> createScrollbar(ScrollableArea&, ScrollbarOrientation, ScrollbarControlSize) override;
    117117
    118118    bool hasLineIfEmpty() const override { return true; }

  • trunk/Source/WebCore/rendering/RenderScrollbar.cpp

    r200041 r207814  
    3737namespace WebCore {
    3838
    39 RefPtr<Scrollbar> RenderScrollbar::createCustomScrollbar(ScrollableArea& scrollableArea, ScrollbarOrientation orientation, Element* ownerElement, Frame* owningFrame)
    40 {
    41     return adoptRef(new RenderScrollbar(scrollableArea, orientation, ownerElement, owningFrame));
     39Ref<Scrollbar> RenderScrollbar::createCustomScrollbar(ScrollableArea& scrollableArea, ScrollbarOrientation orientation, Element* ownerElement, Frame* owningFrame)
     40{
     41    return adoptRef(*new RenderScrollbar(scrollableArea, orientation, ownerElement, owningFrame));
    4242}
    4343

  • trunk/Source/WebCore/rendering/RenderScrollbar.h

    r199964 r207814  
    4343public:
    4444    friend class Scrollbar;
    45     static RefPtr<Scrollbar> createCustomScrollbar(ScrollableArea&, ScrollbarOrientation, Element*, Frame* owningFrame = nullptr);
     45    static Ref<Scrollbar> createCustomScrollbar(ScrollableArea&, ScrollbarOrientation, Element*, Frame* owningFrame = nullptr);
    4646    virtual ~RenderScrollbar();
    4747

  • trunk/Source/WebCore/rendering/RenderSearchField.cpp

    r203324 r207814  
    347347}
    348348
    349 PassRefPtr<Scrollbar> RenderSearchField::createScrollbar(ScrollableArea& scrollableArea, ScrollbarOrientation orientation, ScrollbarControlSize controlSize)
    350 {
    351     RefPtr<Scrollbar> widget;
     349Ref<Scrollbar> RenderSearchField::createScrollbar(ScrollableArea& scrollableArea, ScrollbarOrientation orientation, ScrollbarControlSize controlSize)
     350{
    352351    bool hasCustomScrollbarStyle = style().hasPseudoStyle(SCROLLBAR);
    353352    if (hasCustomScrollbarStyle)
    354         widget = RenderScrollbar::createCustomScrollbar(scrollableArea, orientation, &inputElement());
    355     else
    356         widget = Scrollbar::createNativeScrollbar(scrollableArea, orientation, controlSize);
    357     return WTFMove(widget);
     353        return RenderScrollbar::createCustomScrollbar(scrollableArea, orientation, &inputElement());
     354    return Scrollbar::createNativeScrollbar(scrollableArea, orientation, controlSize);
    358355}
    359356

  • trunk/Source/WebCore/rendering/RenderSearchField.h

    r200041 r207814  
    8181    FontSelector* fontSelector() const override;
    8282    HostWindow* hostWindow() const override;
    83     PassRefPtr<Scrollbar> createScrollbar(ScrollableArea&, ScrollbarOrientation, ScrollbarControlSize) override;
     83    Ref<Scrollbar> createScrollbar(ScrollableArea&, ScrollbarOrientation, ScrollbarControlSize) override;
    8484
    8585    HTMLElement* resultsButtonElement() const;

  • trunk/Source/WebCore/rendering/RenderTheme.h

    r207423 r207814  
    3535#include "PopupMenuStyle.h"
    3636#include "ScrollTypes.h"
    37 #include <wtf/PassRefPtr.h>
     37#include <wtf/Ref.h>
    3838#include <wtf/RefCounted.h>
    3939
    … …  
    6868    // appropriate platform theme. When the theme is needed in non-page dependent code, a default theme is
    6969    // used as fallback, which is returned for a nulled page, so the platform code needs to account for this.
    70     static PassRefPtr<RenderTheme> themeForPage(Page* page);
     70    static Ref<RenderTheme> themeForPage(Page*);
    7171
    7272    // When the theme is needed in non-page dependent code, the defaultTheme() is used as fallback.
    73     static inline PassRefPtr<RenderTheme> defaultTheme()
     73    static inline Ref<RenderTheme> defaultTheme()
    7474    {
    75         return themeForPage(0);
     75        return themeForPage(nullptr);
    7676    };
    7777

  • trunk/Source/WebCore/rendering/RenderThemeEfl.cpp

    r207455 r207814  
    411411}
    412412
    413 PassRefPtr<RenderTheme> RenderThemeEfl::create(Page* page)
    414 {
    415     return adoptRef(new RenderThemeEfl(page));
    416 }
    417 
    418 PassRefPtr<RenderTheme> RenderTheme::themeForPage(Page* page)
     413Ref<RenderTheme> RenderThemeEfl::create(Page* page)
     414{
     415    return adoptRef(*new RenderThemeEfl(page));
     416}
     417
     418Ref<RenderTheme> RenderTheme::themeForPage(Page* page)
    419419{
    420420    if (page)
    421421        return RenderThemeEfl::create(page);
    422422
    423     static RenderTheme* fallback = RenderThemeEfl::create(0).leakRef();
     423    static RenderTheme& fallback = RenderThemeEfl::create(0).leakRef();
    424424    return fallback;
    425425}

  • trunk/Source/WebCore/rendering/RenderThemeEfl.h

    r199640 r207814  
    6868
    6969public:
    70     static PassRefPtr<RenderTheme> create(Page*);
     70    static Ref<RenderTheme> create(Page*);
    7171
    7272    // A method asking if the theme's controls actually care about redrawing when hovered.

  • trunk/Source/WebCore/rendering/RenderThemeGtk.cpp

    r204717 r207814  
    6868}
    6969
    70 PassRefPtr<RenderTheme> RenderTheme::themeForPage(Page*)
     70Ref<RenderTheme> RenderTheme::themeForPage(Page*)
    7171{
    7272    static RenderTheme& rt = RenderThemeGtk::create().leakRef();
    73     return &rt;
     73    return rt;
    7474}
    7575

  • trunk/Source/WebCore/rendering/RenderThemeIOS.mm

    r207265 r207814  
    295295}
    296296
    297 PassRefPtr<RenderTheme> RenderTheme::themeForPage(Page*)
     297Ref<RenderTheme> RenderTheme::themeForPage(Page*)
    298298{
    299299    static RenderTheme& renderTheme = RenderThemeIOS::create().leakRef();
    300     return &renderTheme;
     300    return renderTheme;
    301301}
    302302

  • trunk/Source/WebCore/rendering/RenderThemeMac.mm

    r207758 r207814  
    198198};
    199199
    200 PassRefPtr<RenderTheme> RenderTheme::themeForPage(Page*)
     200Ref<RenderTheme> RenderTheme::themeForPage(Page*)
    201201{
    202202    static RenderTheme& rt = RenderThemeMac::create().leakRef();
    203     return &rt;
     203    return rt;
    204204}
    205205

  • trunk/Source/WebCore/rendering/RenderThemeWin.cpp

    r199640 r207814  
    189189}
    190190
    191 PassRefPtr<RenderTheme> RenderTheme::themeForPage(Page* page)
     191Ref<RenderTheme> RenderTheme::themeForPage(Page* page)
    192192{
    193193    static RenderTheme& winTheme = RenderThemeWin::create().leakRef();
    194     return &winTheme;
     194    return winTheme;
    195195}
    196196

  • trunk/Source/WebCore/rendering/RenderWidget.cpp

    r205510 r207814  
    162162}
    163163
    164 void RenderWidget::setWidget(PassRefPtr<Widget> widget)
     164void RenderWidget::setWidget(RefPtr<Widget>&& widget)
    165165{
    166166    if (widget == m_widget)

  • trunk/Source/WebCore/rendering/RenderWidget.h

    r200041 r207814  
    6464
    6565    Widget* widget() const { return m_widget.get(); }
    66     WEBCORE_EXPORT void setWidget(PassRefPtr<Widget>);
     66    WEBCORE_EXPORT void setWidget(RefPtr<Widget>&&);
    6767
    6868    static RenderWidget* find(const Widget*);

  • trunk/Source/WebCore/rendering/style/CursorData.h

    r136919 r207814  
    3333class CursorData {
    3434public:
    35     CursorData(PassRefPtr<StyleImage> image, const IntPoint& hotSpot)
    36         : m_image(image)
     35    CursorData(RefPtr<StyleImage>&& image, const IntPoint& hotSpot)
     36        : m_image(WTFMove(image))
    3737        , m_hotSpot(hotSpot)
    3838    {
    … …  
    5050
    5151    StyleImage* image() const { return m_image.get(); }   
    52     void setImage(PassRefPtr<StyleImage> image) { m_image = image; }   
     52    void setImage(RefPtr<StyleImage>&& image) { m_image = WTFMove(image); }
    5353
    5454    // Hot spot in the image in logical pixels.

  • trunk/Source/WebCore/rendering/style/FillLayer.h

    r196960 r207814  
    102102    bool isMaskSourceTypeSet() const { return m_maskSourceTypeSet; }
    103103
    104     void setImage(PassRefPtr<StyleImage> image) { m_image = image; m_imageSet = true; }
     104    void setImage(RefPtr<StyleImage>&& image) { m_image = WTFMove(image); m_imageSet = true; }
    105105    void setXPosition(Length length) { m_xPosition = WTFMove(length); m_xPosSet = true; }
    106106    void setYPosition(Length length) { m_yPosition = WTFMove(length); m_yPosSet = true; }

  • trunk/Source/WebCore/rendering/style/QuotesData.cpp

    r157653 r207814  
    3030}
    3131
    32 PassRefPtr<QuotesData> QuotesData::create(const Vector<std::pair<String, String>>& quotes)
     32Ref<QuotesData> QuotesData::create(const Vector<std::pair<String, String>>& quotes)
    3333{
    3434    void* slot = fastMalloc(sizeForQuotesDataWithQuoteCount(quotes.size()));
    35     return adoptRef(new (NotNull, slot) QuotesData(quotes));
     35    return adoptRef(*new (NotNull, slot) QuotesData(quotes));
    3636}
    3737

  • trunk/Source/WebCore/rendering/style/QuotesData.h

    r157653 r207814  
    2323#define QuotesData_h
    2424
    25 #include <wtf/PassRefPtr.h>
    2625#include <wtf/RefCounted.h>
    2726#include <wtf/Vector.h>
    … …  
    3736class QuotesData : public RefCounted<QuotesData> {
    3837public:
    39     static PassRefPtr<QuotesData> create(const Vector<std::pair<String, String>>& quotes);
     38    static Ref<QuotesData> create(const Vector<std::pair<String, String>>& quotes);
    4039    ~QuotesData();
    4140

  • trunk/Source/WebCore/rendering/style/RenderStyle.cpp

    r207499 r207814  
    946946}
    947947
    948 void RenderStyle::addCursor(PassRefPtr<StyleImage> image, const IntPoint& hotSpot)
     948void RenderStyle::addCursor(RefPtr<StyleImage>&& image, const IntPoint& hotSpot)
    949949{
    950950    if (!rareInheritedData.access()->cursorData)
    951951        rareInheritedData.access()->cursorData = CursorList::create();
    952     rareInheritedData.access()->cursorData->append(CursorData(image, hotSpot));
    953 }
    954 
    955 void RenderStyle::setCursorList(PassRefPtr<CursorList> other)
    956 {
    957     rareInheritedData.access()->cursorData = other;
    958 }
    959 
    960 void RenderStyle::setQuotes(PassRefPtr<QuotesData> q)
     952    rareInheritedData.access()->cursorData->append(CursorData(WTFMove(image), hotSpot));
     953}
     954
     955void RenderStyle::setCursorList(RefPtr<CursorList>&& list)
     956{
     957    rareInheritedData.access()->cursorData = WTFMove(list);
     958}
     959
     960void RenderStyle::setQuotes(RefPtr<QuotesData>&& q)
    961961{
    962962    if (rareInheritedData->quotes == q || (rareInheritedData->quotes && q && *rareInheritedData->quotes == *q))
    963963        return;
    964964
    965     rareInheritedData.access()->quotes = q;
    966 }
    967 
    968 void RenderStyle::setWillChange(PassRefPtr<WillChangeData> willChangeData)
     965    rareInheritedData.access()->quotes = WTFMove(q);
     966}
     967
     968void RenderStyle::setWillChange(RefPtr<WillChangeData>&& willChangeData)
    969969{
    970970    if (arePointingToEqualData(rareNonInheritedData->m_willChange.get(), willChangeData.get()))
    … …  
    999999}
    10001000
    1001 void RenderStyle::setContent(PassRefPtr<StyleImage> image, bool add)
     1001void RenderStyle::setContent(RefPtr<StyleImage>&& image, bool add)
    10021002{
    10031003    if (!image)
    … …  
    10091009    }
    10101010
    1011     rareNonInheritedData.access()->m_content = std::make_unique<ImageContentData>(image);
     1011    rareNonInheritedData.access()->m_content = std::make_unique<ImageContentData>(WTFMove(image));
    10121012    if (!rareNonInheritedData.access()->m_altText.isNull())
    10131013        rareNonInheritedData.access()->m_content->setAltText(rareNonInheritedData.access()->m_altText);
    … …  
    11801180
    11811181StyleImage* RenderStyle::listStyleImage() const { return rareInheritedData->listStyleImage.get(); }
    1182 void RenderStyle::setListStyleImage(PassRefPtr<StyleImage> v)
     1182void RenderStyle::setListStyleImage(RefPtr<StyleImage>&& v)
    11831183{
    11841184    if (rareInheritedData->listStyleImage != v)
    1185         rareInheritedData.access()->listStyleImage = v;
     1185        rareInheritedData.access()->listStyleImage = WTFMove(v);
    11861186}
    11871187
    … …  
    18801880}
    18811881
    1882 void RenderStyle::setBorderImageSource(PassRefPtr<StyleImage> image)
     1882void RenderStyle::setBorderImageSource(RefPtr<StyleImage>&& image)
    18831883{
    18841884    if (surround->border.m_image.image() == image.get())
    18851885        return;
    1886     surround.access()->border.m_image.setImage(image);
     1886    surround.access()->border.m_image.setImage(WTFMove(image));
    18871887}
    18881888

  • trunk/Source/WebCore/rendering/style/RenderStyle.h

    r207757 r207814  
    13041304   
    13051305    void setBorderImage(const NinePieceImage& b) { SET_VAR(surround, border.m_image, b); }
    1306     void setBorderImageSource(PassRefPtr<StyleImage>);
     1306    void setBorderImageSource(RefPtr<StyleImage>&&);
    13071307    void setBorderImageSlices(LengthBox);
    13081308    void setBorderImageWidth(LengthBox);
    … …  
    14441444    }
    14451445
    1446     void setMaskImage(PassRefPtr<StyleImage> v) { rareNonInheritedData.access()->m_mask.setImage(v); }
     1446    void setMaskImage(RefPtr<StyleImage>&& v) { rareNonInheritedData.access()->m_mask.setImage(WTFMove(v)); }
    14471447
    14481448    void setMaskBoxImage(const NinePieceImage& b) { SET_VAR(rareNonInheritedData, m_maskBoxImage, b); }
    1449     void setMaskBoxImageSource(PassRefPtr<StyleImage> v) { rareNonInheritedData.access()->m_maskBoxImage.setImage(v); }
     1449    void setMaskBoxImageSource(RefPtr<StyleImage>&& v) { rareNonInheritedData.access()->m_maskBoxImage.setImage(WTFMove(v)); }
    14501450    void setMaskXPosition(Length length) { SET_VAR(rareNonInheritedData, m_mask.m_xPosition, WTFMove(length)); }
    14511451    void setMaskYPosition(Length length) { SET_VAR(rareNonInheritedData, m_mask.m_yPosition, WTFMove(length)); }
    … …  
    14631463
    14641464    void setListStyleType(EListStyleType v) { inherited_flags._list_style_type = v; }
    1465     void setListStyleImage(PassRefPtr<StyleImage>);
     1465    void setListStyleImage(RefPtr<StyleImage>&&);
    14661466    void setListStylePosition(EListStylePosition v) { inherited_flags._list_style_position = v; }
    14671467
    … …  
    14821482
    14831483    void setCursor(ECursor c) { inherited_flags._cursor_style = c; }
    1484     void addCursor(PassRefPtr<StyleImage>, const IntPoint& hotSpot = IntPoint());
    1485     void setCursorList(PassRefPtr<CursorList>);
     1484    void addCursor(RefPtr<StyleImage>&&, const IntPoint& hotSpot = IntPoint());
     1485    void setCursorList(RefPtr<CursorList>&&);
    14861486    void clearCursorList();
    14871487
    … …  
    15301530    void setBoxPack(EBoxPack p) { SET_NESTED_VAR(rareNonInheritedData, m_deprecatedFlexibleBox, pack, p); }
    15311531    void setBoxShadow(std::unique_ptr<ShadowData>, bool add = false);
    1532     void setBoxReflect(PassRefPtr<StyleReflection> reflect) { if (rareNonInheritedData->m_boxReflect != reflect) rareNonInheritedData.access()->m_boxReflect = reflect; }
     1532    void setBoxReflect(RefPtr<StyleReflection>&& reflect) { if (rareNonInheritedData->m_boxReflect != reflect) rareNonInheritedData.access()->m_boxReflect = WTFMove(reflect); }
    15331533    void setBoxSizing(EBoxSizing s) { SET_VAR(m_box, m_boxSizing, s); }
    15341534    void setFlexGrow(float f) { SET_NESTED_VAR(rareNonInheritedData, m_flexibleBox, m_flexGrow, f); }
    … …  
    17941794    void setKerning(SVGLength k) { accessSVGStyle().setKerning(k); }
    17951795
    1796     void setShapeOutside(PassRefPtr<ShapeValue> value)
     1796    void setShapeOutside(RefPtr<ShapeValue>&& value)
    17971797    {
    17981798        if (rareNonInheritedData->m_shapeOutside == value)
    17991799            return;
    1800         rareNonInheritedData.access()->m_shapeOutside = value;
     1800        rareNonInheritedData.access()->m_shapeOutside = WTFMove(value);
    18011801    }
    18021802    ShapeValue* shapeOutside() const { return rareNonInheritedData->m_shapeOutside.get(); }
    … …  
    18161816    static float initialShapeImageThreshold() { return 0; }
    18171817
    1818     void setClipPath(PassRefPtr<ClipPathOperation> operation)
     1818    void setClipPath(RefPtr<ClipPathOperation>&& operation)
    18191819    {
    18201820        if (rareNonInheritedData->m_clipPath != operation)
    1821             rareNonInheritedData.access()->m_clipPath = operation;
     1821            rareNonInheritedData.access()->m_clipPath = WTFMove(operation);
    18221822    }
    18231823    ClipPathOperation* clipPath() const { return rareNonInheritedData->m_clipPath.get(); }
    … …  
    18301830    void clearContent();
    18311831    void setContent(const String&, bool add = false);
    1832     void setContent(PassRefPtr<StyleImage>, bool add = false);
     1832    void setContent(RefPtr<StyleImage>&&, bool add = false);
    18331833    void setContent(std::unique_ptr<CounterContent>, bool add = false);
    18341834    void setContent(QuoteType, bool add = false);
    … …  
    18431843
    18441844    QuotesData* quotes() const { return rareInheritedData->quotes.get(); }
    1845     void setQuotes(PassRefPtr<QuotesData>);
     1845    void setQuotes(RefPtr<QuotesData>&&);
    18461846
    18471847    WillChangeData* willChange() const { return rareNonInheritedData->m_willChange.get(); }
    1848     void setWillChange(PassRefPtr<WillChangeData>);
     1848    void setWillChange(RefPtr<WillChangeData>&&);
    18491849
    18501850    bool willChangeCreatesStackingContext() const

  • trunk/Source/WebCore/rendering/style/StyleCachedImage.cpp

    r206867 r207814  
    9797}
    9898
    99 PassRefPtr<CSSValue> StyleCachedImage::cssValue() const
    100 {
    101     return const_cast<CSSValue*>(m_cssValue.ptr());
     99Ref<CSSValue> StyleCachedImage::cssValue() const
     100{
     101    return const_cast<CSSValue&>(m_cssValue.get());
    102102}
    103103

  • trunk/Source/WebCore/rendering/style/StyleCachedImage.h

    r205997 r207814  
    4747    WrappedImagePtr data() const override { return m_cachedImage.get(); }
    4848
    49     PassRefPtr<CSSValue> cssValue() const override;
     49    Ref<CSSValue> cssValue() const override;
    5050   
    5151    bool canRender(const RenderElement*, float multiplier) const override;

  • trunk/Source/WebCore/rendering/style/StyleGeneratedImage.cpp

    r205419 r207814  
    3838}
    3939
    40 PassRefPtr<CSSValue> StyleGeneratedImage::cssValue() const
     40Ref<CSSValue> StyleGeneratedImage::cssValue() const
    4141{
    42     return const_cast<CSSImageGeneratorValue*>(m_imageGeneratorValue.ptr());
     42    return const_cast<CSSImageGeneratorValue&>(m_imageGeneratorValue.get());
    4343}
    4444

  • trunk/Source/WebCore/rendering/style/StyleGeneratedImage.h

    r205419 r207814  
    4646    WrappedImagePtr data() const override { return m_imageGeneratorValue.ptr(); }
    4747
    48     PassRefPtr<CSSValue> cssValue() const override;
     48    Ref<CSSValue> cssValue() const override;
    4949
    5050    bool isPending() const override;

  • trunk/Source/WebCore/rendering/style/StyleImage.h

    r205997 r207814  
    2828#include "FloatSize.h"
    2929#include "Image.h"
    30 #include <wtf/PassRefPtr.h>
    3130#include <wtf/RefCounted.h>
    3231#include <wtf/RefPtr.h>
    … …  
    5049    virtual bool operator==(const StyleImage& other) const = 0;
    5150
    52     virtual PassRefPtr<CSSValue> cssValue() const = 0;
     51    virtual Ref<CSSValue> cssValue() const = 0;
    5352
    5453    virtual bool canRender(const RenderElement*, float /*multiplier*/) const { return true; }

  • trunk/Source/WebCore/rendering/style/StyleMultiColData.h

    r195892 r207814  
    2929#include "Length.h"
    3030#include "RenderStyleConstants.h"
    31 #include <wtf/PassRefPtr.h>
    3231#include <wtf/RefCounted.h>
    3332

  • trunk/Source/WebCore/rendering/style/StyleRareInheritedData.h

    r206395 r207814  
    3131#include "StyleCustomPropertyData.h"
    3232#include <wtf/RefCounted.h>
    33 #include <wtf/PassRefPtr.h>
    3433#include <wtf/text/AtomicString.h>
    3534

  • trunk/Source/WebKit2/ChangeLog

    r207813 r207814  
     12016-10-25  Andreas Kling  <akling@apple.com>
     2
     3        More PassRefPtr purging in WebCore.
     4        <https://webkit.org/b/163895>
     5
     6        Reviewed by Antti Koivisto.
     7
     8        * WebProcess/Plugins/PDF/DeprecatedPDFPlugin.h:
     9        * WebProcess/Plugins/PDF/DeprecatedPDFPlugin.mm:
     10        (WebKit::PDFPlugin::createScrollbar):
     11
    1122016-10-25  Carlos Garcia Campos  <cgarcia@igalia.com>
    213

  • trunk/Source/WebKit2/WebProcess/Plugins/PDF/DeprecatedPDFPlugin.h

    r200611 r207814  
    219219    // PDFPlugin functions.
    220220    void updateScrollbars();
    221     PassRefPtr<WebCore::Scrollbar> createScrollbar(WebCore::ScrollbarOrientation);
     221    Ref<WebCore::Scrollbar> createScrollbar(WebCore::ScrollbarOrientation);
    222222    void destroyScrollbar(WebCore::ScrollbarOrientation);
    223223    void pdfDocumentDidLoad();

  • trunk/Source/WebKit2/WebProcess/Plugins/PDF/DeprecatedPDFPlugin.mm

    r203302 r207814  
    650650}
    651651
    652 PassRefPtr<Scrollbar> PDFPlugin::createScrollbar(ScrollbarOrientation orientation)
     652Ref<Scrollbar> PDFPlugin::createScrollbar(ScrollbarOrientation orientation)
    653653{
    654654    auto widget = Scrollbar::createNativeScrollbar(*this, orientation, RegularScrollbar);
    … …  
    660660        [m_containerLayer addSublayer:m_verticalScrollbarLayer.get()];
    661661    }
    662     didAddScrollbar(widget.get(), orientation);
     662    didAddScrollbar(widget.ptr(), orientation);
    663663    if (Frame* frame = webFrame()->coreFrame()) {
    664664        if (Page* page = frame->page()) {
    … …  
    667667        }
    668668    }
    669     pluginView()->frame()->view()->addChild(widget.get());
     669    pluginView()->frame()->view()->addChild(widget.ptr());
    670670    return widget;
    671671}
Note: See TracChangeset for help on using the changeset viewer.