Repository navigation
Commit b5b1408
committed
R1: real resumable pass loop for forced page breaks
Replaces the local-correction handling of forced break-before/after:page
with a genuine multi-pass driver loop, the foundation stage of the plan
to match PeachPDF's resumable fragmentation architecture instead of this
port's single-pass-plus-OffsetTop-shift model.
HtmlContainerInt.PerformLayout gains DriveLayoutPasses: when the
container has a real page grid, it repeatedly calls CssBox.PerformLayout
on the root, resuming from wherever the previous pass left off
(root.PendingBreakToken), until nothing is left pending. For a document
with no forced breaks, or no real page grid (WinForms/WPF), this runs
exactly once - behaviorally identical to the old single call.
CssBox gains the actual resumption machinery: ResumeAt seeds a box's
incoming BreakToken/top-override for the pass about to run;
PendingBreakToken/RequestedBreakBeforeTop are how a break discovered
arbitrarily deep in the tree reaches the driver - every block-child loop
checks its own child's outcome immediately after the child's layout call
returns, wraps it in a BlockBreakToken naming itself, and stops laying
out further siblings this pass, so the signal bubbles up through
call-stack unwind alone, matching PeachPDF's actual mechanism. A box
whose forced break fires is not placed at all this pass (RectanglesReset/
MeasureWordsSize already ran, but no Location/content-layout work
happens) - deferred whole to the pass that resumes at it.
BlockFragmentation.ResolveBlockTop loses its forced-break branch (now
handled by CssBox itself, before ResolveBlockTop is even reached); the
decision logic moves to a new TryGetForcedBreakTarget, unchanged in
substance from the old inline computation. Margin truncation and
break-inside:avoid/monolithic relocation remain local single-pass
corrections for now - later plan stages (R2-R4) replace those too.
New tests exercise the loop across multiple passes specifically (two
forced breaks in sequence, and 50 in sequence terminating promptly),
which the existing single-break tests don't. Full regression suite (37
IntegrationTest + 16 PdfSharp tests, up from 35+16) passes unchanged -
every existing forced-break test now runs through the new pass loop
rather than the old inline computation, with identical output.1 parent fda44e3 commit b5b1408
4 files changed
Lines changed: 343 additions & 36 deletions
File tree
- Source
- HtmlRenderer/Core
- Dom
- Fragmentation
- Test/HtmlRenderer.IntegrationTest
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
92 | 92 | | |
93 | 93 | | |
94 | 94 | | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
| 107 | + | |
| 108 | + | |
| 109 | + | |
| 110 | + | |
| 111 | + | |
| 112 | + | |
| 113 | + | |
| 114 | + | |
| 115 | + | |
| 116 | + | |
| 117 | + | |
| 118 | + | |
| 119 | + | |
| 120 | + | |
| 121 | + | |
| 122 | + | |
| 123 | + | |
| 124 | + | |
| 125 | + | |
| 126 | + | |
| 127 | + | |
| 128 | + | |
| 129 | + | |
| 130 | + | |
| 131 | + | |
| 132 | + | |
| 133 | + | |
| 134 | + | |
| 135 | + | |
95 | 136 | | |
96 | 137 | | |
97 | 138 | | |
| |||
520 | 561 | | |
521 | 562 | | |
522 | 563 | | |
| 564 | + | |
| 565 | + | |
| 566 | + | |
| 567 | + | |
| 568 | + | |
| 569 | + | |
| 570 | + | |
| 571 | + | |
| 572 | + | |
| 573 | + | |
| 574 | + | |
| 575 | + | |
| 576 | + | |
| 577 | + | |
| 578 | + | |
| 579 | + | |
| 580 | + | |
| 581 | + | |
| 582 | + | |
| 583 | + | |
| 584 | + | |
523 | 585 | | |
524 | 586 | | |
525 | 587 | | |
| |||
711 | 773 | | |
712 | 774 | | |
713 | 775 | | |
| 776 | + | |
| 777 | + | |
| 778 | + | |
| 779 | + | |
| 780 | + | |
714 | 781 | | |
715 | 782 | | |
716 | 783 | | |
| |||
777 | 844 | | |
778 | 845 | | |
779 | 846 | | |
780 | | - | |
| 847 | + | |
| 848 | + | |
| 849 | + | |
| 850 | + | |
| 851 | + | |
| 852 | + | |
| 853 | + | |
| 854 | + | |
| 855 | + | |
| 856 | + | |
| 857 | + | |
| 858 | + | |
| 859 | + | |
| 860 | + | |
| 861 | + | |
| 862 | + | |
| 863 | + | |
| 864 | + | |
| 865 | + | |
| 866 | + | |
| 867 | + | |
| 868 | + | |
| 869 | + | |
| 870 | + | |
| 871 | + | |
| 872 | + | |
| 873 | + | |
| 874 | + | |
| 875 | + | |
781 | 876 | | |
782 | 877 | | |
783 | 878 | | |
| |||
803 | 898 | | |
804 | 899 | | |
805 | 900 | | |
806 | | - | |
| 901 | + | |
| 902 | + | |
| 903 | + | |
| 904 | + | |
| 905 | + | |
| 906 | + | |
| 907 | + | |
| 908 | + | |
| 909 | + | |
807 | 910 | | |
| 911 | + | |
| 912 | + | |
| 913 | + | |
| 914 | + | |
| 915 | + | |
| 916 | + | |
| 917 | + | |
| 918 | + | |
| 919 | + | |
| 920 | + | |
808 | 921 | | |
| 922 | + | |
| 923 | + | |
| 924 | + | |
| 925 | + | |
| 926 | + | |
| 927 | + | |
| 928 | + | |
| 929 | + | |
| 930 | + | |
| 931 | + | |
| 932 | + | |
809 | 933 | | |
| 934 | + | |
| 935 | + | |
| 936 | + | |
| 937 | + | |
| 938 | + | |
| 939 | + | |
| 940 | + | |
| 941 | + | |
| 942 | + | |
| 943 | + | |
810 | 944 | | |
811 | 945 | | |
812 | 946 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
6 | 6 | | |
7 | 7 | | |
8 | 8 | | |
9 | | - | |
10 | | - | |
11 | | - | |
12 | | - | |
13 | | - | |
14 | | - | |
15 | | - | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
16 | 16 | | |
17 | 17 | | |
18 | 18 | | |
19 | 19 | | |
20 | | - | |
21 | | - | |
22 | | - | |
23 | | - | |
24 | | - | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
25 | 27 | | |
26 | 28 | | |
27 | 29 | | |
| |||
31 | 33 | | |
32 | 34 | | |
33 | 35 | | |
34 | | - | |
35 | | - | |
36 | | - | |
37 | | - | |
38 | | - | |
39 | | - | |
40 | | - | |
41 | | - | |
42 | | - | |
43 | | - | |
44 | | - | |
45 | | - | |
46 | | - | |
47 | | - | |
48 | | - | |
49 | | - | |
50 | | - | |
51 | | - | |
52 | | - | |
53 | | - | |
54 | 36 | | |
55 | 37 | | |
56 | 38 | | |
| |||
59 | 41 | | |
60 | 42 | | |
61 | 43 | | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
62 | 86 | | |
63 | 87 | | |
64 | 88 | | |
| |||
0 commit comments