Revert "Remove OwnPtr from Blink."

third_party/WebKit/Source/web/WebViewImpl.h

 /*
  * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 45 matching lines @@
 #include "web/ChromeClientImpl.h"
 #include "web/ContextMenuClientImpl.h"
 #include "web/EditorClientImpl.h"
 #include "web/MediaKeysClientImpl.h"
 #include "web/PageWidgetDelegate.h"
 #include "web/SpellCheckerClientImpl.h"
 #include "web/StorageClientImpl.h"
 #include "web/WebExport.h"
 #include "wtf/Compiler.h"
 #include "wtf/HashSet.h"
+#include "wtf/OwnPtr.h"
 #include "wtf/RefCounted.h"
 #include "wtf/Vector.h"
-#include <memory>
 
 namespace blink {
 
 class DataObject;
 class DevToolsEmulator;
 class Frame;
 class FullscreenController;
 class InspectorOverlay;
 class LinkHighlightImpl;
 class PageOverlay;
@@ skipping 556 matching lines @@
     // The lower bound on the size when auto-resizing.
     IntSize m_minAutoSize;
     // The upper bound on the size when auto-resizing.
     IntSize m_maxAutoSize;
 
     Persistent<Page> m_page;
 
     // An object that can be used to manipulate m_page->settings() without linking
     // against WebCore. This is lazily allocated the first time GetWebSettings()
     // is called.
-    std::unique_ptr<WebSettingsImpl> m_webSettings;
+    OwnPtr<WebSettingsImpl> m_webSettings;
 
     // A copy of the web drop data object we received from the browser.
     Persistent<DataObject> m_currentDragData;
 
     // Keeps track of the current zoom level. 0 means no zoom, positive numbers
     // mean zoom in, negative numbers mean zoom out.
     double m_zoomLevel;
 
     double m_minimumZoomLevel;
 
@@ skipping 39 matching lines @@
 
     // The current drag operation as negotiated by the source and destination.
     // When not equal to DragOperationNone, the drag data can be dropped onto the
     // current drop target in this WebView (the drop target can accept the drop).
     WebDragOperation m_dragOperation;
 
     // The popup associated with an input/select element.
     RefPtr<WebPagePopupImpl> m_pagePopup;
 
     Persistent<DevToolsEmulator> m_devToolsEmulator;
-    std::unique_ptr<PageOverlay> m_pageColorOverlay;
+    OwnPtr<PageOverlay> m_pageColorOverlay;
 
     // Whether the webview is rendering transparently.
     bool m_isTransparent;
 
     // Whether the user can press tab to focus links.
     bool m_tabsToLinks;
 
     // If set, the (plugin) node which has mouse capture.
     Persistent<Node> m_mouseCaptureNode;
     RefPtr<UserGestureToken> m_mouseCaptureGestureToken;
 
     RefPtr<UserGestureToken> m_pointerLockGestureToken;
 
     WebLayerTreeView* m_layerTreeView;
     WebLayer* m_rootLayer;
     GraphicsLayer* m_rootGraphicsLayer;
     GraphicsLayer* m_visualViewportContainerLayer;
     bool m_matchesHeuristicsForGpuRasterization;
     static const WebInputEvent* m_currentInputEvent;
 
     MediaKeysClientImpl m_mediaKeysClientImpl;
-    std::unique_ptr<WebActiveGestureAnimation> m_gestureAnimation;
+    OwnPtr<WebActiveGestureAnimation> m_gestureAnimation;
     WebPoint m_positionOnFlingStart;
     WebPoint m_globalPositionOnFlingStart;
     int m_flingModifier;
     WebGestureDevice m_flingSourceDevice;
-    Vector<std::unique_ptr<LinkHighlightImpl>> m_linkHighlights;
-    std::unique_ptr<CompositorAnimationTimeline> m_linkHighlightsTimeline;
+    Vector<OwnPtr<LinkHighlightImpl>> m_linkHighlights;
+    OwnPtr<CompositorAnimationTimeline> m_linkHighlightsTimeline;
     Persistent<FullscreenController> m_fullscreenController;
 
     WebColor m_baseBackgroundColor;
     WebColor m_backgroundColorOverride;
     float m_zoomFactorOverride;
 
     bool m_userGestureObserved;
     bool m_shouldDispatchFirstVisuallyNonEmptyLayout;
     bool m_shouldDispatchFirstLayoutAfterFinishedParsing;
     bool m_shouldDispatchFirstLayoutAfterFinishedLoading;
     WebDisplayMode m_displayMode;
 
     FloatSize m_elasticOverscroll;
 
     // This is owned by the LayerTreeHostImpl, and should only be used on the
     // compositor thread. The LayerTreeHostImpl is indirectly owned by this
     // class so this pointer should be valid until this class is destructed.
     CrossThreadPersistent<CompositorMutatorImpl> m_mutator;
 
     Persistent<EventListener> m_popupMouseWheelEventListener;
 
     WebPageImportanceSignals m_pageImportanceSignals;
 
-    const std::unique_ptr<WebViewScheduler> m_scheduler;
+    const OwnPtr<WebViewScheduler> m_scheduler;
 
     // Manages the layer tree created for this page in Slimming Paint v2.
     PaintArtifactCompositor m_paintArtifactCompositor;
 
     double m_lastFrameTimeMonotonic;
 };
 
 // We have no ways to check if the specified WebView is an instance of
 // WebViewImpl because WebViewImpl is the only implementation of WebView.
 DEFINE_TYPE_CASTS(WebViewImpl, WebView, webView, true, true);
 
 } // namespace blink
 
 #endif