servo: Merge #12463 - Replace any errors caused by content-provided URLs by warnings (from asajeffrey:url-errors-should-be-warnings); r=Ms2ger

<!-- 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. -->

Source-Repo: https://github.com/servo/servo
Source-Revision: 6f3967b00490c750853ab3b56c54418b321d11a3
This commit is contained in:
Alan Jeffrey 2016-07-15 08:36:47 -07:00
Родитель 843baeffe9
Коммит 096b60bd59
2 изменённых файлов: 3 добавлений и 3 удалений

Просмотреть файл

@ -1403,7 +1403,7 @@ impl<Window: WindowMethods> IOCompositor<Window> {
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),
}
}

Просмотреть файл

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