1 files changed, 10 insertions, 10 deletions
diff --git a/components/compositing/compositor_task.rs b/components/compositing/compositor_task.rs
index dbf661e212d..422c5be4f3b 100644
--- a/components/compositing/compositor_task.rs
+++ b/components/compositing/compositor_task.rs
@@ -14,8 +14,8 @@ use windowing::{WindowEvent, WindowMethods};
 use euclid::point::Point2D;
 use euclid::rect::Rect;
 use ipc_channel::ipc::{IpcReceiver, IpcSender};
-use layers::platform::surface::NativeDisplay;
-use layers::layers::{BufferRequest, LayerBuffer, LayerBufferSet};
+use layers::platform::surface::{NativeDisplay, NativeSurface};
+use layers::layers::{BufferRequest, LayerBufferSet};
 use msg::compositor_msg::{Epoch, LayerId, LayerProperties, FrameTreeId};
 use msg::compositor_msg::{PaintListener, ScriptToCompositorMsg};
 use msg::constellation_msg::{AnimationState, ConstellationChan, PipelineId};
@@ -110,14 +110,14 @@ impl PaintListener for Box<CompositorProxy+'static+Send> {
     }
 
     fn ignore_buffer_requests(&mut self, buffer_requests: Vec<BufferRequest>) {
-        let mut layer_buffers = Vec::new();
+        let mut native_surfaces = Vec::new();
         for request in buffer_requests.into_iter() {
-            if let Some(layer_buffer) = request.layer_buffer {
-                layer_buffers.push(layer_buffer);
+            if let Some(native_surface) = request.native_surface {
+                native_surfaces.push(native_surface);
             }
         }
-        if !layer_buffers.is_empty() {
-            self.send(Msg::ReturnUnusedLayerBuffers(layer_buffers));
+        if !native_surfaces.is_empty() {
+            self.send(Msg::ReturnUnusedNativeSurfaces(native_surfaces));
         }
     }
 
@@ -195,8 +195,8 @@ pub enum Msg {
     /// <head> tag finished parsing
     HeadParsed,
     /// Signal that the paint task ignored the paint requests that carried
-    /// these layer buffers, so that they can be re-added to the surface cache.
-    ReturnUnusedLayerBuffers(Vec<Box<LayerBuffer>>),
+    /// these native surfaces, so that they can be re-added to the surface cache.
+    ReturnUnusedNativeSurfaces(Vec<NativeSurface>),
     /// Collect memory reports and send them back to the given mem::ReportsChan.
     CollectMemoryReports(mem::ReportsChan),
 }
@@ -227,7 +227,7 @@ impl Debug for Msg {
             Msg::IsReadyToSaveImageReply(..) => write!(f, "IsReadyToSaveImageReply"),
             Msg::NewFavicon(..) => write!(f, "NewFavicon"),
             Msg::HeadParsed => write!(f, "HeadParsed"),
-            Msg::ReturnUnusedLayerBuffers(..) => write!(f, "ReturnUnusedLayerBuffers"),
+            Msg::ReturnUnusedNativeSurfaces(..) => write!(f, "ReturnUnusedNativeSurfaces"),
             Msg::CollectMemoryReports(..) => write!(f, "CollectMemoryReports"),
         }
     }