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

Side by Side Diff: Source/core/rendering/RenderMarquee.cpp

Issue 135043007: Remove default parameter from virtual layoutBlock function (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 11 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 | « Source/core/rendering/RenderMarquee.h ('k') | Source/core/rendering/RenderRegion.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) 2006, 2007, 2008 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved.
3 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/) 3 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/)
4 * 4 *
5 * Portions are Copyright (C) 1998 Netscape Communications Corporation. 5 * Portions are Copyright (C) 1998 Netscape Communications Corporation.
6 * 6 *
7 * Other contributors: 7 * Other contributors:
8 * Robert O'Callahan <roc+@cs.cmu.edu> 8 * Robert O'Callahan <roc+@cs.cmu.edu>
9 * David Baron <dbaron@fas.harvard.edu> 9 * David Baron <dbaron@fas.harvard.edu>
10 * Christian Biesinger <cbiesinger@web.de> 10 * Christian Biesinger <cbiesinger@web.de>
(...skipping 242 matching lines...) Expand 10 before | Expand all | Expand 10 after
253 } 253 }
254 254
255 // Check the loop count to see if we should now stop. 255 // Check the loop count to see if we should now stop.
256 bool activate = (m_totalLoops <= 0 || m_currentLoop < m_totalLoops); 256 bool activate = (m_totalLoops <= 0 || m_currentLoop < m_totalLoops);
257 if (activate && !m_timer.isActive()) 257 if (activate && !m_timer.isActive())
258 setNeedsLayout(); 258 setNeedsLayout();
259 else if (!activate && m_timer.isActive()) 259 else if (!activate && m_timer.isActive())
260 m_timer.stop(); 260 m_timer.stop();
261 } 261 }
262 262
263 void RenderMarquee::layoutBlock(bool relayoutChildren, LayoutUnit pageLogicalHei ght) 263 void RenderMarquee::layoutBlock(bool relayoutChildren)
264 { 264 {
265 RenderBlockFlow::layoutBlock(relayoutChildren, pageLogicalHeight); 265 RenderBlockFlow::layoutBlock(relayoutChildren);
266 266
267 updateMarqueePosition(); 267 updateMarqueePosition();
268 } 268 }
269 269
270 void RenderMarquee::timerFired() 270 void RenderMarquee::timerFired()
271 { 271 {
272 // FIXME: Why do we need to check the view and not just the RenderMarquee it self? 272 // FIXME: Why do we need to check the view and not just the RenderMarquee it self?
273 if (view()->needsLayout()) 273 if (view()->needsLayout())
274 return; 274 return;
275 275
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
317 m_reset = true; 317 m_reset = true;
318 } 318 }
319 319
320 if (isHorizontal()) 320 if (isHorizontal())
321 layer()->scrollableArea()->scrollToXOffset(newPos); 321 layer()->scrollableArea()->scrollToXOffset(newPos);
322 else 322 else
323 layer()->scrollableArea()->scrollToYOffset(newPos); 323 layer()->scrollableArea()->scrollToYOffset(newPos);
324 } 324 }
325 325
326 } // namespace WebCore 326 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderMarquee.h ('k') | Source/core/rendering/RenderRegion.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698