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

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

Issue 1804963005: Avoid paintInvalidationContainer parameter of invalidatePaintIfNeeded() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 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/core/layout/LayoutBlock.h » ('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 1083 matching lines...) Expand 10 before | Expand all | Expand 10 after
1094 RELEASE_ASSERT(layoutView()); 1094 RELEASE_ASSERT(layoutView());
1095 LayoutView& rootForPaintInvalidation = *layoutView(); 1095 LayoutView& rootForPaintInvalidation = *layoutView();
1096 ASSERT(!rootForPaintInvalidation.needsLayout()); 1096 ASSERT(!rootForPaintInvalidation.needsLayout());
1097 1097
1098 TRACE_EVENT1("blink", "FrameView::invalidateTree", "root", rootForPaintInval idation.debugName().ascii()); 1098 TRACE_EVENT1("blink", "FrameView::invalidateTree", "root", rootForPaintInval idation.debugName().ascii());
1099 1099
1100 rootForPaintInvalidation.invalidateTreeIfNeeded(paintInvalidationState); 1100 rootForPaintInvalidation.invalidateTreeIfNeeded(paintInvalidationState);
1101 1101
1102 if (!m_frame->settings() || !m_frame->settings()->rootLayerScrolls()) { 1102 if (!m_frame->settings() || !m_frame->settings()->rootLayerScrolls()) {
1103 paintInvalidationState.setViewClippingAndScrollOffsetDisabled(true); 1103 paintInvalidationState.setViewClippingAndScrollOffsetDisabled(true);
1104 invalidatePaintOfScrollControlsIfNeeded(paintInvalidationState, paintInv alidationState.paintInvalidationContainer()); 1104 invalidatePaintOfScrollControlsIfNeeded(paintInvalidationState);
1105 paintInvalidationState.setViewClippingAndScrollOffsetDisabled(false); 1105 paintInvalidationState.setViewClippingAndScrollOffsetDisabled(false);
1106 } 1106 }
1107 1107
1108 #if ENABLE(ASSERT) 1108 #if ENABLE(ASSERT)
1109 layoutView()->assertSubtreeClearedPaintInvalidationState(); 1109 layoutView()->assertSubtreeClearedPaintInvalidationState();
1110 #endif 1110 #endif
1111 1111
1112 if (m_frame->selection().isCaretBoundsDirty()) 1112 if (m_frame->selection().isCaretBoundsDirty())
1113 m_frame->selection().invalidateCaretRect(); 1113 m_frame->selection().invalidateCaretRect();
1114 1114
(...skipping 2983 matching lines...) Expand 10 before | Expand all | Expand 10 after
4098 return m_hiddenForThrottling && m_crossOriginForThrottling; 4098 return m_hiddenForThrottling && m_crossOriginForThrottling;
4099 } 4099 }
4100 4100
4101 LayoutBox& FrameView::boxForScrollControlPaintInvalidation() const 4101 LayoutBox& FrameView::boxForScrollControlPaintInvalidation() const
4102 { 4102 {
4103 ASSERT(layoutView()); 4103 ASSERT(layoutView());
4104 return *layoutView(); 4104 return *layoutView();
4105 } 4105 }
4106 4106
4107 } // namespace blink 4107 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/layout/LayoutBlock.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698