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

Side by Side Diff: Source/core/page/scrolling/ScrollingCoordinator.cpp

Issue 1256043007: Recompute slow scroll regions after overflow recalc (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Minor test updates Created 5 years, 4 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) 2011 Apple Inc. All rights reserved. 2 * Copyright (C) 2011 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
122 } 122 }
123 } 123 }
124 124
125 void ScrollingCoordinator::notifyLayoutUpdated() 125 void ScrollingCoordinator::notifyLayoutUpdated()
126 { 126 {
127 m_scrollGestureRegionIsDirty = true; 127 m_scrollGestureRegionIsDirty = true;
128 m_touchEventTargetRectsAreDirty = true; 128 m_touchEventTargetRectsAreDirty = true;
129 m_shouldScrollOnMainThreadDirty = true; 129 m_shouldScrollOnMainThreadDirty = true;
130 } 130 }
131 131
132 void ScrollingCoordinator::notifyOverflowUpdated()
133 {
134 m_scrollGestureRegionIsDirty = true;
135 }
136
132 void ScrollingCoordinator::scrollableAreasDidChange() 137 void ScrollingCoordinator::scrollableAreasDidChange()
133 { 138 {
134 ASSERT(m_page); 139 ASSERT(m_page);
135 if (!m_page->mainFrame()->isLocalFrame() || !m_page->deprecatedLocalMainFram e()->view()) 140 if (!m_page->mainFrame()->isLocalFrame() || !m_page->deprecatedLocalMainFram e()->view())
136 return; 141 return;
137 142
138 // Layout may update scrollable area bounding boxes. It also sets the same d irty 143 // Layout may update scrollable area bounding boxes. It also sets the same d irty
139 // flag making this one redundant (See |ScrollingCoordinator::notifyLayoutUp dated|). 144 // flag making this one redundant (See |ScrollingCoordinator::notifyLayoutUp dated|).
140 // So if layout is expected, ignore this call allowing scrolling coordinator 145 // So if layout is expected, ignore this call allowing scrolling coordinator
141 // to be notified post-layout to recompute gesture regions. 146 // to be notified post-layout to recompute gesture regions.
(...skipping 919 matching lines...) Expand 10 before | Expand all | Expand 10 after
1061 bool frameIsScrollable = frameView && frameView->isScrollable(); 1066 bool frameIsScrollable = frameView && frameView->isScrollable();
1062 if (frameIsScrollable != m_wasFrameScrollable) 1067 if (frameIsScrollable != m_wasFrameScrollable)
1063 return true; 1068 return true;
1064 1069
1065 if (WebLayer* scrollLayer = frameView ? toWebLayer(frameView->layerForScroll ing()) : nullptr) 1070 if (WebLayer* scrollLayer = frameView ? toWebLayer(frameView->layerForScroll ing()) : nullptr)
1066 return WebSize(frameView->contentsSize()) != scrollLayer->bounds(); 1071 return WebSize(frameView->contentsSize()) != scrollLayer->bounds();
1067 return false; 1072 return false;
1068 } 1073 }
1069 1074
1070 } // namespace blink 1075 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698