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

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

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/core/frame/FrameView.cpp
diff --git a/third_party/WebKit/Source/core/frame/FrameView.cpp b/third_party/WebKit/Source/core/frame/FrameView.cpp
index ab8f86fc55e8d846f5d136320978ddd47213644a..3f92ad32dfcba36836a848354587b64c4586cd3c 100644
--- a/third_party/WebKit/Source/core/frame/FrameView.cpp
+++ b/third_party/WebKit/Source/core/frame/FrameView.cpp
@@ -107,8 +107,10 @@
#include "public/platform/WebDisplayItemList.h"
#include "public/platform/WebFrameScheduler.h"
#include "wtf/CurrentTime.h"
+#include "wtf/PtrUtil.h"
#include "wtf/StdLibExtras.h"
#include "wtf/TemporaryChange.h"
+#include <memory>
namespace blink {
@@ -834,15 +836,15 @@ void FrameView::prepareLayoutAnalyzer()
return;
}
if (!m_analyzer)
- m_analyzer = adoptPtr(new LayoutAnalyzer());
+ m_analyzer = wrapUnique(new LayoutAnalyzer());
m_analyzer->reset();
}
-PassOwnPtr<TracedValue> FrameView::analyzerCounters()
+std::unique_ptr<TracedValue> FrameView::analyzerCounters()
{
if (!m_analyzer)
return TracedValue::create();
- OwnPtr<TracedValue> value = m_analyzer->toTracedValue();
+ std::unique_ptr<TracedValue> value = m_analyzer->toTracedValue();
value->setString("host", layoutViewItem().document().location()->host());
value->setString("frame", String::format("0x%" PRIxPTR, reinterpret_cast<uintptr_t>(m_frame.get())));
value->setInteger("contentsHeightAfterLayout", layoutViewItem().documentRect().height());
@@ -1306,7 +1308,7 @@ void FrameView::removeBackgroundAttachmentFixedObject(LayoutObject* object)
void FrameView::addViewportConstrainedObject(LayoutObject* object)
{
if (!m_viewportConstrainedObjects)
- m_viewportConstrainedObjects = adoptPtr(new ViewportConstrainedObjectSet);
+ m_viewportConstrainedObjects = wrapUnique(new ViewportConstrainedObjectSet);
if (!m_viewportConstrainedObjects->contains(object)) {
m_viewportConstrainedObjects->add(object);
@@ -2952,7 +2954,7 @@ void FrameView::setTracksPaintInvalidations(bool trackPaintInvalidations)
void FrameView::addResizerArea(LayoutBox& resizerBox)
{
if (!m_resizerAreas)
- m_resizerAreas = adoptPtr(new ResizerAreaSet);
+ m_resizerAreas = wrapUnique(new ResizerAreaSet);
m_resizerAreas->add(&resizerBox);
}

Powered by Google App Engine
This is Rietveld 408576698