Skip to content

Commit

Permalink
More PassRefPtr purging in WebCore.
Browse files Browse the repository at this point in the history 
<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):


Canonical link: https://commits.webkit.org/181671@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@207814 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
Andreas Kling committed Oct 25, 2016
1 parent 2516da3 commit e8afd66
Show file tree
Hide file tree
Showing 52 changed files with 240 additions and 140 deletions.
112 changes: 112 additions & 0 deletions Source/WebCore/ChangeLog
View file
@@ -1,3 +1,115 @@
2016-10-25 Andreas Kling <akling@apple.com>

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

Reviewed by Antti Koivisto.

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:

2016-10-24 Ryosuke Niwa <rniwa@webkit.org>

Custom elements reactions should have a queue per element
Expand Down
8 changes: 4 additions & 4 deletions Source/WebCore/css/CSSComputedStyleDeclaration.cpp
View file
Expand Up @@ -1861,7 +1861,7 @@ static Ref<CSSValueList> contentToCSSValue(const RenderStyle* style)
if (is<CounterContentData>(*contentData))
list.get().append(cssValuePool.createValue(downcast<CounterContentData>(*contentData).counter().identifier(), CSSPrimitiveValue::CSS_COUNTER_NAME));
else if (is<ImageContentData>(*contentData))
list.get().append(*downcast<ImageContentData>(*contentData).image().cssValue());
list.get().append(downcast<ImageContentData>(*contentData).image().cssValue());
else if (is<TextContentData>(*contentData))
list.get().append(cssValuePool.createValue(downcast<TextContentData>(*contentData).text(), CSSPrimitiveValue::CSS_STRING));
}
Expand Down Expand Up @@ -2437,7 +2437,7 @@ static Ref<CSSValue> shapePropertyValue(const RenderStyle& style, const ShapeVal

if (shapeValue->type() == ShapeValue::Type::Image) {
if (shapeValue->image())
return *shapeValue->image()->cssValue();
return shapeValue->image()->cssValue();
return CSSValuePool::singleton().createIdentifierValue(CSSValueNone);
}

Expand Down Expand Up @@ -2584,7 +2584,7 @@ RefPtr<CSSValue> ComputedStyleExtractor::propertyValue(CSSPropertyID propertyID,
RefPtr<CSSValueList> list = CSSValueList::createCommaSeparated();
for (const FillLayer* currLayer = layers; currLayer; currLayer = currLayer->next()) {
if (currLayer->image())
list->append(*currLayer->image()->cssValue());
list->append(currLayer->image()->cssValue());
else
list->append(cssValuePool.createIdentifierValue(CSSValueNone));
}
Expand Down Expand Up @@ -2837,7 +2837,7 @@ RefPtr<CSSValue> ComputedStyleExtractor::propertyValue(CSSPropertyID propertyID,
list = CSSValueList::createCommaSeparated();
for (unsigned i = 0; i < cursors->size(); ++i)
if (StyleImage* image = cursors->at(i).image())
list->append(*image->cssValue());
list->append(image->cssValue());
}
auto value = cssValuePool.createValue(style->cursor());
if (list) {
Expand Down
4 changes: 2 additions & 2 deletions Source/WebCore/css/StyleBuilderConverter.h
View file
Expand Up @@ -86,7 +86,7 @@ class StyleBuilderConverter {
static EResize convertResize(StyleResolver&, CSSValue&);
static int convertMarqueeRepetition(StyleResolver&, CSSValue&);
static int convertMarqueeSpeed(StyleResolver&, CSSValue&);
static PassRefPtr<QuotesData> convertQuotes(StyleResolver&, CSSValue&);
static Ref<QuotesData> convertQuotes(StyleResolver&, CSSValue&);
static TextUnderlinePosition convertTextUnderlinePosition(StyleResolver&, CSSValue&);
static RefPtr<StyleReflection> convertReflection(StyleResolver&, CSSValue&);
static IntSize convertInitialLetter(StyleResolver&, CSSValue&);
Expand Down Expand Up @@ -585,7 +585,7 @@ inline int StyleBuilderConverter::convertMarqueeSpeed(StyleResolver&, CSSValue&
return speed;
}

inline PassRefPtr<QuotesData> StyleBuilderConverter::convertQuotes(StyleResolver&, CSSValue& value)
inline Ref<QuotesData> StyleBuilderConverter::convertQuotes(StyleResolver&, CSSValue& value)
{
if (is<CSSPrimitiveValue>(value)) {
ASSERT(downcast<CSSPrimitiveValue>(value).valueID() == CSSValueNone);
Expand Down
12 changes: 3 additions & 9 deletions Source/WebCore/html/HTMLSelectElement.cpp
View file
Expand Up @@ -196,9 +196,7 @@ void HTMLSelectElement::listBoxSelectItem(int listIndex, bool allowMultiplySelec
bool HTMLSelectElement::usesMenuList() const
{
#if !PLATFORM(IOS)
const Page* page = document().page();
RefPtr<RenderTheme> renderTheme = page ? &page->theme() : RenderTheme::defaultTheme();
if (renderTheme->delegatesMenuListRendering())
if (RenderTheme::themeForPage(document().page())->delegatesMenuListRendering())
return true;

return !m_multiple && m_size <= 1;
Expand Down Expand Up @@ -1092,10 +1090,7 @@ void HTMLSelectElement::reset()

bool HTMLSelectElement::platformHandleKeydownEvent(KeyboardEvent* event)
{
const Page* page = document().page();
RefPtr<RenderTheme> renderTheme = page ? &page->theme() : RenderTheme::defaultTheme();

if (!renderTheme->popsMenuByArrowKeys())
if (!RenderTheme::themeForPage(document().page())->popsMenuByArrowKeys())
return false;

if (!isSpatialNavigationEnabled(document().frame())) {
Expand Down Expand Up @@ -1129,8 +1124,7 @@ void HTMLSelectElement::menuListDefaultEventHandler(Event& event)
ASSERT(renderer());
ASSERT(renderer()->isMenuList());

const Page* page = document().page();
RefPtr<RenderTheme> renderTheme = page ? &page->theme() : RenderTheme::defaultTheme();
RefPtr<RenderTheme> renderTheme = RenderTheme::themeForPage(document().page());

if (event.type() == eventNames().keydownEvent) {
if (!is<KeyboardEvent>(event))
Expand Down
3 changes: 1 addition & 2 deletions Source/WebCore/html/InputType.cpp
View file
Expand Up @@ -173,8 +173,7 @@ InputType::~InputType()
bool InputType::themeSupportsDataListUI(InputType* type)
{
Document& document = type->element().document();
RefPtr<RenderTheme> theme = document.page() ? &document.page()->theme() : RenderTheme::defaultTheme();
return theme->supportsDataListUI(type->formControlType());
return RenderTheme::themeForPage(document.page())->supportsDataListUI(type->formControlType());
}

bool InputType::isTextField() const
Expand Down
8 changes: 2 additions & 6 deletions Source/WebCore/html/TextFieldInputType.cpp
View file
Expand Up @@ -244,16 +244,12 @@ bool TextFieldInputType::needsContainer() const

bool TextFieldInputType::shouldHaveSpinButton() const
{
Document& document = element().document();
RefPtr<RenderTheme> theme = document.page() ? &document.page()->theme() : RenderTheme::defaultTheme();
return theme->shouldHaveSpinButton(element());
return RenderTheme::themeForPage(element().document().page())->shouldHaveSpinButton(element());
}

bool TextFieldInputType::shouldHaveCapsLockIndicator() const
{
Document& document = element().document();
RefPtr<RenderTheme> theme = document.page() ? &document.page()->theme() : RenderTheme::defaultTheme();
return theme->shouldHaveCapsLockIndicator(element());
return RenderTheme::themeForPage(element().document().page())->shouldHaveCapsLockIndicator(element());
}

void TextFieldInputType::createShadowSubtree()
Expand Down
2 changes: 1 addition & 1 deletion Source/WebCore/loader/SubframeLoader.cpp
View file
Expand Up @@ -421,7 +421,7 @@ bool SubframeLoader::loadPlugin(HTMLPlugInImageElement& pluginElement, const URL
}

pluginElement.subframeLoaderDidCreatePlugIn(*widget);
renderer->setWidget(widget);
renderer->setWidget(WTFMove(widget));
m_containsPlugins = true;
return true;
}
Expand Down
2 changes: 1 addition & 1 deletion Source/WebCore/page/FrameView.cpp
View file
Expand Up @@ -609,7 +609,7 @@ void FrameView::updateCanHaveScrollbars()
setCanHaveScrollbars(true);
}

PassRefPtr<Scrollbar> FrameView::createScrollbar(ScrollbarOrientation orientation)
Ref<Scrollbar> FrameView::createScrollbar(ScrollbarOrientation orientation)
{
if (!frame().settings().allowCustomScrollbarInMainFrame() && frame().isMainFrame())
return ScrollView::createScrollbar(orientation);
Expand Down
2 changes: 1 addition & 1 deletion Source/WebCore/page/FrameView.h
View file
Expand Up @@ -98,7 +98,7 @@ class FrameView final : public ScrollView {
WEBCORE_EXPORT void setCanHaveScrollbars(bool) override;
WEBCORE_EXPORT void updateCanHaveScrollbars();

PassRefPtr<Scrollbar> createScrollbar(ScrollbarOrientation) override;
Ref<Scrollbar> createScrollbar(ScrollbarOrientation) override;

bool avoidScrollbarCreation() const override;

Expand Down
16 changes: 8 additions & 8 deletions Source/WebCore/page/animation/CSSPropertyAnimation.cpp
View file
Expand Up @@ -474,7 +474,7 @@ template <typename T>
class RefCountedPropertyWrapper : public PropertyWrapperGetter<T*> {
WTF_MAKE_FAST_ALLOCATED;
public:
RefCountedPropertyWrapper(CSSPropertyID prop, T* (RenderStyle::*getter)() const, void (RenderStyle::*setter)(PassRefPtr<T>))
RefCountedPropertyWrapper(CSSPropertyID prop, T* (RenderStyle::*getter)() const, void (RenderStyle::*setter)(RefPtr<T>&&))
: PropertyWrapperGetter<T*>(prop, getter)
, m_setter(setter)
{
Expand All @@ -486,7 +486,7 @@ class RefCountedPropertyWrapper : public PropertyWrapperGetter<T*> {
}

protected:
void (RenderStyle::*m_setter)(PassRefPtr<T>);
void (RenderStyle::*m_setter)(RefPtr<T>&&);
};

template <typename T>
Expand All @@ -511,7 +511,7 @@ class LengthPropertyWrapper : public PropertyWrapperGetter<const T&> {
class PropertyWrapperClipPath : public RefCountedPropertyWrapper<ClipPathOperation> {
WTF_MAKE_FAST_ALLOCATED;
public:
PropertyWrapperClipPath(CSSPropertyID prop, ClipPathOperation* (RenderStyle::*getter)() const, void (RenderStyle::*setter)(PassRefPtr<ClipPathOperation>))
PropertyWrapperClipPath(CSSPropertyID prop, ClipPathOperation* (RenderStyle::*getter)() const, void (RenderStyle::*setter)(RefPtr<ClipPathOperation>&&))
: RefCountedPropertyWrapper<ClipPathOperation>(prop, getter, setter)
{
}
Expand Down Expand Up @@ -563,7 +563,7 @@ class PropertyWrapperFontVariationSettings : public PropertyWrapper<FontVariatio
class PropertyWrapperShape : public RefCountedPropertyWrapper<ShapeValue> {
WTF_MAKE_FAST_ALLOCATED;
public:
PropertyWrapperShape(CSSPropertyID prop, ShapeValue* (RenderStyle::*getter)() const, void (RenderStyle::*setter)(PassRefPtr<ShapeValue>))
PropertyWrapperShape(CSSPropertyID prop, ShapeValue* (RenderStyle::*getter)() const, void (RenderStyle::*setter)(RefPtr<ShapeValue>&&))
: RefCountedPropertyWrapper<ShapeValue>(prop, getter, setter)
{
}
Expand All @@ -590,7 +590,7 @@ class PropertyWrapperShape : public RefCountedPropertyWrapper<ShapeValue> {
class StyleImagePropertyWrapper : public RefCountedPropertyWrapper<StyleImage> {
WTF_MAKE_FAST_ALLOCATED;
public:
StyleImagePropertyWrapper(CSSPropertyID prop, StyleImage* (RenderStyle::*getter)() const, void (RenderStyle::*setter)(PassRefPtr<StyleImage>))
StyleImagePropertyWrapper(CSSPropertyID prop, StyleImage* (RenderStyle::*getter)() const, void (RenderStyle::*setter)(RefPtr<StyleImage>&&))
: RefCountedPropertyWrapper<StyleImage>(prop, getter, setter)
{
}
Expand Down Expand Up @@ -1014,7 +1014,7 @@ template <typename T>
class FillLayerRefCountedPropertyWrapper : public FillLayerPropertyWrapperGetter<T*> {
WTF_MAKE_FAST_ALLOCATED;
public:
FillLayerRefCountedPropertyWrapper(T* (FillLayer::*getter)() const, void (FillLayer::*setter)(PassRefPtr<T>))
FillLayerRefCountedPropertyWrapper(T* (FillLayer::*getter)() const, void (FillLayer::*setter)(RefPtr<T>&&))
: FillLayerPropertyWrapperGetter<T*>(getter)
, m_setter(setter)
{
Expand All @@ -1026,13 +1026,13 @@ class FillLayerRefCountedPropertyWrapper : public FillLayerPropertyWrapperGetter
}

protected:
void (FillLayer::*m_setter)(PassRefPtr<T>);
void (FillLayer::*m_setter)(RefPtr<T>&&);
};

class FillLayerStyleImagePropertyWrapper : public FillLayerRefCountedPropertyWrapper<StyleImage> {
WTF_MAKE_FAST_ALLOCATED;
public:
FillLayerStyleImagePropertyWrapper(StyleImage* (FillLayer::*getter)() const, void (FillLayer::*setter)(PassRefPtr<StyleImage>))
FillLayerStyleImagePropertyWrapper(StyleImage* (FillLayer::*getter)() const, void (FillLayer::*setter)(RefPtr<StyleImage>&&))
: FillLayerRefCountedPropertyWrapper<StyleImage>(getter, setter)
{
}
Expand Down
2 changes: 1 addition & 1 deletion Source/WebCore/platform/PopupMenuClient.h
View file
Expand Up @@ -74,7 +74,7 @@ class PopupMenuClient {
virtual FontSelector* fontSelector() const = 0;
virtual HostWindow* hostWindow() const = 0;

virtual PassRefPtr<Scrollbar> createScrollbar(ScrollableArea&, ScrollbarOrientation, ScrollbarControlSize) = 0;
virtual Ref<Scrollbar> createScrollbar(ScrollableArea&, ScrollbarOrientation, ScrollbarControlSize) = 0;
};

}
Expand Down
2 changes: 1 addition & 1 deletion Source/WebCore/platform/ScrollView.cpp
View file
Expand Up @@ -118,7 +118,7 @@ bool ScrollView::setHasScrollbarInternal(RefPtr<Scrollbar>& scrollbar, Scrollbar
return false;
}

PassRefPtr<Scrollbar> ScrollView::createScrollbar(ScrollbarOrientation orientation)
Ref<Scrollbar> ScrollView::createScrollbar(ScrollbarOrientation orientation)
{
return Scrollbar::createNativeScrollbar(*this, orientation, RegularScrollbar);
}
Expand Down
2 changes: 1 addition & 1 deletion Source/WebCore/platform/ScrollView.h
View file
Expand Up @@ -140,7 +140,7 @@ class ScrollView : public Widget, public ScrollableArea {
WEBCORE_EXPORT void setDelegatesScrolling(bool);

// Overridden by FrameView to create custom CSS scrollbars if applicable.
virtual PassRefPtr<Scrollbar> createScrollbar(ScrollbarOrientation);
virtual Ref<Scrollbar> createScrollbar(ScrollbarOrientation);

void styleDidChange();

Expand Down
4 changes: 2 additions & 2 deletions Source/WebCore/platform/Scrollbar.cpp
View file
Expand Up @@ -43,9 +43,9 @@

namespace WebCore {

PassRefPtr<Scrollbar> Scrollbar::createNativeScrollbar(ScrollableArea& scrollableArea, ScrollbarOrientation orientation, ScrollbarControlSize size)
Ref<Scrollbar> Scrollbar::createNativeScrollbar(ScrollableArea& scrollableArea, ScrollbarOrientation orientation, ScrollbarControlSize size)
{
return adoptRef(new Scrollbar(scrollableArea, orientation, size));
return adoptRef(*new Scrollbar(scrollableArea, orientation, size));
}

int Scrollbar::maxOverlapBetweenPages()
Expand Down
3 changes: 1 addition & 2 deletions Source/WebCore/platform/Scrollbar.h
View file
Expand Up @@ -29,7 +29,6 @@
#include "ScrollTypes.h"
#include "Timer.h"
#include "Widget.h"
#include <wtf/PassRefPtr.h>
#include <wtf/WeakPtr.h>

namespace WebCore {
Expand All @@ -43,7 +42,7 @@ class ScrollbarTheme;
class Scrollbar : public Widget {
public:
// 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.
WEBCORE_EXPORT static PassRefPtr<Scrollbar> createNativeScrollbar(ScrollableArea&, ScrollbarOrientation, ScrollbarControlSize);
WEBCORE_EXPORT static Ref<Scrollbar> createNativeScrollbar(ScrollableArea&, ScrollbarOrientation, ScrollbarControlSize);

virtual ~Scrollbar();

Expand Down
2 changes: 1 addition & 1 deletion Source/WebCore/rendering/FilterEffectRenderer.cpp
View file
Expand Up @@ -85,7 +85,7 @@ GraphicsContext* FilterEffectRenderer::inputContext()
return sourceImage() ? &sourceImage()->context() : nullptr;
}

PassRefPtr<FilterEffect> FilterEffectRenderer::buildReferenceFilter(RenderElement* renderer, PassRefPtr<FilterEffect> previousEffect, ReferenceFilterOperation* filterOperation)
RefPtr<FilterEffect> FilterEffectRenderer::buildReferenceFilter(RenderElement* renderer, PassRefPtr<FilterEffect> previousEffect, ReferenceFilterOperation* filterOperation)
{
if (!renderer)
return nullptr;
Expand Down

0 comments on commit e8afd66

Please sign in to comment.