| 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 551 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 562 clippedRect.intersect(translatedDirtyRect); | 562 clippedRect.intersect(translatedDirtyRect); |
| 563 if (clippedRect.isEmpty()) | 563 if (clippedRect.isEmpty()) |
| 564 continue; | 564 continue; |
| 565 | 565 |
| 566 // Something does need to paint in this column. Make a fragment now and
supply the physical translation | 566 // Something does need to paint in this column. Make a fragment now and
supply the physical translation |
| 567 // offset and the clip rect for the column with that offset applied. | 567 // offset and the clip rect for the column with that offset applied. |
| 568 LayerFragment fragment; | 568 LayerFragment fragment; |
| 569 fragment.paginationOffset = translationOffset; | 569 fragment.paginationOffset = translationOffset; |
| 570 | 570 |
| 571 LayoutRect flippedFlowThreadOverflowPortion(flowThreadOverflowPortion); | 571 LayoutRect flippedFlowThreadOverflowPortion(flowThreadOverflowPortion); |
| 572 // Flip it into more a physical (RenderLayer-style) rectangle. | 572 // Flip it into more a physical (Layer-style) rectangle. |
| 573 flowThread->flipForWritingMode(flippedFlowThreadOverflowPortion); | 573 flowThread->flipForWritingMode(flippedFlowThreadOverflowPortion); |
| 574 fragment.paginationClip = flippedFlowThreadOverflowPortion; | 574 fragment.paginationClip = flippedFlowThreadOverflowPortion; |
| 575 fragments.append(fragment); | 575 fragments.append(fragment); |
| 576 } | 576 } |
| 577 } | 577 } |
| 578 | 578 |
| 579 void RenderMultiColumnSet::addOverflowFromChildren() | 579 void RenderMultiColumnSet::addOverflowFromChildren() |
| 580 { | 580 { |
| 581 unsigned colCount = actualColumnCount(); | 581 unsigned colCount = actualColumnCount(); |
| 582 if (!colCount) | 582 if (!colCount) |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 624 | 624 |
| 625 void RenderMultiColumnSet::detachRegion() | 625 void RenderMultiColumnSet::detachRegion() |
| 626 { | 626 { |
| 627 if (m_flowThread) { | 627 if (m_flowThread) { |
| 628 m_flowThread->removeRegionFromThread(this); | 628 m_flowThread->removeRegionFromThread(this); |
| 629 m_flowThread = 0; | 629 m_flowThread = 0; |
| 630 } | 630 } |
| 631 } | 631 } |
| 632 | 632 |
| 633 } | 633 } |
| OLD | NEW |