diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-04-01 01:57:20 +0530 |
|---|---|---|
| committer | bors-servo <lbergstrom+bors@mozilla.com> | 2016-04-01 01:57:20 +0530 |
| commit | 524a004e771b465e3de9ebbc33816e50949d6a25 (patch) | |
| tree | ee24600d42152f9e683ece313bd1b408dee0c43f /components/canvas/webgl_paint_thread.rs | |
| parent | acaac52be7973cfbf6621796d4fb944fbfd343ff (diff) | |
| parent | d7785628447611810ba5bf15b821ab1ed2fa45ea (diff) | |
| download | servo-524a004e771b465e3de9ebbc33816e50949d6a25.tar.gz servo-524a004e771b465e3de9ebbc33816e50949d6a25.zip | |
Auto merge of #10291 - jfhumann:10211, r=emilio
<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/10291)
<!-- Reviewable:end -->
Diffstat (limited to 'components/canvas/webgl_paint_thread.rs')
| -rw-r--r-- | components/canvas/webgl_paint_thread.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/components/canvas/webgl_paint_thread.rs b/components/canvas/webgl_paint_thread.rs index 1b1ce738cad..c88f2a378b7 100644 --- a/components/canvas/webgl_paint_thread.rs +++ b/components/canvas/webgl_paint_thread.rs @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -use canvas_traits::{CanvasCommonMsg, CanvasMsg, CanvasPixelData, CanvasData, CanvasWebGLMsg, FromLayoutMsg}; +use canvas_traits::{CanvasCommonMsg, CanvasMsg, CanvasPixelData, CanvasData, FromLayoutMsg}; use euclid::size::Size2D; use gleam::gl; use ipc_channel::ipc::{self, IpcSender, IpcSharedMemory}; @@ -42,7 +42,7 @@ impl WebGLPaintThread { }) } - pub fn handle_webgl_message(&self, message: CanvasWebGLMsg) { + pub fn handle_webgl_message(&self, message: webrender_traits::WebGLCommand) { debug!("WebGL message: {:?}", message); match self.data { WebGLPaintTaskData::WebRender(ref api, id) => { |