Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(265)

Unified Diff: third_party/WebKit/Source/core/frame/RootFrameViewport.h

Issue 1686483002: Oilpan: Remove most WillBe types from the code base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/frame/RootFrameViewport.h
diff --git a/third_party/WebKit/Source/core/frame/RootFrameViewport.h b/third_party/WebKit/Source/core/frame/RootFrameViewport.h
index ef99f1003383319e9e4792e916887c8be3ee60fe..a2888c49cefe8328f6867bab7ebdb7c79cd6011f 100644
--- a/third_party/WebKit/Source/core/frame/RootFrameViewport.h
+++ b/third_party/WebKit/Source/core/frame/RootFrameViewport.h
@@ -21,13 +21,12 @@ class LayoutRect;
// APIs that don't make sense on the combined viewport, the call is delegated to
// the layout viewport. Thus, we could say this class is a decorator on the
// FrameView scrollable area that adds pinch-zoom semantics to scrolling.
-class CORE_EXPORT RootFrameViewport final : public NoBaseWillBeGarbageCollectedFinalized<RootFrameViewport>, public ScrollableArea {
- USING_FAST_MALLOC_WILL_BE_REMOVED(RootFrameViewport);
- WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(RootFrameViewport);
+class CORE_EXPORT RootFrameViewport final : public GarbageCollectedFinalized<RootFrameViewport>, public ScrollableArea {
+ USING_GARBAGE_COLLECTED_MIXIN(RootFrameViewport);
public:
- static PassOwnPtrWillBeRawPtr<RootFrameViewport> create(ScrollableArea& visualViewport, ScrollableArea& layoutViewport)
+ static RawPtr<RootFrameViewport> create(ScrollableArea& visualViewport, ScrollableArea& layoutViewport)
{
- return adoptPtrWillBeNoop(new RootFrameViewport(visualViewport, layoutViewport));
+ return new RootFrameViewport(visualViewport, layoutViewport);
}
DECLARE_VIRTUAL_TRACE();
@@ -88,8 +87,8 @@ private:
ScrollableArea& visualViewport() const { ASSERT(m_visualViewport); return *m_visualViewport; }
ScrollableArea& layoutViewport() const { ASSERT(m_layoutViewport); return *m_layoutViewport; }
- RawPtrWillBeMember<ScrollableArea> m_visualViewport;
- RawPtrWillBeMember<ScrollableArea> m_layoutViewport;
+ Member<ScrollableArea> m_visualViewport;
+ Member<ScrollableArea> m_layoutViewport;
};
} // namespace blink

Powered by Google App Engine
This is Rietveld 408576698