mirror of
https://github.com/servo/servo.git
synced 2025-08-06 06:00:15 +01:00
Auto merge of #16394 - mckaymatt:line_num_offset__issue_15693, r=SimonSapin
Support line number offsets for inline stylesheets <!-- Please describe your changes on the following line: --> This allows accurate line numbers when reporting stylesheet errors. @jdm This is going to require some effort to merge my changes with other recent changes to `ParserContext`. Because of that I would appreciate a quick sanity check before I put the time into performing the merge. For example, should I store the `offset` as a u64, or should it be an Option? --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: --> - [x] `./mach build -d` does not report any errors - [x] `./mach test-tidy` does not report any errors - [x] These changes fix #15693 (github issue number if applicable). <!-- Either: --> - [x] There are tests for these changes OR - [ ] These changes do not require tests because _____ <!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.--> <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. --> <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/16394) <!-- Reviewable:end -->
This commit is contained in:
commit
94397ff0b4
11 changed files with 87 additions and 37 deletions
|
@ -40,6 +40,7 @@ pub struct HTMLStyleElement {
|
|||
in_stack_of_open_elements: Cell<bool>,
|
||||
pending_loads: Cell<u32>,
|
||||
any_failed_load: Cell<bool>,
|
||||
line_number: u64,
|
||||
}
|
||||
|
||||
impl HTMLStyleElement {
|
||||
|
@ -55,6 +56,7 @@ impl HTMLStyleElement {
|
|||
in_stack_of_open_elements: Cell::new(creator.is_parser_created()),
|
||||
pending_loads: Cell::new(0),
|
||||
any_failed_load: Cell::new(false),
|
||||
line_number: creator.return_line_number(),
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -92,7 +94,8 @@ impl HTMLStyleElement {
|
|||
let loader = StylesheetLoader::for_element(self.upcast());
|
||||
let sheet = Stylesheet::from_str(&data, win.get_url(), Origin::Author, mq,
|
||||
shared_lock, Some(&loader),
|
||||
win.css_error_reporter());
|
||||
win.css_error_reporter(),
|
||||
self.line_number);
|
||||
|
||||
let sheet = Arc::new(sheet);
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue