Bug 1733021 - Remove unused get_scroll_node_state API r=gfx-reviewers…

…,nical Differential Revision: https://phabricator.services.mozilla.com/D126860
dothq · Sep 30, 2021 · 9a6b42c · 9a6b42c
1 parent e8f2c2c
commit 9a6b42c
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 38 deletions.
diff --git a/gfx/wr/webrender/src/render_api.rs b/gfx/wr/webrender/src/render_api.rs
@@ -19,7 +19,7 @@ use crate::api::{BlobImageData, BlobImageKey, ImageData, ImageDescriptor, ImageK
 use crate::api::{BlobImageParams, BlobImageRequest, BlobImageResult, AsyncBlobImageRasterizer, BlobImageHandler};
 use crate::api::{DocumentId, PipelineId, PropertyBindingId, PropertyBindingKey, ExternalEvent};
 use crate::api::{HitTestResult, HitTesterRequest, ApiHitTester, PropertyValue, DynamicProperties};
-use crate::api::{ScrollClamping, TileSize, NotificationRequest, DebugFlags, ScrollNodeState};
+use crate::api::{ScrollClamping, TileSize, NotificationRequest, DebugFlags};
 use crate::api::{GlyphDimensionRequest, GlyphIndexRequest, GlyphIndex, GlyphDimensions};
 use crate::api::{FontInstanceOptions, FontInstancePlatformOptions, FontVariation};
 use crate::api::DEFAULT_TILE_SIZE;
@@ -802,8 +802,6 @@ pub enum FrameMsg {
     ///
     ScrollNodeWithId(LayoutPoint, ExternalScrollId, ScrollClamping),
     ///
-    GetScrollNodeState(Sender<Vec<ScrollNodeState>>),
-    ///
     ResetDynamicProperties,
     ///
     AppendDynamicProperties(DynamicProperties),
@@ -833,7 +831,6 @@ impl fmt::Debug for FrameMsg {
             FrameMsg::HitTest(..) => "FrameMsg::HitTest",
             FrameMsg::RequestHitTester(..) => "FrameMsg::RequestHitTester",
             FrameMsg::ScrollNodeWithId(..) => "FrameMsg::ScrollNodeWithId",
-            FrameMsg::GetScrollNodeState(..) => "FrameMsg::GetScrollNodeState",
             FrameMsg::ResetDynamicProperties => "FrameMsg::ResetDynamicProperties",
             FrameMsg::AppendDynamicProperties(..) => "FrameMsg::AppendDynamicProperties",
             FrameMsg::AppendDynamicTransformProperties(..) => "FrameMsg::AppendDynamicTransformProperties",
@@ -1296,13 +1293,6 @@ impl RenderApi {
         HitTesterRequest { rx }
     }
 
-    ///
-    pub fn get_scroll_node_state(&self, document_id: DocumentId) -> Vec<ScrollNodeState> {
-        let (tx, rx) = single_msg_channel();
-        self.send_frame_msg(document_id, FrameMsg::GetScrollNodeState(tx));
-        rx.recv().unwrap()
-    }
-
     // Some internal scheduling magic that leaked into the API.
     // Buckle up and see APZUpdater.cpp for more info about what this is about.
     #[doc(hidden)]

diff --git a/gfx/wr/webrender/src/render_backend.rs b/gfx/wr/webrender/src/render_backend.rs
@@ -400,10 +400,6 @@ impl Document {
                     ..DocumentOps::nop()
                 };
             }
-            FrameMsg::GetScrollNodeState(tx) => {
-                profile_scope!("GetScrollNodeState");
-                tx.send(self.scene.spatial_tree.get_scroll_node_state()).unwrap();
-            }
             FrameMsg::ResetDynamicProperties => {
                 self.dynamic_properties.reset_properties();
             }

diff --git a/gfx/wr/webrender/src/spatial_tree.rs b/gfx/wr/webrender/src/spatial_tree.rs
@@ -3,7 +3,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 use api::{ExternalScrollId, PropertyBinding, ReferenceFrameKind, TransformStyle, PropertyBindingId};
-use api::{PipelineId, ScrollClamping, ScrollNodeState, ScrollSensitivity, SpatialTreeItemKey};
+use api::{PipelineId, ScrollClamping, ScrollSensitivity, SpatialTreeItemKey};
 use api::units::*;
 use euclid::Transform3D;
 use crate::gpu_types::TransformPalette;
@@ -725,19 +725,6 @@ impl SpatialTree {
         self.root_reference_frame_index
     }
 
-    pub fn get_scroll_node_state(&self) -> Vec<ScrollNodeState> {
-        let mut result = vec![];
-        for node in &self.spatial_nodes {
-            if let SpatialNodeType::ScrollFrame(info) = node.node_type {
-                result.push(ScrollNodeState {
-                    id: info.external_id,
-                    scroll_offset: info.offset - info.external_scroll_offset,
-                })
-            }
-        }
-        result
-    }
-
     pub fn drain(&mut self) -> ScrollStates {
         let mut scroll_states = FastHashMap::default();
         for old_node in &mut self.spatial_nodes.drain(..) {

diff --git a/gfx/wr/webrender_api/src/lib.rs b/gfx/wr/webrender_api/src/lib.rs
@@ -609,15 +609,6 @@ pub enum PrimitiveKeyKind {
     },
 }
 
-///
-#[derive(Clone)]
-pub struct ScrollNodeState {
-    ///
-    pub id: ExternalScrollId,
-    ///
-    pub scroll_offset: LayoutVector2D,
-}
-
 ///
 #[derive(Clone, Copy, Debug)]
 pub enum ScrollLocation {