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

Side by Side Diff: Source/WebCore/rendering/RenderLayer.cpp

Issue 12851007: Revert 143825 "RenderLayer::scrollTo() should call FrameLoaderCl..." (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1441/
Patch Set: Created 7 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 | no next file » | 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) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved.
3 * 3 *
4 * Portions are Copyright (C) 1998 Netscape Communications Corporation. 4 * Portions are Copyright (C) 1998 Netscape Communications Corporation.
5 * 5 *
6 * Other contributors: 6 * Other contributors:
7 * Robert O'Callahan <roc+@cs.cmu.edu> 7 * Robert O'Callahan <roc+@cs.cmu.edu>
8 * David Baron <dbaron@fas.harvard.edu> 8 * David Baron <dbaron@fas.harvard.edu>
9 * Christian Biesinger <cbiesinger@web.de> 9 * Christian Biesinger <cbiesinger@web.de>
10 * Randall Jesup <rjesup@wgate.com> 10 * Randall Jesup <rjesup@wgate.com>
(...skipping 2196 matching lines...) Expand 10 before | Expand all | Expand 10 after
2207 2207
2208 // Just schedule a full repaint of our object. 2208 // Just schedule a full repaint of our object.
2209 if (view && requiresRepaint) 2209 if (view && requiresRepaint)
2210 renderer()->repaintUsingContainer(repaintContainer, pixelSnappedIntRect( m_repaintRect)); 2210 renderer()->repaintUsingContainer(repaintContainer, pixelSnappedIntRect( m_repaintRect));
2211 2211
2212 // Schedule the scroll DOM event. 2212 // Schedule the scroll DOM event.
2213 if (renderer()->node()) 2213 if (renderer()->node())
2214 renderer()->node()->document()->eventQueue()->enqueueOrDispatchScrollEve nt(renderer()->node(), DocumentEventQueue::ScrollEventElementTarget); 2214 renderer()->node()->document()->eventQueue()->enqueueOrDispatchScrollEve nt(renderer()->node(), DocumentEventQueue::ScrollEventElementTarget);
2215 2215
2216 InspectorInstrumentation::didScrollLayer(frame); 2216 InspectorInstrumentation::didScrollLayer(frame);
2217 frame->loader()->client()->didChangeScrollOffset();
2218 } 2217 }
2219 2218
2220 static inline bool frameElementAndViewPermitScroll(HTMLFrameElement* frameElemen t, FrameView* frameView) 2219 static inline bool frameElementAndViewPermitScroll(HTMLFrameElement* frameElemen t, FrameView* frameView)
2221 { 2220 {
2222 // If scrollbars aren't explicitly forbidden, permit scrolling. 2221 // If scrollbars aren't explicitly forbidden, permit scrolling.
2223 if (frameElement && frameElement->scrollingMode() != ScrollbarAlwaysOff) 2222 if (frameElement && frameElement->scrollingMode() != ScrollbarAlwaysOff)
2224 return true; 2223 return true;
2225 2224
2226 // If scrollbars are forbidden, user initiated scrolls should obviously be i gnored. 2225 // If scrollbars are forbidden, user initiated scrolls should obviously be i gnored.
2227 if (frameView->wasScrolledByUser()) 2226 if (frameView->wasScrolledByUser())
(...skipping 4111 matching lines...) Expand 10 before | Expand all | Expand 10 after
6339 } 6338 }
6340 } 6339 }
6341 6340
6342 void showLayerTree(const WebCore::RenderObject* renderer) 6341 void showLayerTree(const WebCore::RenderObject* renderer)
6343 { 6342 {
6344 if (!renderer) 6343 if (!renderer)
6345 return; 6344 return;
6346 showLayerTree(renderer->enclosingLayer()); 6345 showLayerTree(renderer->enclosingLayer());
6347 } 6346 }
6348 #endif 6347 #endif
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698