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

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
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 1077 matching lines...) Expand 10 before | Expand all | Expand 10 after
1088 RELEASE_ASSERT(layoutView()); 1088 RELEASE_ASSERT(layoutView());
1089 LayoutView& rootForPaintInvalidation = *layoutView(); 1089 LayoutView& rootForPaintInvalidation = *layoutView();
1090 ASSERT(!rootForPaintInvalidation.needsLayout()); 1090 ASSERT(!rootForPaintInvalidation.needsLayout());
1091 1091
1092 TRACE_EVENT1("blink", "FrameView::invalidateTree", "root", rootForPaintInval idation.debugName().ascii()); 1092 TRACE_EVENT1("blink", "FrameView::invalidateTree", "root", rootForPaintInval idation.debugName().ascii());
1093 1093
1094 rootForPaintInvalidation.invalidateTreeIfNeeded(paintInvalidationState); 1094 rootForPaintInvalidation.invalidateTreeIfNeeded(paintInvalidationState);
1095 1095
1096 if (!m_frame->settings() || !m_frame->settings()->rootLayerScrolls()) { 1096 if (!m_frame->settings() || !m_frame->settings()->rootLayerScrolls()) {
1097 paintInvalidationState.setViewClippingAndScrollOffsetDisabled(true); 1097 paintInvalidationState.setViewClippingAndScrollOffsetDisabled(true);
1098 invalidatePaintOfScrollControlsIfNeeded(paintInvalidationState, paintInv alidationState.paintInvalidationContainer()); 1098 invalidatePaintOfScrollControlsIfNeeded(paintInvalidationState);
1099 paintInvalidationState.setViewClippingAndScrollOffsetDisabled(false); 1099 paintInvalidationState.setViewClippingAndScrollOffsetDisabled(false);
1100 } 1100 }
1101 1101
1102 #if ENABLE(ASSERT) 1102 #if ENABLE(ASSERT)
1103 layoutView()->assertSubtreeClearedPaintInvalidationState(); 1103 layoutView()->assertSubtreeClearedPaintInvalidationState();
1104 #endif 1104 #endif
1105 1105
1106 if (m_frame->selection().isCaretBoundsDirty()) 1106 if (m_frame->selection().isCaretBoundsDirty())
1107 m_frame->selection().invalidateCaretRect(); 1107 m_frame->selection().invalidateCaretRect();
1108 1108
(...skipping 3001 matching lines...) Expand 10 before | Expand all | Expand 10 after
4110 return m_hiddenForThrottling && m_crossOriginForThrottling; 4110 return m_hiddenForThrottling && m_crossOriginForThrottling;
4111 } 4111 }
4112 4112
4113 LayoutBox& FrameView::boxForScrollControlPaintInvalidation() const 4113 LayoutBox& FrameView::boxForScrollControlPaintInvalidation() const
4114 { 4114 {
4115 ASSERT(layoutView()); 4115 ASSERT(layoutView());
4116 return *layoutView(); 4116 return *layoutView();
4117 } 4117 }
4118 4118
4119 } // namespace blink 4119 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698