Address some review comments.

Author: nical

webrender/src/frame.rs

@@ -22,7 +22,7 @@ use webrender_traits::{ClipRegion, ColorF, DisplayItem, StackingContext, FilterO
 use webrender_traits::{ScrollEventPhase, ScrollLayerInfo, SpecificDisplayItem, ScrollLayerState};
 use webrender_traits::{LayerRect, LayerPoint, LayerSize};
 use webrender_traits::{ServoScrollRootId, ScrollLayerRect, as_scroll_parent_rect, ScrollLayerPixel};
-use webrender_traits::WorldPoint4D;
+use webrender_traits::{WorldPoint, WorldPoint4D};
 use webrender_traits::{LayerToScrollTransform, ScrollToWorldTransform};
 
 #[cfg(target_os = "macos")]
@@ -236,7 +236,7 @@ impl Frame {
         old_layer_scrolling_states
     }
 
-    pub fn get_scroll_layer(&self, cursor: &LayerPoint, scroll_layer_id: ScrollLayerId)
+    pub fn get_scroll_layer(&self, cursor: &WorldPoint, scroll_layer_id: ScrollLayerId)
                             -> Option<ScrollLayerId> {
         self.layers.get(&scroll_layer_id).and_then(|layer| {
             for child_layer_id in layer.children.iter().rev() {
@@ -332,7 +332,7 @@ impl Frame {
     /// Returns true if any layers actually changed position or false otherwise.
     pub fn scroll(&mut self,
                   mut delta: LayerPoint,
-                  cursor: LayerPoint,
+                  cursor: WorldPoint,
                   phase: ScrollEventPhase)
                   -> bool {
         let root_scroll_layer_id = match self.root_scroll_layer_id {

webrender_traits/src/api.rs

@@ -10,7 +10,7 @@ use {ApiMsg, ColorF, DisplayListBuilder, Epoch};
 use {FontKey, IdNamespace, ImageFormat, ImageKey, NativeFontHandle, PipelineId};
 use {RenderApiSender, ResourceId, ScrollEventPhase, ScrollLayerState, ServoScrollRootId};
 use {GlyphKey, GlyphDimensions, ImageData, WebGLContextId, WebGLCommand};
-use {DeviceIntSize, LayoutPoint, LayoutSize};
+use {DeviceIntSize, LayoutPoint, LayoutSize, WorldPoint};
 
 impl RenderApiSender {
     pub fn new(api_sender: MsgSender<ApiMsg>,
@@ -188,7 +188,7 @@ impl RenderApi {
     ///
     /// Webrender looks for the layer closest to the user
     /// which has `ScrollPolicy::Scrollable` set.
-    pub fn scroll(&self, delta: LayoutPoint, cursor: LayoutPoint, phase: ScrollEventPhase) {
+    pub fn scroll(&self, delta: LayoutPoint, cursor: WorldPoint, phase: ScrollEventPhase) {
         let msg = ApiMsg::Scroll(delta, cursor, phase);
         self.api_sender.send(msg).unwrap();
     }
@@ -207,7 +207,7 @@ impl RenderApi {
     }
 
     /// Translates a point from viewport coordinates to layer space
-    pub fn translate_point_to_layer_space(&self, point: &LayoutPoint)
+    pub fn translate_point_to_layer_space(&self, point: &WorldPoint)
                                           -> (LayoutPoint, PipelineId) {
         let (tx, rx) = channel::msg_channel().unwrap();
         let msg = ApiMsg::TranslatePointToLayerSpace(*point, tx);

webrender_traits/src/types.rs

@@ -47,10 +47,10 @@ pub enum ApiMsg {
                        BuiltDisplayListDescriptor,
                        AuxiliaryListsDescriptor),
     SetRootPipeline(PipelineId),
-    Scroll(LayoutPoint, LayoutPoint, ScrollEventPhase),
+    Scroll(LayoutPoint, WorldPoint, ScrollEventPhase),
     ScrollLayersWithScrollId(LayoutPoint, PipelineId, ServoScrollRootId),
     TickScrollingBounce,
-    TranslatePointToLayerSpace(LayoutPoint, MsgSender<(LayoutPoint, PipelineId)>),
+    TranslatePointToLayerSpace(WorldPoint, MsgSender<(LayoutPoint, PipelineId)>),
     GetScrollLayerState(MsgSender<Vec<ScrollLayerState>>),
     RequestWebGLContext(DeviceIntSize, GLContextAttributes, MsgSender<Result<(WebGLContextId, GLLimits), String>>),
     ResizeWebGLContext(WebGLContextId, DeviceIntSize),