| 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 471 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 482 LayoutUnit ruleTop = isHorizontalWritingMode() ? paintOffset.y() + b
orderTop() + paddingTop() : paintOffset.y() + ruleLogicalLeft - ruleThickness /
2 + ruleAdd; | 482 LayoutUnit ruleTop = isHorizontalWritingMode() ? paintOffset.y() + b
orderTop() + paddingTop() : paintOffset.y() + ruleLogicalLeft - ruleThickness /
2 + ruleAdd; |
| 483 LayoutUnit ruleBottom = isHorizontalWritingMode() ? ruleTop + conten
tHeight() : ruleTop + ruleThickness; | 483 LayoutUnit ruleBottom = isHorizontalWritingMode() ? ruleTop + conten
tHeight() : ruleTop + ruleThickness; |
| 484 IntRect pixelSnappedRuleRect = pixelSnappedIntRectFromEdges(ruleLeft
, ruleTop, ruleRight, ruleBottom); | 484 IntRect pixelSnappedRuleRect = pixelSnappedIntRectFromEdges(ruleLeft
, ruleTop, ruleRight, ruleBottom); |
| 485 drawLineForBoxSide(paintInfo.context, pixelSnappedRuleRect.x(), pixe
lSnappedRuleRect.y(), pixelSnappedRuleRect.maxX(), pixelSnappedRuleRect.maxY(),
boxSide, ruleColor, ruleStyle, 0, 0, antialias); | 485 drawLineForBoxSide(paintInfo.context, pixelSnappedRuleRect.x(), pixe
lSnappedRuleRect.y(), pixelSnappedRuleRect.maxX(), pixelSnappedRuleRect.maxY(),
boxSide, ruleColor, ruleStyle, 0, 0, antialias); |
| 486 } | 486 } |
| 487 | 487 |
| 488 ruleLogicalLeft = currLogicalLeftOffset; | 488 ruleLogicalLeft = currLogicalLeftOffset; |
| 489 } | 489 } |
| 490 } | 490 } |
| 491 | 491 |
| 492 void RenderMultiColumnSet::paintInvalidationForFlowThreadContent(const LayoutRec
t& paintInvalidationRect) const | 492 void RenderMultiColumnSet::paintInvalidationForFlowThreadContent(const LayoutRec
t& paintInvalidationRect) |
| 493 { | 493 { |
| 494 // Figure out the start and end columns and only check within that range so
that we don't walk the | 494 // Figure out the start and end columns and only check within that range so
that we don't walk the |
| 495 // entire column set. Put the paint invalidation rect into flow thread coord
inates by flipping it first. | 495 // entire column set. Put the paint invalidation rect into flow thread coord
inates by flipping it first. |
| 496 LayoutRect flowThreadPaintInvalidationRect(paintInvalidationRect); | 496 LayoutRect flowThreadPaintInvalidationRect(paintInvalidationRect); |
| 497 flowThread()->flipForWritingMode(flowThreadPaintInvalidationRect); | 497 flowThread()->flipForWritingMode(flowThreadPaintInvalidationRect); |
| 498 | 498 |
| 499 // Now we can compare this rect with the flow thread portions owned by each
column. First let's | 499 // Now we can compare this rect with the flow thread portions owned by each
column. First let's |
| 500 // just see if the paint invalidation rect intersects our flow thread portio
n at all. | 500 // just see if the paint invalidation rect intersects our flow thread portio
n at all. |
| 501 LayoutRect clippedRect(flowThreadPaintInvalidationRect); | 501 LayoutRect clippedRect(flowThreadPaintInvalidationRect); |
| 502 clippedRect.intersect(RenderRegion::flowThreadPortionOverflowRect()); | 502 clippedRect.intersect(RenderRegion::flowThreadPortionOverflowRect()); |
| (...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 684 | 684 |
| 685 void RenderMultiColumnSet::detachRegion() | 685 void RenderMultiColumnSet::detachRegion() |
| 686 { | 686 { |
| 687 if (m_flowThread) { | 687 if (m_flowThread) { |
| 688 m_flowThread->removeRegionFromThread(this); | 688 m_flowThread->removeRegionFromThread(this); |
| 689 m_flowThread = 0; | 689 m_flowThread = 0; |
| 690 } | 690 } |
| 691 } | 691 } |
| 692 | 692 |
| 693 } | 693 } |
| OLD | NEW |