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

Side by Side Diff: third_party/WebKit/Source/core/layout/ScrollAnchor.cpp

Issue 1875943004: [DNS] Don't adjust the scroll position if the anchor element changes in size (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: nit Created 4 years, 8 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 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "core/layout/ScrollAnchor.h" 5 #include "core/layout/ScrollAnchor.h"
6 6
7 #include "core/frame/FrameView.h" 7 #include "core/frame/FrameView.h"
8 #include "core/frame/UseCounter.h" 8 #include "core/frame/UseCounter.h"
9 #include "core/layout/LayoutView.h" 9 #include "core/layout/LayoutView.h"
10 #include "core/layout/line/InlineTextBox.h" 10 #include "core/layout/line/InlineTextBox.h"
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after
156 } 156 }
157 if (m_anchorObject) 157 if (m_anchorObject)
158 return; 158 return;
159 159
160 findAnchor(); 160 findAnchor();
161 if (!m_anchorObject) 161 if (!m_anchorObject)
162 return; 162 return;
163 163
164 m_anchorObject->setIsScrollAnchorObject(); 164 m_anchorObject->setIsScrollAnchorObject();
165 m_savedRelativeOffset = computeRelativeOffset(m_anchorObject, m_scroller, m_ corner); 165 m_savedRelativeOffset = computeRelativeOffset(m_anchorObject, m_scroller, m_ corner);
166 m_savedAnchorSize = toLayoutBox(m_anchorObject)->size();
166 } 167 }
167 168
168 void ScrollAnchor::restore() 169 void ScrollAnchor::restore()
169 { 170 {
170 if (!m_anchorObject) 171 if (!m_anchorObject)
171 return; 172 return;
172 173
174 if (toLayoutBox(m_anchorObject)->size() != m_savedAnchorSize) {
175 clear();
176 return;
177 }
178
173 LayoutSize adjustment = computeRelativeOffset(m_anchorObject, m_scroller, m_ corner) - m_savedRelativeOffset; 179 LayoutSize adjustment = computeRelativeOffset(m_anchorObject, m_scroller, m_ corner) - m_savedRelativeOffset;
174 if (!adjustment.isZero()) { 180 if (!adjustment.isZero()) {
175 m_scroller->setScrollPosition( 181 m_scroller->setScrollPosition(
176 m_scroller->scrollPositionDouble() + DoubleSize(adjustment), 182 m_scroller->scrollPositionDouble() + DoubleSize(adjustment),
177 AnchoringScroll); 183 AnchoringScroll);
178 // Update UMA metric. 184 // Update UMA metric.
179 DEFINE_STATIC_LOCAL(EnumerationHistogram, adjustedOffsetHistogram, 185 DEFINE_STATIC_LOCAL(EnumerationHistogram, adjustedOffsetHistogram,
180 ("Layout.ScrollAnchor.AdjustedScrollOffset", 2)); 186 ("Layout.ScrollAnchor.AdjustedScrollOffset", 2));
181 adjustedOffsetHistogram.count(1); 187 adjustedOffsetHistogram.count(1);
182 UseCounter::count(scrollerLayoutBox(m_scroller)->document(), UseCounter: :ScrollAnchored); 188 UseCounter::count(scrollerLayoutBox(m_scroller)->document(), UseCounter: :ScrollAnchored);
183 } 189 }
184 } 190 }
185 191
186 void ScrollAnchor::clear() 192 void ScrollAnchor::clear()
187 { 193 {
188 LayoutObject* anchorObject = m_anchorObject; 194 LayoutObject* anchorObject = m_anchorObject;
189 m_anchorObject = nullptr; 195 m_anchorObject = nullptr;
190 196
191 if (anchorObject) 197 if (anchorObject)
192 anchorObject->maybeClearIsScrollAnchorObject(); 198 anchorObject->maybeClearIsScrollAnchorObject();
193 } 199 }
194 200
195 } // namespace blink 201 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/layout/ScrollAnchor.h ('k') | third_party/WebKit/Source/core/layout/ScrollAnchorTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698