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

Unified Diff: third_party/WebKit/Source/web/WebViewImpl.h

Issue 2050123002: Remove OwnPtr from Blink. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address comments from Kent; 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/web/WebViewImpl.h
diff --git a/third_party/WebKit/Source/web/WebViewImpl.h b/third_party/WebKit/Source/web/WebViewImpl.h
index 26724a5f5c35bee10c4949425161f94d96077eb0..3d5ada5f68b71c9376cb69c8cfa8e3f459b2d931 100644
--- a/third_party/WebKit/Source/web/WebViewImpl.h
+++ b/third_party/WebKit/Source/web/WebViewImpl.h
@@ -63,9 +63,9 @@
#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 {
@@ -641,7 +641,7 @@ private:
// 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.
- OwnPtr<WebSettingsImpl> m_webSettings;
+ std::unique_ptr<WebSettingsImpl> m_webSettings;
// A copy of the web drop data object we received from the browser.
Persistent<DataObject> m_currentDragData;
@@ -701,7 +701,7 @@ private:
RefPtr<WebPagePopupImpl> m_pagePopup;
Persistent<DevToolsEmulator> m_devToolsEmulator;
- OwnPtr<PageOverlay> m_pageColorOverlay;
+ std::unique_ptr<PageOverlay> m_pageColorOverlay;
// Whether the webview is rendering transparently.
bool m_isTransparent;
@@ -723,13 +723,13 @@ private:
static const WebInputEvent* m_currentInputEvent;
MediaKeysClientImpl m_mediaKeysClientImpl;
- OwnPtr<WebActiveGestureAnimation> m_gestureAnimation;
+ std::unique_ptr<WebActiveGestureAnimation> m_gestureAnimation;
WebPoint m_positionOnFlingStart;
WebPoint m_globalPositionOnFlingStart;
int m_flingModifier;
WebGestureDevice m_flingSourceDevice;
- Vector<OwnPtr<LinkHighlightImpl>> m_linkHighlights;
- OwnPtr<CompositorAnimationTimeline> m_linkHighlightsTimeline;
+ Vector<std::unique_ptr<LinkHighlightImpl>> m_linkHighlights;
+ std::unique_ptr<CompositorAnimationTimeline> m_linkHighlightsTimeline;
Persistent<FullscreenController> m_fullscreenController;
WebColor m_baseBackgroundColor;
@@ -753,7 +753,7 @@ private:
WebPageImportanceSignals m_pageImportanceSignals;
- const OwnPtr<WebViewScheduler> m_scheduler;
+ const std::unique_ptr<WebViewScheduler> m_scheduler;
// Manages the layer tree created for this page in Slimming Paint v2.
PaintArtifactCompositor m_paintArtifactCompositor;

Powered by Google App Engine
This is Rietveld 408576698