Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-13 10:23:40 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #12463 - asajeffrey:url-errors-should-be-warnings, r=Ms2ger

Browse source 
Replace any errors caused by content-provided URLs by warnings.

<!-- Please describe your changes on the following line: -->

---
<!-- 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 do not require tests because we don't test error generation

<!-- 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/12463)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-07-15 08:36:47 -07:00 • committed by GitHub
commit 6f3967b004
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/compositing/compositor.rs
View file

@ -1403,7 +1403,7 @@ impl<Window: WindowMethods> IOCompositor<Window> {
warn!("Sending load url to constellation failed ({}).", e); warn!("Sending load url to constellation failed ({}).", e);
} }
}, },
Err(e) => error!("Parsing URL {} failed ({}).", url_string, e), Err(e) => warn!("Parsing URL {} failed ({}).", url_string, e),
} }
} }

4
components/script/dom/htmlscriptelement.rs
View file

@ -328,7 +328,7 @@ impl HTMLScriptElement {
// Step 18.4-18.5. // Step 18.4-18.5.
let url = match base_url.join(&src) { let url = match base_url.join(&src) {
Err(_) => { Err(_) => {
error!("error parsing URL for script {}", &**src); warn!("error parsing URL for script {}", &**src);
self.queue_error_event(); self.queue_error_event();
return NextParserState::Continue; return NextParserState::Continue;
} }
@ -414,7 +414,7 @@ impl HTMLScriptElement {
let (source, external, url) = match load { let (source, external, url) = match load {
// Step 2.a. // Step 2.a.
ScriptOrigin::External(Err(e)) => { ScriptOrigin::External(Err(e)) => {
error!("error loading script {:?}", e); warn!("error loading script {:?}", e);
self.dispatch_error_event(); self.dispatch_error_event();
return; return;
} }