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

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

Issue 332543002: Rename Repaint to Paint Invalidation Part 4 (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 6 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/rendering/RenderListMarker.cpp ('k') | Source/core/rendering/RenderMenuList.cpp » ('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 240 matching lines...) Expand 10 before | Expand all | Expand 10 after
251 251
252 if (speed() != marqueeSpeed()) { 252 if (speed() != marqueeSpeed()) {
253 m_speed = marqueeSpeed(); 253 m_speed = marqueeSpeed();
254 if (m_timer.isActive()) 254 if (m_timer.isActive())
255 m_timer.startRepeating(speed() * 0.001, FROM_HERE); 255 m_timer.startRepeating(speed() * 0.001, FROM_HERE);
256 } 256 }
257 257
258 // Check the loop count to see if we should now stop. 258 // Check the loop count to see if we should now stop.
259 bool activate = (m_totalLoops <= 0 || m_currentLoop < m_totalLoops); 259 bool activate = (m_totalLoops <= 0 || m_currentLoop < m_totalLoops);
260 if (activate && !m_timer.isActive()) 260 if (activate && !m_timer.isActive())
261 setNeedsLayoutAndFullRepaint(); 261 setNeedsLayoutAndFullPaintInvalidation();
262 else if (!activate && m_timer.isActive()) 262 else if (!activate && m_timer.isActive())
263 m_timer.stop(); 263 m_timer.stop();
264 } 264 }
265 265
266 void RenderMarquee::layoutBlock(bool relayoutChildren) 266 void RenderMarquee::layoutBlock(bool relayoutChildren)
267 { 267 {
268 RenderBlockFlow::layoutBlock(relayoutChildren); 268 RenderBlockFlow::layoutBlock(relayoutChildren);
269 269
270 updateMarqueePosition(); 270 updateMarqueePosition();
271 } 271 }
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
320 m_reset = true; 320 m_reset = true;
321 } 321 }
322 322
323 if (isHorizontal()) 323 if (isHorizontal())
324 layer()->scrollableArea()->scrollToXOffset(newPos); 324 layer()->scrollableArea()->scrollToXOffset(newPos);
325 else 325 else
326 layer()->scrollableArea()->scrollToYOffset(newPos); 326 layer()->scrollableArea()->scrollToYOffset(newPos);
327 } 327 }
328 328
329 } // namespace WebCore 329 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderListMarker.cpp ('k') | Source/core/rendering/RenderMenuList.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698