aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2016-07-15 08:36:47 -0700
committerGitHub <noreply@github.com>2016-07-15 08:36:47 -0700
commit6f3967b00490c750853ab3b56c54418b321d11a3 (patch)
tree6b191b82a70333a989690a47b3d8a7430c5dd155
parent0e5893dc0d66faaca1c16101aa1f04a6cfb0b9c1 (diff)
parentd1e5bafef058361bdaa15e34bb6c6af69c153dc7 (diff)
downloadservo-6f3967b00490c750853ab3b56c54418b321d11a3.tar.gz
servo-6f3967b00490c750853ab3b56c54418b321d11a3.zip
Auto merge of #12463 - asajeffrey:url-errors-should-be-warnings, r=Ms2ger
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 -->
-rw-r--r--components/compositing/compositor.rs2
-rw-r--r--components/script/dom/htmlscriptelement.rs4
2 files changed, 3 insertions, 3 deletions
diff --git a/components/compositing/compositor.rs b/components/compositing/compositor.rs
index 5e5b305ca88..be52e7e6b18 100644
--- a/components/compositing/compositor.rs
+++ b/components/compositing/compositor.rs
@@ -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),
}
}
diff --git a/components/script/dom/htmlscriptelement.rs b/components/script/dom/htmlscriptelement.rs
index 2a512d84060..707e12ee59f 100644
--- a/components/script/dom/htmlscriptelement.rs
+++ b/components/script/dom/htmlscriptelement.rs
@@ -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;
}