| Index: third_party/WebKit/Source/core/paint/PaintLayerScrollableArea.cpp
|
| diff --git a/third_party/WebKit/Source/core/paint/PaintLayerScrollableArea.cpp b/third_party/WebKit/Source/core/paint/PaintLayerScrollableArea.cpp
|
| index 5f441befd71e298a10e2d1941b88b298653d3530..44b2e81d49acd92e67615d0875ab887dab8c10f5 100644
|
| --- a/third_party/WebKit/Source/core/paint/PaintLayerScrollableArea.cpp
|
| +++ b/third_party/WebKit/Source/core/paint/PaintLayerScrollableArea.cpp
|
| @@ -344,7 +344,7 @@ void PaintLayerScrollableArea::setScrollOffset(const DoublePoint& newScrollOffse
|
| LocalFrame* frame = box().frame();
|
| ASSERT(frame);
|
|
|
| - RefPtrWillBeRawPtr<FrameView> frameView = box().frameView();
|
| + RawPtr<FrameView> frameView = box().frameView();
|
|
|
| TRACE_EVENT1("devtools.timeline", "ScrollLayer", "data", InspectorScrollLayerEvent::data(&box()));
|
|
|
| @@ -1545,10 +1545,10 @@ void PaintLayerScrollableArea::ScrollbarManager::setHasVerticalScrollbar(bool ha
|
| }
|
| }
|
|
|
| -PassRefPtrWillBeRawPtr<Scrollbar> PaintLayerScrollableArea::ScrollbarManager::createScrollbar(ScrollbarOrientation orientation)
|
| +RawPtr<Scrollbar> PaintLayerScrollableArea::ScrollbarManager::createScrollbar(ScrollbarOrientation orientation)
|
| {
|
| ASSERT(orientation == HorizontalScrollbar ? !m_hBarIsAttached : !m_vBarIsAttached);
|
| - RefPtrWillBeRawPtr<Scrollbar> scrollbar = nullptr;
|
| + RawPtr<Scrollbar> scrollbar = nullptr;
|
| const LayoutObject& actualLayoutObject = layoutObjectForScrollbar(m_scrollableArea->box());
|
| bool hasCustomScrollbarStyle = actualLayoutObject.isBox() && actualLayoutObject.styleRef().hasPseudoStyle(PseudoIdScrollbar);
|
| if (hasCustomScrollbarStyle) {
|
| @@ -1565,7 +1565,7 @@ PassRefPtrWillBeRawPtr<Scrollbar> PaintLayerScrollableArea::ScrollbarManager::cr
|
|
|
| void PaintLayerScrollableArea::ScrollbarManager::destroyScrollbar(ScrollbarOrientation orientation)
|
| {
|
| - RefPtrWillBeMember<Scrollbar>& scrollbar = orientation == HorizontalScrollbar ? m_hBar : m_vBar;
|
| + Member<Scrollbar>& scrollbar = orientation == HorizontalScrollbar ? m_hBar : m_vBar;
|
| ASSERT(orientation == HorizontalScrollbar ? !m_hBarIsAttached: !m_vBarIsAttached);
|
| if (!scrollbar)
|
| return;
|
|
|