| 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 555 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 566 && !regionIsEmpty | 566 && !regionIsEmpty |
| 567 && logicalTopForBox < logicalBottomForRegion && logicalTopForRegion < lo
gicalBottomForBox; | 567 && logicalTopForBox < logicalBottomForRegion && logicalTopForRegion < lo
gicalBottomForBox; |
| 568 } | 568 } |
| 569 | 569 |
| 570 // Retrieve the next node to be visited while computing the ranges inside a regi
on. | 570 // Retrieve the next node to be visited while computing the ranges inside a regi
on. |
| 571 static Node* nextNodeInsideContentNode(const Node& currNode, const Node* content
Node) | 571 static Node* nextNodeInsideContentNode(const Node& currNode, const Node* content
Node) |
| 572 { | 572 { |
| 573 ASSERT(contentNode && contentNode->inNamedFlow()); | 573 ASSERT(contentNode && contentNode->inNamedFlow()); |
| 574 | 574 |
| 575 if (currNode.renderer() && currNode.renderer()->isSVGRoot()) | 575 if (currNode.renderer() && currNode.renderer()->isSVGRoot()) |
| 576 return NodeTraversal::nextSkippingChildren(&currNode, contentNode); | 576 return NodeTraversal::nextSkippingChildren(currNode, contentNode); |
| 577 return NodeTraversal::next(currNode, contentNode); | 577 return NodeTraversal::next(currNode, contentNode); |
| 578 } | 578 } |
| 579 | 579 |
| 580 void RenderNamedFlowThread::getRanges(Vector<RefPtr<Range> >& rangeObjects, cons
t RenderRegion* region) const | 580 void RenderNamedFlowThread::getRanges(Vector<RefPtr<Range> >& rangeObjects, cons
t RenderRegion* region) const |
| 581 { | 581 { |
| 582 LayoutUnit logicalTopForRegion; | 582 LayoutUnit logicalTopForRegion; |
| 583 LayoutUnit logicalBottomForRegion; | 583 LayoutUnit logicalBottomForRegion; |
| 584 | 584 |
| 585 // extend the first region top to contain everything up to its logical heigh
t | 585 // extend the first region top to contain everything up to its logical heigh
t |
| 586 if (region->isFirstRegion()) | 586 if (region->isFirstRegion()) |
| (...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 721 lastEndNode = node; | 721 lastEndNode = node; |
| 722 } | 722 } |
| 723 } | 723 } |
| 724 } | 724 } |
| 725 if (foundStartPosition || skipOverOutsideNodes) | 725 if (foundStartPosition || skipOverOutsideNodes) |
| 726 rangeObjects.append(range); | 726 rangeObjects.append(range); |
| 727 } | 727 } |
| 728 } | 728 } |
| 729 | 729 |
| 730 } | 730 } |
| OLD | NEW |