Commit ef78a44e authored by Sergey Ulanov's avatar Sergey Ulanov Committed by Commit Bot

[Fuchsia] remove input node from ScenicWindow

Input node doesn't do anything. Scenic directs input events to
the Browser's session, since this is the session that owns the View.

Change-Id: I34337c8dc98668fd432fb0ac413e19dbc9338b92
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1704940
Commit-Queue: Sergey Ulanov <sergeyu@chromium.org>
Reviewed-by: default avatarMichael Spang <spang@chromium.org>
Reviewed-by: default avatarWez <wez@chromium.org>
Cr-Commit-Position: refs/heads/master@{#678057}
parent a3003658
...@@ -32,7 +32,6 @@ ScenicWindow::ScenicWindow(ScenicWindowManager* window_manager, ...@@ -32,7 +32,6 @@ ScenicWindow::ScenicWindow(ScenicWindowManager* window_manager,
scenic_session_(manager_->GetScenic()), scenic_session_(manager_->GetScenic()),
view_(&scenic_session_, std::move(view_token.value), "chromium window"), view_(&scenic_session_, std::move(view_token.value), "chromium window"),
node_(&scenic_session_), node_(&scenic_session_),
input_node_(&scenic_session_),
render_node_(&scenic_session_) { render_node_(&scenic_session_) {
scenic_session_.set_error_handler( scenic_session_.set_error_handler(
fit::bind_member(this, &ScenicWindow::OnScenicError)); fit::bind_member(this, &ScenicWindow::OnScenicError));
...@@ -44,9 +43,6 @@ ScenicWindow::ScenicWindow(ScenicWindowManager* window_manager, ...@@ -44,9 +43,6 @@ ScenicWindow::ScenicWindow(ScenicWindowManager* window_manager,
// get the device pixel ratio for the screen. // get the device pixel ratio for the screen.
node_.SetEventMask(fuchsia::ui::gfx::kMetricsEventMask); node_.SetEventMask(fuchsia::ui::gfx::kMetricsEventMask);
// Add input shape.
node_.AddChild(input_node_);
// Add rendering subtree. Hit testing is disabled to prevent GPU process from // Add rendering subtree. Hit testing is disabled to prevent GPU process from
// receiving input. // receiving input.
render_node_.SetHitTestBehavior(fuchsia::ui::gfx::HitTestBehavior::kSuppress); render_node_.SetHitTestBehavior(fuchsia::ui::gfx::HitTestBehavior::kSuppress);
...@@ -186,10 +182,6 @@ void ScenicWindow::UpdateSize() { ...@@ -186,10 +182,6 @@ void ScenicWindow::UpdateSize() {
// Scale the render node so that surface rect can always be 1x1. // Scale the render node so that surface rect can always be 1x1.
render_node_.SetScale(size_dips_.width(), size_dips_.height(), 1.f); render_node_.SetScale(size_dips_.width(), size_dips_.height(), 1.f);
// Resize input node to cover the whole surface.
input_node_.SetShape(scenic::Rectangle(&scenic_session_, size_dips_.width(),
size_dips_.height()));
// This is necessary when using vulkan because ImagePipes are presented // This is necessary when using vulkan because ImagePipes are presented
// separately and we need to make sure our sizes change is committed. // separately and we need to make sure our sizes change is committed.
scenic_session_.Present( scenic_session_.Present(
......
...@@ -99,9 +99,6 @@ class COMPONENT_EXPORT(OZONE) ScenicWindow ...@@ -99,9 +99,6 @@ class COMPONENT_EXPORT(OZONE) ScenicWindow
// Entity node for the |view_|. // Entity node for the |view_|.
scenic::EntityNode node_; scenic::EntityNode node_;
// Node in |scenic_session_| for receiving input that hits within our View.
scenic::ShapeNode input_node_;
// Node in |scenic_session_| for rendering (hit testing disabled). // Node in |scenic_session_| for rendering (hit testing disabled).
scenic::EntityNode render_node_; scenic::EntityNode render_node_;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment