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

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

Issue 163513002: Have RenderBlockFlow sub-classes' methods call their super-class method properly. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 10 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) 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 198 matching lines...) Expand 10 before | Expand all | Expand 10 after
209 if (isAnonymous()) 209 if (isAnonymous())
210 return "RenderMarquee (generated)"; 210 return "RenderMarquee (generated)";
211 if (isRelPositioned()) 211 if (isRelPositioned())
212 return "RenderMarquee (relative positioned)"; 212 return "RenderMarquee (relative positioned)";
213 return "RenderMarquee"; 213 return "RenderMarquee";
214 214
215 } 215 }
216 216
217 void RenderMarquee::styleDidChange(StyleDifference difference, const RenderStyle * oldStyle) 217 void RenderMarquee::styleDidChange(StyleDifference difference, const RenderStyle * oldStyle)
218 { 218 {
219 RenderBlock::styleDidChange(difference, oldStyle); 219 RenderBlockFlow::styleDidChange(difference, oldStyle);
220 220
221 RenderStyle* s = style(); 221 RenderStyle* s = style();
222 222
223 if (m_direction != s->marqueeDirection() || (m_totalLoops != s->marqueeLoopC ount() && m_currentLoop >= m_totalLoops)) 223 if (m_direction != s->marqueeDirection() || (m_totalLoops != s->marqueeLoopC ount() && m_currentLoop >= m_totalLoops))
224 m_currentLoop = 0; // When direction changes or our loopCount is a small er number than our current loop, reset our loop. 224 m_currentLoop = 0; // When direction changes or our loopCount is a small er number than our current loop, reset our loop.
225 225
226 m_totalLoops = s->marqueeLoopCount(); 226 m_totalLoops = s->marqueeLoopCount();
227 m_direction = s->marqueeDirection(); 227 m_direction = s->marqueeDirection();
228 228
229 // Hack for WinIE. In WinIE, a value of 0 or lower for the loop count for SL IDE means to only do 229 // Hack for WinIE. In WinIE, a value of 0 or lower for the loop count for SL IDE means to only do
(...skipping 87 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/RenderListItem.cpp ('k') | Source/core/rendering/RenderMediaControlElements.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698