OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2012 Apple Inc. All rights reserved. | 2 * Copyright (C) 2012 Apple Inc. All rights reserved. |
3 * | 3 * |
4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
6 * are met: | 6 * are met: |
7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
(...skipping 368 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
379 overflowRect.shiftMaxYEdgeTo(portionRect.maxY() + colGap - colGap /
2); | 379 overflowRect.shiftMaxYEdgeTo(portionRect.maxY() + colGap - colGap /
2); |
380 } | 380 } |
381 return overflowRect; | 381 return overflowRect; |
382 } | 382 } |
383 | 383 |
384 void RenderMultiColumnSet::paintObject(PaintInfo& paintInfo, const LayoutPoint&
paintOffset) | 384 void RenderMultiColumnSet::paintObject(PaintInfo& paintInfo, const LayoutPoint&
paintOffset) |
385 { | 385 { |
386 if (style()->visibility() != VISIBLE) | 386 if (style()->visibility() != VISIBLE) |
387 return; | 387 return; |
388 | 388 |
389 RenderBlock::paintObject(paintInfo, paintOffset); | 389 RenderBlockFlow::paintObject(paintInfo, paintOffset); |
390 | 390 |
391 // FIXME: Right now we're only painting in the foreground phase. | 391 // FIXME: Right now we're only painting in the foreground phase. |
392 // Columns should technically respect phases and allow for background/float/
foreground overlap etc., just like | 392 // Columns should technically respect phases and allow for background/float/
foreground overlap etc., just like |
393 // RenderBlocks do. Note this is a pretty minor issue, since the old column
implementation clipped columns | 393 // RenderBlocks do. Note this is a pretty minor issue, since the old column
implementation clipped columns |
394 // anyway, thus making it impossible for them to overlap one another. It's a
lso really unlikely that the columns | 394 // anyway, thus making it impossible for them to overlap one another. It's a
lso really unlikely that the columns |
395 // would overlap another block. | 395 // would overlap another block. |
396 if (!m_flowThread || !isValid() || (paintInfo.phase != PaintPhaseForeground
&& paintInfo.phase != PaintPhaseSelection)) | 396 if (!m_flowThread || !isValid() || (paintInfo.phase != PaintPhaseForeground
&& paintInfo.phase != PaintPhaseSelection)) |
397 return; | 397 return; |
398 | 398 |
399 paintColumnRules(paintInfo, paintOffset); | 399 paintColumnRules(paintInfo, paintOffset); |
(...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
584 fragments.append(fragment); | 584 fragments.append(fragment); |
585 } | 585 } |
586 } | 586 } |
587 | 587 |
588 const char* RenderMultiColumnSet::renderName() const | 588 const char* RenderMultiColumnSet::renderName() const |
589 { | 589 { |
590 return "RenderMultiColumnSet"; | 590 return "RenderMultiColumnSet"; |
591 } | 591 } |
592 | 592 |
593 } | 593 } |
OLD | NEW |