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

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

Issue 2050123002: Remove OwnPtr from Blink. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Merge. Created 4 years, 6 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/FrameView.h
diff --git a/third_party/WebKit/Source/core/frame/FrameView.h b/third_party/WebKit/Source/core/frame/FrameView.h
index 467b20cc519eef9a22e0f2f2a6b0bbe397d0257f..deb6e7348db76f03763fc216cb031d617b7c1ce9 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 {
@@ -754,7 +754,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();
@@ -806,7 +806,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;
@@ -832,8 +832,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;
@@ -878,7 +878,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.

Powered by Google App Engine
This is Rietveld 408576698