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

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

Issue 480623002: Remove unused second parameter to scrollContentsFastPath (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/frame/FrameView.h ('k') | Source/platform/scroll/ScrollView.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 1237 matching lines...) Expand 10 before | Expand all | Expand 10 after
1248 } 1248 }
1249 1249
1250 void FrameView::scrollContentsIfNeeded() 1250 void FrameView::scrollContentsIfNeeded()
1251 { 1251 {
1252 bool didScroll = !pendingScrollDelta().isZero(); 1252 bool didScroll = !pendingScrollDelta().isZero();
1253 ScrollView::scrollContentsIfNeeded(); 1253 ScrollView::scrollContentsIfNeeded();
1254 if (didScroll) 1254 if (didScroll)
1255 updateFixedElementPaintInvalidationRectsAfterScroll(); 1255 updateFixedElementPaintInvalidationRectsAfterScroll();
1256 } 1256 }
1257 1257
1258 bool FrameView::scrollContentsFastPath(const IntSize& scrollDelta, const IntRect & rectToScroll) 1258 bool FrameView::scrollContentsFastPath(const IntSize& scrollDelta)
1259 { 1259 {
1260 if (!contentsInCompositedLayer() || hasSlowRepaintObjects()) 1260 if (!contentsInCompositedLayer() || hasSlowRepaintObjects())
1261 return false; 1261 return false;
1262 1262
1263 if (!m_viewportConstrainedObjects || m_viewportConstrainedObjects->isEmpty() ) { 1263 if (!m_viewportConstrainedObjects || m_viewportConstrainedObjects->isEmpty() ) {
1264 hostWindow()->scroll(); 1264 hostWindow()->scroll();
1265 return true; 1265 return true;
1266 } 1266 }
1267 1267
1268 // Get the rects of the fixed objects visible in the rectToScroll
1269 Region regionToUpdate; 1268 Region regionToUpdate;
1270 ViewportConstrainedObjectSet::const_iterator end = m_viewportConstrainedObje cts->end(); 1269 ViewportConstrainedObjectSet::const_iterator end = m_viewportConstrainedObje cts->end();
1271 for (ViewportConstrainedObjectSet::const_iterator it = m_viewportConstrained Objects->begin(); it != end; ++it) { 1270 for (ViewportConstrainedObjectSet::const_iterator it = m_viewportConstrained Objects->begin(); it != end; ++it) {
1272 RenderObject* renderer = *it; 1271 RenderObject* renderer = *it;
1273 // m_viewportConstrainedObjects should not contain non-viewport constrai ned objects. 1272 // m_viewportConstrainedObjects should not contain non-viewport constrai ned objects.
1274 ASSERT(renderer->style()->hasViewportConstrainedPosition()); 1273 ASSERT(renderer->style()->hasViewportConstrainedPosition());
1275 1274
1276 // Fixed items should always have layers. 1275 // Fixed items should always have layers.
1277 ASSERT(renderer->hasLayer()); 1276 ASSERT(renderer->hasLayer());
1278 RenderLayer* layer = toRenderBoxModelObject(renderer)->layer(); 1277 RenderLayer* layer = toRenderBoxModelObject(renderer)->layer();
(...skipping 1856 matching lines...) Expand 10 before | Expand all | Expand 10 after
3135 void FrameView::willRemoveScrollbar(Scrollbar* scrollbar, ScrollbarOrientation o rientation) 3134 void FrameView::willRemoveScrollbar(Scrollbar* scrollbar, ScrollbarOrientation o rientation)
3136 { 3135 {
3137 ScrollableArea::willRemoveScrollbar(scrollbar, orientation); 3136 ScrollableArea::willRemoveScrollbar(scrollbar, orientation);
3138 if (AXObjectCache* cache = axObjectCache()) { 3137 if (AXObjectCache* cache = axObjectCache()) {
3139 cache->remove(scrollbar); 3138 cache->remove(scrollbar);
3140 cache->handleScrollbarUpdate(this); 3139 cache->handleScrollbarUpdate(this);
3141 } 3140 }
3142 } 3141 }
3143 3142
3144 } // namespace blink 3143 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/frame/FrameView.h ('k') | Source/platform/scroll/ScrollView.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698