aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/canvasrenderingcontext2d.rs
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2016-01-01 21:04:51 +0530
committerbors-servo <lbergstrom+bors@mozilla.com>2016-01-01 21:04:51 +0530
commit11d160fc73c7692ca08a24966e129454baa1dbf9 (patch)
tree1826dcd8b95b32d5f4114bf79e9b7912531f9d90 /components/script/dom/canvasrenderingcontext2d.rs
parentb8e7cd71d6aada507a7eab1ddad44181b0d2d029 (diff)
parent1ccab328f9bc7e2952bbbfe7591804b6ce65ee9e (diff)
downloadservo-11d160fc73c7692ca08a24966e129454baa1dbf9.tar.gz
servo-11d160fc73c7692ca08a24966e129454baa1dbf9.zip
Auto merge of #9109 - nerith:createpattern, r=jdm
Support empty strings as the repeat argument (CreatePattern) According to the third step in the specification [1], createPattern should let the repetition argument be "repeat" when it is the empty string. The code in CanvasRenderingContext2D::CreatePattern did not implement this step and instead threw a SyntaxError exception when an empty string was supplied as the repetition argument. Fixes #9079. [1] https://html.spec.whatwg.org/multipage/#dom-context-2d-createpattern <!-- Reviewable:start --> [<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/9109) <!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom/canvasrenderingcontext2d.rs')
-rw-r--r--components/script/dom/canvasrenderingcontext2d.rs6
1 files changed, 5 insertions, 1 deletions
diff --git a/components/script/dom/canvasrenderingcontext2d.rs b/components/script/dom/canvasrenderingcontext2d.rs
index 4167bf9d4cd..2cf1b4e0fd7 100644
--- a/components/script/dom/canvasrenderingcontext2d.rs
+++ b/components/script/dom/canvasrenderingcontext2d.rs
@@ -1154,7 +1154,7 @@ impl CanvasRenderingContext2DMethods for CanvasRenderingContext2D {
// https://html.spec.whatwg.org/multipage/#dom-context-2d-createpattern
fn CreatePattern(&self,
image: HTMLImageElementOrHTMLCanvasElementOrCanvasRenderingContext2D,
- repetition: DOMString)
+ mut repetition: DOMString)
-> Fallible<Root<CanvasPattern>> {
let (image_data, image_size) = match image {
HTMLImageElementOrHTMLCanvasElementOrCanvasRenderingContext2D::eHTMLImageElement(ref image) => {
@@ -1176,6 +1176,10 @@ impl CanvasRenderingContext2DMethods for CanvasRenderingContext2D {
}
};
+ if repetition.is_empty() {
+ repetition.push_str("repeat");
+ }
+
if let Ok(rep) = RepetitionStyle::from_str(&repetition) {
Ok(CanvasPattern::new(self.global.root().r(),
image_data,