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 323 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
334 | 334 |
335 paintColumnRules(paintInfo, paintOffset); | 335 paintColumnRules(paintInfo, paintOffset); |
336 } | 336 } |
337 | 337 |
338 void RenderMultiColumnSet::paintColumnRules(PaintInfo& paintInfo, const LayoutPo
int& paintOffset) | 338 void RenderMultiColumnSet::paintColumnRules(PaintInfo& paintInfo, const LayoutPo
int& paintOffset) |
339 { | 339 { |
340 if (paintInfo.context->paintingDisabled()) | 340 if (paintInfo.context->paintingDisabled()) |
341 return; | 341 return; |
342 | 342 |
343 RenderStyle* blockStyle = toRenderMultiColumnBlock(parent())->style(); | 343 RenderStyle* blockStyle = toRenderMultiColumnBlock(parent())->style(); |
344 const Color& ruleColor = blockStyle->visitedDependentColor(CSSPropertyWebkit
ColumnRuleColor); | 344 const Color& ruleColor = resolveColor(blockStyle, CSSPropertyWebkitColumnRul
eColor); |
345 bool ruleTransparent = blockStyle->columnRuleIsTransparent(); | 345 bool ruleTransparent = blockStyle->columnRuleIsTransparent(); |
346 EBorderStyle ruleStyle = blockStyle->columnRuleStyle(); | 346 EBorderStyle ruleStyle = blockStyle->columnRuleStyle(); |
347 LayoutUnit ruleThickness = blockStyle->columnRuleWidth(); | 347 LayoutUnit ruleThickness = blockStyle->columnRuleWidth(); |
348 LayoutUnit colGap = columnGap(); | 348 LayoutUnit colGap = columnGap(); |
349 bool renderRule = ruleStyle > BHIDDEN && !ruleTransparent; | 349 bool renderRule = ruleStyle > BHIDDEN && !ruleTransparent; |
350 if (!renderRule) | 350 if (!renderRule) |
351 return; | 351 return; |
352 | 352 |
353 unsigned colCount = columnCount(); | 353 unsigned colCount = columnCount(); |
354 if (colCount <= 1) | 354 if (colCount <= 1) |
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
508 fragments.append(fragment); | 508 fragments.append(fragment); |
509 } | 509 } |
510 } | 510 } |
511 | 511 |
512 const char* RenderMultiColumnSet::renderName() const | 512 const char* RenderMultiColumnSet::renderName() const |
513 { | 513 { |
514 return "RenderMultiColumnSet"; | 514 return "RenderMultiColumnSet"; |
515 } | 515 } |
516 | 516 |
517 } | 517 } |
OLD | NEW |