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

Side by Side Diff: third_party/WebKit/Source/core/frame/FrameView.cpp

Issue 2494333002: Replace wrapUnique(new T(args)) by makeUnique<T>(args) in Blink (Closed)
Patch Set: Drop redundant WTF:: Created 4 years, 1 month 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org> 2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
3 * 1999 Lars Knoll <knoll@kde.org> 3 * 1999 Lars Knoll <knoll@kde.org>
4 * 1999 Antti Koivisto <koivisto@kde.org> 4 * 1999 Antti Koivisto <koivisto@kde.org>
5 * 2000 Dirk Mueller <mueller@kde.org> 5 * 2000 Dirk Mueller <mueller@kde.org>
6 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
7 * (C) 2006 Graham Dennis (graham.dennis@gmail.com) 7 * (C) 2006 Graham Dennis (graham.dennis@gmail.com)
8 * (C) 2006 Alexey Proskuryakov (ap@nypop.com) 8 * (C) 2006 Alexey Proskuryakov (ap@nypop.com)
9 * Copyright (C) 2009 Google Inc. All rights reserved. 9 * Copyright (C) 2009 Google Inc. All rights reserved.
10 * 10 *
(...skipping 956 matching lines...) Expand 10 before | Expand all | Expand 10 after
967 967
968 void FrameView::prepareLayoutAnalyzer() { 968 void FrameView::prepareLayoutAnalyzer() {
969 bool isTracing = false; 969 bool isTracing = false;
970 TRACE_EVENT_CATEGORY_GROUP_ENABLED( 970 TRACE_EVENT_CATEGORY_GROUP_ENABLED(
971 TRACE_DISABLED_BY_DEFAULT("blink.debug.layout"), &isTracing); 971 TRACE_DISABLED_BY_DEFAULT("blink.debug.layout"), &isTracing);
972 if (!isTracing) { 972 if (!isTracing) {
973 m_analyzer.reset(); 973 m_analyzer.reset();
974 return; 974 return;
975 } 975 }
976 if (!m_analyzer) 976 if (!m_analyzer)
977 m_analyzer = wrapUnique(new LayoutAnalyzer()); 977 m_analyzer = makeUnique<LayoutAnalyzer>();
978 m_analyzer->reset(); 978 m_analyzer->reset();
979 } 979 }
980 980
981 std::unique_ptr<TracedValue> FrameView::analyzerCounters() { 981 std::unique_ptr<TracedValue> FrameView::analyzerCounters() {
982 if (!m_analyzer) 982 if (!m_analyzer)
983 return TracedValue::create(); 983 return TracedValue::create();
984 std::unique_ptr<TracedValue> value = m_analyzer->toTracedValue(); 984 std::unique_ptr<TracedValue> value = m_analyzer->toTracedValue();
985 value->setString("host", layoutViewItem().document().location()->host()); 985 value->setString("host", layoutViewItem().document().location()->host());
986 value->setString("frame", 986 value->setString("frame",
987 String::format("0x%" PRIxPTR, 987 String::format("0x%" PRIxPTR,
(...skipping 3574 matching lines...) Expand 10 before | Expand all | Expand 10 after
4562 DCHECK(m_frame->isMainFrame()); 4562 DCHECK(m_frame->isMainFrame());
4563 return m_initialViewportSize.width(); 4563 return m_initialViewportSize.width();
4564 } 4564 }
4565 4565
4566 int FrameView::initialViewportHeight() const { 4566 int FrameView::initialViewportHeight() const {
4567 DCHECK(m_frame->isMainFrame()); 4567 DCHECK(m_frame->isMainFrame());
4568 return m_initialViewportSize.height(); 4568 return m_initialViewportSize.height();
4569 } 4569 }
4570 4570
4571 } // namespace blink 4571 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/fileapi/FileReaderLoader.cpp ('k') | third_party/WebKit/Source/core/html/HTMLAreaElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698