aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/webglrenderingcontext.rs
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2018-10-08 21:45:55 -0400
committerGitHub <noreply@github.com>2018-10-08 21:45:55 -0400
commit552af0043ae237d56090a274556bc89156b050ec (patch)
treefed8194a68132a83bc0bc28ae26cc78e855320f5 /components/script/dom/webglrenderingcontext.rs
parent4a27e1723a9c4bde12dccd80b3d56560d6c50cea (diff)
parent8148b1b46f1a61715cc5250f514735ce111e3994 (diff)
downloadservo-552af0043ae237d56090a274556bc89156b050ec.tar.gz
servo-552af0043ae237d56090a274556bc89156b050ec.zip
Auto merge of #21785 - sumit0190:new_markasdirty, r=jdm
Add framebuffer check for mark_as_dirty, #21691 <!-- Please describe your changes on the following line: --> Check `bound_framebuffer` in each `mark_as_dirty` call, so that we don't dirty the canvas if we don't have a bound framebuffer. --- <!-- 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 #21691 (github issue number if applicable). <!-- Either: --> - [ ] There are tests for these changes OR - [X] These changes do not require tests because there isn't a direct way to test it (yet). <!-- 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/21785) <!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom/webglrenderingcontext.rs')
-rw-r--r--components/script/dom/webglrenderingcontext.rs10
1 files changed, 7 insertions, 3 deletions
diff --git a/components/script/dom/webglrenderingcontext.rs b/components/script/dom/webglrenderingcontext.rs
index 7972201b9ce..d832776230d 100644
--- a/components/script/dom/webglrenderingcontext.rs
+++ b/components/script/dom/webglrenderingcontext.rs
@@ -437,9 +437,13 @@ impl WebGLRenderingContext {
}
fn mark_as_dirty(&self) {
- self.canvas
- .upcast::<Node>()
- .dirty(NodeDamage::OtherNodeDamage);
+ // If we don't have a bound framebuffer, then don't mark the canvas
+ // as dirty.
+ if self.bound_framebuffer.get().is_none() {
+ self.canvas
+ .upcast::<Node>()
+ .dirty(NodeDamage::OtherNodeDamage);
+ }
}
fn vertex_attrib(&self, indx: u32, x: f32, y: f32, z: f32, w: f32) {