Index: third_party/WebKit/Source/core/frame/FrameView.h |
diff --git a/third_party/WebKit/Source/core/frame/FrameView.h b/third_party/WebKit/Source/core/frame/FrameView.h |
index ce1d5d8ff520e0ca933b14ef4e3446a1896b369a..a3d645eed36ccd1b8304e93ff63b57c418802338 100644 |
--- a/third_party/WebKit/Source/core/frame/FrameView.h |
+++ b/third_party/WebKit/Source/core/frame/FrameView.h |
@@ -49,9 +49,9 @@ |
#include "wtf/Forward.h" |
#include "wtf/HashSet.h" |
#include "wtf/ListHashSet.h" |
-#include "wtf/OwnPtr.h" |
#include "wtf/TemporaryChange.h" |
#include "wtf/text/WTFString.h" |
+#include <memory> |
namespace blink { |
@@ -758,7 +758,7 @@ private: |
ScrollingCoordinator* scrollingCoordinator() const; |
void prepareLayoutAnalyzer(); |
- PassOwnPtr<TracedValue> analyzerCounters(); |
+ std::unique_ptr<TracedValue> analyzerCounters(); |
// LayoutObject for the viewport-defining element (see Document::viewportDefiningElement). |
LayoutObject* viewportLayoutObject(); |
@@ -810,7 +810,7 @@ private: |
unsigned m_nestedLayoutCount; |
Timer<FrameView> m_postLayoutTasksTimer; |
Timer<FrameView> m_updateWidgetsTimer; |
- OwnPtr<CancellableTaskFactory> m_renderThrottlingObserverNotificationFactory; |
+ std::unique_ptr<CancellableTaskFactory> m_renderThrottlingObserverNotificationFactory; |
bool m_firstLayout; |
bool m_isTransparent; |
@@ -834,8 +834,8 @@ private: |
Member<ScrollableAreaSet> m_scrollableAreas; |
Member<ScrollableAreaSet> m_animatingScrollableAreas; |
- OwnPtr<ResizerAreaSet> m_resizerAreas; |
- OwnPtr<ViewportConstrainedObjectSet> m_viewportConstrainedObjects; |
+ std::unique_ptr<ResizerAreaSet> m_resizerAreas; |
+ std::unique_ptr<ViewportConstrainedObjectSet> m_viewportConstrainedObjects; |
unsigned m_stickyPositionObjectCount; |
ViewportConstrainedObjectSet m_backgroundAttachmentFixedObjects; |
Member<FrameViewAutoSizeInfo> m_autoSizeInfo; |
@@ -880,7 +880,7 @@ private: |
bool m_inUpdateScrollbars; |
- OwnPtr<LayoutAnalyzer> m_analyzer; |
+ std::unique_ptr<LayoutAnalyzer> m_analyzer; |
// Mark if something has changed in the mapping from Frame to GraphicsLayer |
// and the Frame Timing regions should be recalculated. |
@@ -926,7 +926,7 @@ private: |
String name; |
PaintInvalidationReason reason; |
}; |
- OwnPtr<Vector<ObjectPaintInvalidation>> m_trackedObjectPaintInvalidations; |
+ std::unique_ptr<Vector<ObjectPaintInvalidation>> m_trackedObjectPaintInvalidations; |
}; |
inline void FrameView::incrementVisuallyNonEmptyCharacterCount(unsigned count) |