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

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

Issue 1983753002: Remove OwnPtr::release() calls in core/ (part 2). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 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 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 826 matching lines...) Expand 10 before | Expand all | Expand 10 after
837 837
838 PassOwnPtr<TracedValue> FrameView::analyzerCounters() 838 PassOwnPtr<TracedValue> FrameView::analyzerCounters()
839 { 839 {
840 if (!m_analyzer) 840 if (!m_analyzer)
841 return TracedValue::create(); 841 return TracedValue::create();
842 OwnPtr<TracedValue> value = m_analyzer->toTracedValue(); 842 OwnPtr<TracedValue> value = m_analyzer->toTracedValue();
843 value->setString("host", layoutView()->document().location()->host()); 843 value->setString("host", layoutView()->document().location()->host());
844 value->setString("frame", String::format("0x%" PRIxPTR, reinterpret_cast<uin tptr_t>(m_frame.get()))); 844 value->setString("frame", String::format("0x%" PRIxPTR, reinterpret_cast<uin tptr_t>(m_frame.get())));
845 value->setInteger("contentsHeightAfterLayout", layoutView()->documentRect(). height()); 845 value->setInteger("contentsHeightAfterLayout", layoutView()->documentRect(). height());
846 value->setInteger("visibleHeight", visibleHeight()); 846 value->setInteger("visibleHeight", visibleHeight());
847 return value.release(); 847 return value;
848 } 848 }
849 849
850 #define PERFORM_LAYOUT_TRACE_CATEGORIES "blink,benchmark," TRACE_DISABLED_BY_DEF AULT("blink.debug.layout") 850 #define PERFORM_LAYOUT_TRACE_CATEGORIES "blink,benchmark," TRACE_DISABLED_BY_DEF AULT("blink.debug.layout")
851 851
852 void FrameView::performLayout(bool inSubtreeLayout) 852 void FrameView::performLayout(bool inSubtreeLayout)
853 { 853 {
854 ASSERT(inSubtreeLayout || m_layoutSubtreeRootList.isEmpty()); 854 ASSERT(inSubtreeLayout || m_layoutSubtreeRootList.isEmpty());
855 855
856 TRACE_EVENT_BEGIN1(PERFORM_LAYOUT_TRACE_CATEGORIES, "FrameView::performLayou t", 856 TRACE_EVENT_BEGIN1(PERFORM_LAYOUT_TRACE_CATEGORIES, "FrameView::performLayou t",
857 "contentsHeightBeforeLayout", layoutView()->documentRect().height()); 857 "contentsHeightBeforeLayout", layoutView()->documentRect().height());
(...skipping 3249 matching lines...) Expand 10 before | Expand all | Expand 10 after
4107 return m_subtreeThrottled || (m_hiddenForThrottling && m_crossOriginForThrot tling); 4107 return m_subtreeThrottled || (m_hiddenForThrottling && m_crossOriginForThrot tling);
4108 } 4108 }
4109 4109
4110 LayoutBox& FrameView::boxForScrollControlPaintInvalidation() const 4110 LayoutBox& FrameView::boxForScrollControlPaintInvalidation() const
4111 { 4111 {
4112 ASSERT(layoutView()); 4112 ASSERT(layoutView());
4113 return *layoutView(); 4113 return *layoutView();
4114 } 4114 }
4115 4115
4116 } // namespace blink 4116 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/frame/DOMWindow.cpp ('k') | third_party/WebKit/Source/core/frame/ImageBitmap.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698