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

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

Issue 1972893002: Make sure newly created frames become throttled (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased 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
« no previous file with comments | « no previous file | third_party/WebKit/Source/web/tests/FrameThrottlingTest.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 2966 matching lines...) Expand 10 before | Expand all | Expand 10 after
2977 2977
2978 if (m_scrollbarsAvoidingResizer && parent()) 2978 if (m_scrollbarsAvoidingResizer && parent())
2979 toFrameView(parent())->adjustScrollbarsAvoidingResizerCount(-m_scrollbar sAvoidingResizer); 2979 toFrameView(parent())->adjustScrollbarsAvoidingResizerCount(-m_scrollbar sAvoidingResizer);
2980 2980
2981 Widget::setParent(parentView); 2981 Widget::setParent(parentView);
2982 2982
2983 if (m_scrollbarsAvoidingResizer && parent()) 2983 if (m_scrollbarsAvoidingResizer && parent())
2984 toFrameView(parent())->adjustScrollbarsAvoidingResizerCount(m_scrollbars AvoidingResizer); 2984 toFrameView(parent())->adjustScrollbarsAvoidingResizerCount(m_scrollbars AvoidingResizer);
2985 2985
2986 updateScrollableAreaSet(); 2986 updateScrollableAreaSet();
2987 updateThrottlingStatus();
2987 setNeedsUpdateViewportIntersection(); 2988 setNeedsUpdateViewportIntersection();
2988 } 2989 }
2989 2990
2990 void FrameView::removeChild(Widget* child) 2991 void FrameView::removeChild(Widget* child)
2991 { 2992 {
2992 ASSERT(child->parent() == this); 2993 ASSERT(child->parent() == this);
2993 2994
2994 if (child->isFrameView()) 2995 if (child->isFrameView())
2995 removeScrollableArea(toFrameView(child)); 2996 removeScrollableArea(toFrameView(child));
2996 2997
(...skipping 1110 matching lines...) Expand 10 before | Expand all | Expand 10 after
4107 return m_subtreeThrottled || (m_hiddenForThrottling && m_crossOriginForThrot tling); 4108 return m_subtreeThrottled || (m_hiddenForThrottling && m_crossOriginForThrot tling);
4108 } 4109 }
4109 4110
4110 LayoutBox& FrameView::boxForScrollControlPaintInvalidation() const 4111 LayoutBox& FrameView::boxForScrollControlPaintInvalidation() const
4111 { 4112 {
4112 ASSERT(layoutView()); 4113 ASSERT(layoutView());
4113 return *layoutView(); 4114 return *layoutView();
4114 } 4115 }
4115 4116
4116 } // namespace blink 4117 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | third_party/WebKit/Source/web/tests/FrameThrottlingTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698