OLD | NEW |
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 191 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
202 const char* RenderMarquee::renderName() const | 202 const char* RenderMarquee::renderName() const |
203 { | 203 { |
204 if (isFloating()) | 204 if (isFloating()) |
205 return "RenderMarquee (floating)"; | 205 return "RenderMarquee (floating)"; |
206 if (isOutOfFlowPositioned()) | 206 if (isOutOfFlowPositioned()) |
207 return "RenderMarquee (positioned)"; | 207 return "RenderMarquee (positioned)"; |
208 if (isAnonymous()) | 208 if (isAnonymous()) |
209 return "RenderMarquee (generated)"; | 209 return "RenderMarquee (generated)"; |
210 if (isRelPositioned()) | 210 if (isRelPositioned()) |
211 return "RenderMarquee (relative positioned)"; | 211 return "RenderMarquee (relative positioned)"; |
212 if (isRunIn()) | |
213 return "RenderMarquee (run-in)"; | |
214 return "RenderMarquee"; | 212 return "RenderMarquee"; |
215 | 213 |
216 } | 214 } |
217 | 215 |
218 void RenderMarquee::styleDidChange(StyleDifference difference, const RenderStyle
* oldStyle) | 216 void RenderMarquee::styleDidChange(StyleDifference difference, const RenderStyle
* oldStyle) |
219 { | 217 { |
220 RenderBlock::styleDidChange(difference, oldStyle); | 218 RenderBlock::styleDidChange(difference, oldStyle); |
221 | 219 |
222 RenderStyle* s = style(); | 220 RenderStyle* s = style(); |
223 | 221 |
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
318 m_reset = true; | 316 m_reset = true; |
319 } | 317 } |
320 | 318 |
321 if (isHorizontal()) | 319 if (isHorizontal()) |
322 layer()->scrollableArea()->scrollToXOffset(newPos); | 320 layer()->scrollableArea()->scrollToXOffset(newPos); |
323 else | 321 else |
324 layer()->scrollableArea()->scrollToYOffset(newPos); | 322 layer()->scrollableArea()->scrollToYOffset(newPos); |
325 } | 323 } |
326 | 324 |
327 } // namespace WebCore | 325 } // namespace WebCore |
OLD | NEW |