| Index: Source/core/rendering/RenderLayerScrollableArea.cpp
|
| diff --git a/Source/core/rendering/RenderLayerScrollableArea.cpp b/Source/core/rendering/RenderLayerScrollableArea.cpp
|
| index 0e17e4125aa3475def862df67b7c2facc3c109b6..69884479df62801e90c339d3544f19e4d144ce19 100644
|
| --- a/Source/core/rendering/RenderLayerScrollableArea.cpp
|
| +++ b/Source/core/rendering/RenderLayerScrollableArea.cpp
|
| @@ -364,7 +364,7 @@ void RenderLayerScrollableArea::setScrollOffset(const DoublePoint& newScrollOffs
|
| LocalFrame* frame = box().frame();
|
| ASSERT(frame);
|
|
|
| - RefPtr<FrameView> frameView = box().frameView();
|
| + RefPtrWillBeRawPtr<FrameView> frameView = box().frameView();
|
|
|
| TRACE_EVENT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "ScrollLayer", "data", InspectorScrollLayerEvent::data(&box()));
|
| // FIXME(361045): remove InspectorInstrumentation calls once DevTools Timeline migrates to tracing.
|
| @@ -866,9 +866,9 @@ static inline RenderObject* rendererForScrollbar(RenderObject& renderer)
|
| return &renderer;
|
| }
|
|
|
| -PassRefPtr<Scrollbar> RenderLayerScrollableArea::createScrollbar(ScrollbarOrientation orientation)
|
| +PassRefPtrWillBeRawPtr<Scrollbar> RenderLayerScrollableArea::createScrollbar(ScrollbarOrientation orientation)
|
| {
|
| - RefPtr<Scrollbar> widget;
|
| + RefPtrWillBeRawPtr<Scrollbar> widget = nullptr;
|
| RenderObject* actualRenderer = rendererForScrollbar(box());
|
| bool hasCustomScrollbarStyle = actualRenderer->isBox() && actualRenderer->style()->hasPseudoStyle(SCROLLBAR);
|
| if (hasCustomScrollbarStyle) {
|
| @@ -889,7 +889,7 @@ PassRefPtr<Scrollbar> RenderLayerScrollableArea::createScrollbar(ScrollbarOrient
|
|
|
| void RenderLayerScrollableArea::destroyScrollbar(ScrollbarOrientation orientation)
|
| {
|
| - RefPtr<Scrollbar>& scrollbar = orientation == HorizontalScrollbar ? m_hBar : m_vBar;
|
| + RefPtrWillBePersistent<Scrollbar>& scrollbar = orientation == HorizontalScrollbar ? m_hBar : m_vBar;
|
| if (!scrollbar)
|
| return;
|
|
|
|
|