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

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

Issue 2014483003: Rename OwnPtr::clear() to reset() in core/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 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 206 matching lines...) Expand 10 before | Expand all | Expand 10 after
217 m_updateWidgetsTimer.stop(); 217 m_updateWidgetsTimer.stop();
218 m_firstLayout = true; 218 m_firstLayout = true;
219 m_safeToPropagateScrollToParent = true; 219 m_safeToPropagateScrollToParent = true;
220 m_lastViewportSize = IntSize(); 220 m_lastViewportSize = IntSize();
221 m_lastZoomFactor = 1.0f; 221 m_lastZoomFactor = 1.0f;
222 m_isTrackingPaintInvalidations = s_initialTrackAllPaintInvalidations; 222 m_isTrackingPaintInvalidations = s_initialTrackAllPaintInvalidations;
223 m_visuallyNonEmptyCharacterCount = 0; 223 m_visuallyNonEmptyCharacterCount = 0;
224 m_visuallyNonEmptyPixelCount = 0; 224 m_visuallyNonEmptyPixelCount = 0;
225 m_isVisuallyNonEmpty = false; 225 m_isVisuallyNonEmpty = false;
226 clearFragmentAnchor(); 226 clearFragmentAnchor();
227 m_viewportConstrainedObjects.clear(); 227 m_viewportConstrainedObjects.reset();
228 m_layoutSubtreeRootList.clear(); 228 m_layoutSubtreeRootList.clear();
229 m_orthogonalWritingModeRootList.clear(); 229 m_orthogonalWritingModeRootList.clear();
230 } 230 }
231 231
232 // Call function for each non-throttled frame view in pre tree order. 232 // Call function for each non-throttled frame view in pre tree order.
233 // Note it needs a null check of the frame's layoutView to access it in case of detached frames. 233 // Note it needs a null check of the frame's layoutView to access it in case of detached frames.
234 template <typename Function> 234 template <typename Function>
235 void FrameView::forAllNonThrottledFrameViews(const Function& function) 235 void FrameView::forAllNonThrottledFrameViews(const Function& function)
236 { 236 {
237 if (shouldThrottleRendering()) 237 if (shouldThrottleRendering())
(...skipping 580 matching lines...) Expand 10 before | Expand all | Expand 10 after
818 { 818 {
819 LayoutState layoutState(root); 819 LayoutState layoutState(root);
820 root.layout(); 820 root.layout();
821 } 821 }
822 822
823 void FrameView::prepareLayoutAnalyzer() 823 void FrameView::prepareLayoutAnalyzer()
824 { 824 {
825 bool isTracing = false; 825 bool isTracing = false;
826 TRACE_EVENT_CATEGORY_GROUP_ENABLED(TRACE_DISABLED_BY_DEFAULT("blink.debug.la yout"), &isTracing); 826 TRACE_EVENT_CATEGORY_GROUP_ENABLED(TRACE_DISABLED_BY_DEFAULT("blink.debug.la yout"), &isTracing);
827 if (!isTracing) { 827 if (!isTracing) {
828 m_analyzer.clear(); 828 m_analyzer.reset();
829 return; 829 return;
830 } 830 }
831 if (!m_analyzer) 831 if (!m_analyzer)
832 m_analyzer = adoptPtr(new LayoutAnalyzer()); 832 m_analyzer = adoptPtr(new LayoutAnalyzer());
833 m_analyzer->reset(); 833 m_analyzer->reset();
834 } 834 }
835 835
836 PassOwnPtr<TracedValue> FrameView::analyzerCounters() 836 PassOwnPtr<TracedValue> FrameView::analyzerCounters()
837 { 837 {
838 if (!m_analyzer) 838 if (!m_analyzer)
(...skipping 3267 matching lines...) Expand 10 before | Expand all | Expand 10 after
4106 return m_subtreeThrottled || (m_hiddenForThrottling && m_crossOriginForThrot tling); 4106 return m_subtreeThrottled || (m_hiddenForThrottling && m_crossOriginForThrot tling);
4107 } 4107 }
4108 4108
4109 LayoutBox& FrameView::boxForScrollControlPaintInvalidation() const 4109 LayoutBox& FrameView::boxForScrollControlPaintInvalidation() const
4110 { 4110 {
4111 ASSERT(layoutView()); 4111 ASSERT(layoutView());
4112 return *layoutView(); 4112 return *layoutView();
4113 } 4113 }
4114 4114
4115 } // namespace blink 4115 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/fileapi/FileReaderLoader.cpp ('k') | third_party/WebKit/Source/core/frame/LocalFrame.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698