Move EventListenerProperties getter/setter to WebWidgetClient (12/n)
We are removing the WebLayerTreeView interface as it is redundant with
WebWidgetClient now that we always composite web contents.
More importantly this helps us Close/Restart the WebWidget parts of
WebViewImpl by not requiring plumbing 2 pointers with slightly different
lifetimes (WebLayerTreeView is created inside the Init of the
WebWidgetClient). This will help avoid a bunch of complexity in
creating WebFrameWidgets and other WebWidgets.
[email protected]
Bug: 912193
Change-Id: I1d65fa08358615f66e20b191ad7feeb239e8ef14
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1685836
Reviewed-by: Jeremy Roman <[email protected]>
Reviewed-by: Kentaro Hara <[email protected]>
Reviewed-by: David Bokan <[email protected]>
Auto-Submit: danakj <[email protected]>
Commit-Queue: danakj <[email protected]>
Cr-Commit-Position: refs/heads/master@{#675058}
diff --git a/content/renderer/compositor/layer_tree_view.cc b/content/renderer/compositor/layer_tree_view.cc
index 02ebc56..53a515848 100644
--- a/content/renderer/compositor/layer_tree_view.cc
+++ b/content/renderer/compositor/layer_tree_view.cc
@@ -193,17 +193,6 @@
layer_tree_host_->SetNeedsRecalculateRasterScales();
}
-void LayerTreeView::SetEventListenerProperties(
- cc::EventListenerClass event_class,
- cc::EventListenerProperties properties) {
- layer_tree_host_->SetEventListenerProperties(event_class, properties);
-}
-
-cc::EventListenerProperties LayerTreeView::EventListenerProperties(
- cc::EventListenerClass event_class) const {
- return layer_tree_host_->event_listener_properties(event_class);
-}
-
void LayerTreeView::SetHaveScrollEventHandlers(bool has_handlers) {
layer_tree_host_->SetHaveScrollEventHandlers(has_handlers);
}
diff --git a/content/renderer/compositor/layer_tree_view.h b/content/renderer/compositor/layer_tree_view.h
index e871fef..c9d5168 100644
--- a/content/renderer/compositor/layer_tree_view.h
+++ b/content/renderer/compositor/layer_tree_view.h
@@ -133,11 +133,6 @@
void StartDeferringCommits(base::TimeDelta timeout) override;
void StopDeferringCommits(cc::PaintHoldingCommitTrigger) override;
void ForceRecalculateRasterScales() override;
- void SetEventListenerProperties(
- cc::EventListenerClass eventClass,
- cc::EventListenerProperties properties) override;
- cc::EventListenerProperties EventListenerProperties(
- cc::EventListenerClass eventClass) const override;
void SetHaveScrollEventHandlers(bool) override;
bool HaveScrollEventHandlers() const override;
int LayerTreeId() const override;
@@ -197,6 +192,9 @@
base::OnceCallback<void(base::TimeTicks)> callback);
cc::LayerTreeHost* layer_tree_host() { return layer_tree_host_.get(); }
+ const cc::LayerTreeHost* layer_tree_host() const {
+ return layer_tree_host_.get();
+ }
protected:
friend class RenderViewImplScaleFactorTest;
diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc
index 70a3e14..5af0983 100644
--- a/content/renderer/render_widget.cc
+++ b/content/renderer/render_widget.cc
@@ -3271,12 +3271,12 @@
return actual;
}
-void RenderWidget::HasPointerRawUpdateEventHandlers(bool has_handlers) {
+void RenderWidget::SetHasPointerRawUpdateEventHandlers(bool has_handlers) {
if (input_event_queue_)
input_event_queue_->HasPointerRawUpdateEventHandlers(has_handlers);
}
-void RenderWidget::HasTouchEventHandlers(bool has_handlers) {
+void RenderWidget::SetHasTouchEventHandlers(bool has_handlers) {
if (has_touch_handlers_ && *has_touch_handlers_ == has_handlers)
return;
@@ -3515,6 +3515,19 @@
NotifySwapAndPresentationTime(base::NullCallback(), std::move(callback));
}
+void RenderWidget::SetEventListenerProperties(
+ cc::EventListenerClass event_class,
+ cc::EventListenerProperties properties) {
+ layer_tree_view_->layer_tree_host()->SetEventListenerProperties(event_class,
+ properties);
+}
+
+cc::EventListenerProperties RenderWidget::EventListenerProperties(
+ cc::EventListenerClass event_class) const {
+ return layer_tree_view_->layer_tree_host()->event_listener_properties(
+ event_class);
+}
+
void RenderWidget::NotifySwapAndPresentationTime(
ReportTimeCallback swap_time_callback,
ReportTimeCallback presentation_time_callback) {
diff --git a/content/renderer/render_widget.h b/content/renderer/render_widget.h
index fe2898f..9be865f 100644
--- a/content/renderer/render_widget.h
+++ b/content/renderer/render_widget.h
@@ -429,8 +429,8 @@
const gfx::Point& image_offset) override;
void SetTouchAction(cc::TouchAction touch_action) override;
void RequestUnbufferedInputEvents() override;
- void HasPointerRawUpdateEventHandlers(bool has_handlers) override;
- void HasTouchEventHandlers(bool has_handlers) override;
+ void SetHasPointerRawUpdateEventHandlers(bool has_handlers) override;
+ void SetHasTouchEventHandlers(bool has_handlers) override;
void SetNeedsLowLatencyInput(bool) override;
void SetNeedsUnbufferedInputForDebugger(bool) override;
void AnimateDoubleTapZoomInMainFrame(const blink::WebPoint& point,
@@ -457,6 +457,11 @@
void RequestDecode(const cc::PaintImage& image,
base::OnceCallback<void(bool)> callback) override;
void NotifySwapTime(ReportTimeCallback callback) override;
+ void SetEventListenerProperties(
+ cc::EventListenerClass event_class,
+ cc::EventListenerProperties properties) override;
+ cc::EventListenerProperties EventListenerProperties(
+ cc::EventListenerClass event_class) const override;
// Registers a SwapPromise to report presentation time and possibly swap time.
// If |swap_time_callback| is not a null callback, it would be called once
diff --git a/third_party/blink/public/platform/web_layer_tree_view.h b/third_party/blink/public/platform/web_layer_tree_view.h
index ddb334f..0ca18af5 100644
--- a/third_party/blink/public/platform/web_layer_tree_view.h
+++ b/third_party/blink/public/platform/web_layer_tree_view.h
@@ -28,7 +28,6 @@
#include "base/callback.h"
#include "cc/input/browser_controls_state.h"
-#include "cc/input/event_listener_properties.h"
#include "cc/layers/layer.h"
#include "cc/paint/paint_worklet_layer_painter.h"
#include "cc/trees/element_id.h"
@@ -91,8 +90,6 @@
virtual void ForceRecalculateRasterScales() {}
// Input properties ---------------------------------------------------
- virtual void SetEventListenerProperties(cc::EventListenerClass,
- cc::EventListenerProperties) {}
virtual void UpdateEventRectsForSubframeIfNecessary() {}
virtual void SetHaveScrollEventHandlers(bool) {}
@@ -101,10 +98,6 @@
// Debugging / dangerous ---------------------------------------------
- virtual cc::EventListenerProperties EventListenerProperties(
- cc::EventListenerClass) const {
- return cc::EventListenerProperties::kNone;
- }
virtual bool HaveScrollEventHandlers() const { return false; }
virtual int LayerTreeId() const { return 0; }
diff --git a/third_party/blink/public/web/DEPS b/third_party/blink/public/web/DEPS
index 7a277f7..da28514 100644
--- a/third_party/blink/public/web/DEPS
+++ b/third_party/blink/public/web/DEPS
@@ -10,6 +10,7 @@
"+base/time/time.h",
"+base/threading/thread_checker.h",
"+cc/input/browser_controls_state.h",
+ "+cc/input/event_listener_properties.h",
"+cc/input/overscroll_behavior.h",
"+cc/input/layer_selection_bound.h",
"+cc/paint/node_holder.h",
diff --git a/third_party/blink/public/web/web_widget_client.h b/third_party/blink/public/web/web_widget_client.h
index b2b05be..5488328 100644
--- a/third_party/blink/public/web/web_widget_client.h
+++ b/third_party/blink/public/web/web_widget_client.h
@@ -33,6 +33,7 @@
#include <memory>
+#include "cc/input/event_listener_properties.h"
#include "cc/input/layer_selection_bound.h"
#include "cc/input/overscroll_behavior.h"
#include "services/network/public/mojom/referrer_policy.mojom-shared.h"
@@ -186,10 +187,10 @@
virtual void SetOverscrollBehavior(const cc::OverscrollBehavior&) {}
// Called to update if pointerrawupdate events should be sent.
- virtual void HasPointerRawUpdateEventHandlers(bool) {}
+ virtual void SetHasPointerRawUpdateEventHandlers(bool) {}
// Called to update if touch events should be sent.
- virtual void HasTouchEventHandlers(bool) {}
+ virtual void SetHasTouchEventHandlers(bool) {}
// Called to update whether low latency input mode is enabled or not.
virtual void SetNeedsLowLatencyInput(bool) {}
@@ -301,6 +302,18 @@
// submitted (still called "swapped") to the display compositor (either with
// DidSwap or DidNotSwap).
virtual void NotifySwapTime(ReportTimeCallback callback) {}
+
+ // Set or get what event handlers exist in the document contained in the
+ // WebWidget in order to inform the compositor thread if it is able to handle
+ // an input event, or it needs to pass it to the main thread to be handled.
+ // The class is the type of input event, and for each class there is a
+ // properties defining if the compositor thread can handle the event.
+ virtual void SetEventListenerProperties(cc::EventListenerClass,
+ cc::EventListenerProperties) {}
+ virtual cc::EventListenerProperties EventListenerProperties(
+ cc::EventListenerClass) const {
+ return cc::EventListenerProperties::kNone;
+ }
};
} // namespace blink
diff --git a/third_party/blink/renderer/core/exported/web_page_popup_impl.cc b/third_party/blink/renderer/core/exported/web_page_popup_impl.cc
index d32feb6b..35b0cd87 100644
--- a/third_party/blink/renderer/core/exported/web_page_popup_impl.cc
+++ b/third_party/blink/renderer/core/exported/web_page_popup_impl.cc
@@ -162,33 +162,14 @@
LocalFrame* frame,
cc::EventListenerClass event_class,
cc::EventListenerProperties properties) override {
- DCHECK(frame->IsMainFrame());
- WebWidgetClient* client = popup_->WidgetClient();
- if (WebLayerTreeView* layer_tree_view = popup_->layer_tree_view_) {
- layer_tree_view->SetEventListenerProperties(event_class, properties);
- if (event_class == cc::EventListenerClass::kTouchStartOrMove) {
- client->HasTouchEventHandlers(
- properties != cc::EventListenerProperties::kNone ||
- EventListenerProperties(
- frame, cc::EventListenerClass::kTouchEndOrCancel) !=
- cc::EventListenerProperties::kNone);
- } else if (event_class == cc::EventListenerClass::kTouchEndOrCancel) {
- client->HasTouchEventHandlers(
- properties != cc::EventListenerProperties::kNone ||
- EventListenerProperties(
- frame, cc::EventListenerClass::kTouchStartOrMove) !=
- cc::EventListenerProperties::kNone);
- }
- } else {
- client->HasTouchEventHandlers(true);
- }
+ // WebPagePopup always routes input to main thread (set up in RenderWidget),
+ // so no need to update listener properties.
}
cc::EventListenerProperties EventListenerProperties(
LocalFrame*,
cc::EventListenerClass event_class) const override {
- if (popup_->layer_tree_view_) {
- return popup_->layer_tree_view_->EventListenerProperties(event_class);
- }
+ // WebPagePopup always routes input to main thread (set up in RenderWidget),
+ // so no need to update listener properties.
return cc::EventListenerProperties::kNone;
}
diff --git a/third_party/blink/renderer/core/exported/web_view_test.cc b/third_party/blink/renderer/core/exported/web_view_test.cc
index e83a9e60..ddd673e 100644
--- a/third_party/blink/renderer/core/exported/web_view_test.cc
+++ b/third_party/blink/renderer/core/exported/web_view_test.cc
@@ -3915,7 +3915,7 @@
: public frame_test_helpers::TestWebWidgetClient {
public:
// WebWidgetClient methods
- void HasTouchEventHandlers(bool state) override {
+ void SetHasTouchEventHandlers(bool state) override {
// Only count the times the state changes.
if (state != has_touch_event_handler_)
has_touch_event_handler_count_[state]++;
@@ -3937,11 +3937,11 @@
bool has_touch_event_handler_;
};
-// This test verifies that WebWidgetClient::hasTouchEventHandlers is called
+// This test verifies that WebWidgetClient::SetHasTouchEventHandlers is called
// accordingly for various calls to EventHandlerRegistry::did{Add|Remove|
// RemoveAll}EventHandler(..., TouchEvent). Verifying that those calls are made
// correctly is the job of web_tests/fast/events/event-handler-count.html.
-TEST_F(WebViewTest, HasTouchEventHandlers) {
+TEST_F(WebViewTest, SetHasTouchEventHandlers) {
TouchEventHandlerWebWidgetClient client;
std::string url = RegisterMockedHttpURLLoad("has_touch_event_handlers.html");
WebViewImpl* web_view_impl =
diff --git a/third_party/blink/renderer/core/frame/frame_test_helpers.cc b/third_party/blink/renderer/core/frame/frame_test_helpers.cc
index fb9e286..3ad1c16 100644
--- a/third_party/blink/renderer/core/frame/frame_test_helpers.cc
+++ b/third_party/blink/renderer/core/frame/frame_test_helpers.cc
@@ -668,6 +668,17 @@
injected_scroll_gesture_data_.push_back(data);
}
+void TestWebWidgetClient::SetEventListenerProperties(
+ cc::EventListenerClass event_class,
+ cc::EventListenerProperties properties) {
+ layer_tree_host()->SetEventListenerProperties(event_class, properties);
+}
+
+cc::EventListenerProperties TestWebWidgetClient::EventListenerProperties(
+ cc::EventListenerClass event_class) const {
+ return layer_tree_host()->event_listener_properties(event_class);
+}
+
void TestWebWidgetClient::RegisterViewportLayers(
const cc::ViewportLayers& layers) {
layer_tree_host()->RegisterViewportLayers(layers);
diff --git a/third_party/blink/renderer/core/frame/frame_test_helpers.h b/third_party/blink/renderer/core/frame/frame_test_helpers.h
index 7bae591..110455e 100644
--- a/third_party/blink/renderer/core/frame/frame_test_helpers.h
+++ b/third_party/blink/renderer/core/frame/frame_test_helpers.h
@@ -226,11 +226,19 @@
ScrollGranularity granularity,
cc::ElementId scrollable_area_element_id,
WebInputEvent::Type injected_type) override;
+ void SetEventListenerProperties(
+ cc::EventListenerClass event_class,
+ cc::EventListenerProperties properties) override;
+ cc::EventListenerProperties EventListenerProperties(
+ cc::EventListenerClass event_class) const override;
content::LayerTreeView* layer_tree_view() { return layer_tree_view_; }
cc::LayerTreeHost* layer_tree_host() {
return layer_tree_view_->layer_tree_host();
}
+ const cc::LayerTreeHost* layer_tree_host() const {
+ return layer_tree_view_->layer_tree_host();
+ }
cc::AnimationHost* animation_host() { return animation_host_; }
bool AnimationScheduled() { return animation_scheduled_; }
diff --git a/third_party/blink/renderer/core/page/chrome_client.h b/third_party/blink/renderer/core/page/chrome_client.h
index 17be769..ac82d0c 100644
--- a/third_party/blink/renderer/core/page/chrome_client.h
+++ b/third_party/blink/renderer/core/page/chrome_client.h
@@ -332,12 +332,17 @@
virtual void ClearLayerSelection(LocalFrame*) {}
virtual void UpdateLayerSelection(LocalFrame*, const cc::LayerSelection&) {}
+ // The client keeps track of which touch/mousewheel event types have handlers,
+ // and if they do, whether the handlers are passive and/or blocking. This
+ // allows the client to know which optimizations can be used for the
+ // associated event classes.
virtual void SetEventListenerProperties(LocalFrame*,
cc::EventListenerClass,
cc::EventListenerProperties) = 0;
virtual cc::EventListenerProperties EventListenerProperties(
LocalFrame*,
cc::EventListenerClass) const = 0;
+
virtual void SetHasScrollEventHandlers(LocalFrame*, bool) = 0;
virtual void SetNeedsLowLatencyInput(LocalFrame*, bool) = 0;
virtual void SetNeedsUnbufferedInputForDebugger(LocalFrame*, bool) = 0;
diff --git a/third_party/blink/renderer/core/page/chrome_client_impl.cc b/third_party/blink/renderer/core/page/chrome_client_impl.cc
index e5a6fb9..1090067 100644
--- a/third_party/blink/renderer/core/page/chrome_client_impl.cc
+++ b/third_party/blink/renderer/core/page/chrome_client_impl.cc
@@ -976,50 +976,56 @@
return;
WebLocalFrameImpl* web_frame = WebLocalFrameImpl::FromFrame(frame);
- // The widget may be nullptr if the frame is provisional.
- // TODO(dcheng): This needs to be cleaned up at some point.
- // https://crbug.com/578349
- if (web_frame->IsProvisional()) {
- // If we hit a provisional frame, we expect it to be during initialization
- // in which case the |properties| should be 'nothing'.
- DCHECK(properties == cc::EventListenerProperties::kNone);
- return;
- }
WebFrameWidgetBase* widget = web_frame->LocalRootFrameWidget();
// TODO(https://crbug.com/820787): When creating a local root, the widget
// won't be set yet. While notifications in this case are technically
// redundant, it adds an awkward special case.
if (!widget) {
+ if (web_frame->IsProvisional()) {
+ // If we hit a provisional frame, we expect it to be during initialization
+ // in which case the |properties| should be 'nothing'.
+ DCHECK(properties == cc::EventListenerProperties::kNone);
+ }
return;
}
- // This relies on widget always pointing to a WebFrameWidgetBase when
- // |frame| points to an OOPIF frame, i.e. |frame|'s mainFrame() is
- // remote.
WebWidgetClient* client = widget->Client();
- if (WebLayerTreeView* tree_view = widget->GetLayerTreeView()) {
- tree_view->SetEventListenerProperties(event_class, properties);
- if (event_class == cc::EventListenerClass::kTouchStartOrMove) {
- client->HasTouchEventHandlers(
- properties != cc::EventListenerProperties::kNone ||
- tree_view->EventListenerProperties(
- cc::EventListenerClass::kTouchEndOrCancel) !=
- cc::EventListenerProperties::kNone);
- } else if (event_class == cc::EventListenerClass::kTouchEndOrCancel) {
- client->HasTouchEventHandlers(
- properties != cc::EventListenerProperties::kNone ||
- tree_view->EventListenerProperties(
- cc::EventListenerClass::kTouchStartOrMove) !=
- cc::EventListenerProperties::kNone);
- } else if (event_class == cc::EventListenerClass::kPointerRawUpdate) {
- client->HasPointerRawUpdateEventHandlers(
- properties != cc::EventListenerProperties::kNone);
- }
- } else {
- client->HasTouchEventHandlers(true);
+
+ client->SetEventListenerProperties(event_class, properties);
+
+ bool has_touch_end_or_cancel_handler =
+ client->EventListenerProperties(
+ cc::EventListenerClass::kTouchEndOrCancel) !=
+ cc::EventListenerProperties::kNone;
+
+ if (event_class == cc::EventListenerClass::kTouchStartOrMove) {
+ client->SetHasTouchEventHandlers(properties !=
+ cc::EventListenerProperties::kNone ||
+ has_touch_end_or_cancel_handler);
+ } else if (event_class == cc::EventListenerClass::kTouchEndOrCancel) {
+ client->SetHasTouchEventHandlers(properties !=
+ cc::EventListenerProperties::kNone ||
+ has_touch_end_or_cancel_handler);
+ } else if (event_class == cc::EventListenerClass::kPointerRawUpdate) {
+ client->SetHasPointerRawUpdateEventHandlers(
+ properties != cc::EventListenerProperties::kNone);
}
}
+cc::EventListenerProperties ChromeClientImpl::EventListenerProperties(
+ LocalFrame* frame,
+ cc::EventListenerClass event_class) const {
+ if (!frame)
+ return cc::EventListenerProperties::kNone;
+
+ WebFrameWidgetBase* widget =
+ WebLocalFrameImpl::FromFrame(frame)->LocalRootFrameWidget();
+ if (!widget)
+ return cc::EventListenerProperties::kNone;
+ WebWidgetClient* client = widget->Client();
+ return client->EventListenerProperties(event_class);
+}
+
void ChromeClientImpl::BeginLifecycleUpdates() {
web_view_->StopDeferringMainFrameUpdate();
// The WidgetClient is null for some WebViews, in which case they can not
@@ -1037,20 +1043,6 @@
web_view_->StopDeferringCommits(trigger);
}
-cc::EventListenerProperties ChromeClientImpl::EventListenerProperties(
- LocalFrame* frame,
- cc::EventListenerClass event_class) const {
- if (!frame)
- return cc::EventListenerProperties::kNone;
-
- WebFrameWidgetBase* widget =
- WebLocalFrameImpl::FromFrame(frame)->LocalRootFrameWidget();
-
- if (!widget || !widget->GetLayerTreeView())
- return cc::EventListenerProperties::kNone;
- return widget->GetLayerTreeView()->EventListenerProperties(event_class);
-}
-
void ChromeClientImpl::SetHasScrollEventHandlers(LocalFrame* frame,
bool has_event_handlers) {
// |frame| might be null if called via TreeScopeAdopter::
diff --git a/third_party/blink/renderer/core/page/chrome_client_impl.h b/third_party/blink/renderer/core/page/chrome_client_impl.h
index f120e7a..c2b74b4 100644
--- a/third_party/blink/renderer/core/page/chrome_client_impl.h
+++ b/third_party/blink/renderer/core/page/chrome_client_impl.h
@@ -150,10 +150,6 @@
void SetCursor(const Cursor&, LocalFrame*) override;
void SetCursorOverridden(bool) override;
Cursor LastSetCursorForTesting() const override;
- // The client keeps track of which touch/mousewheel event types have handlers,
- // and if they do, whether the handlers are passive and/or blocking. This
- // allows the client to know which optimizations can be used for the
- // associated event classes.
void SetEventListenerProperties(LocalFrame*,
cc::EventListenerClass,
cc::EventListenerProperties) override;
diff --git a/third_party/blink/renderer/core/page/scrolling/scrolling_coordinator_test.cc b/third_party/blink/renderer/core/page/scrolling/scrolling_coordinator_test.cc
index d9da75de..d9952417 100644
--- a/third_party/blink/renderer/core/page/scrolling/scrolling_coordinator_test.cc
+++ b/third_party/blink/renderer/core/page/scrolling/scrolling_coordinator_test.cc
@@ -132,6 +132,10 @@
return GetWebView()->LayerTreeView();
}
+ WebWidgetClient* GetWidgetClient() const {
+ return GetWebView()->WidgetClient();
+ }
+
void LoadAhem() { helper_.LoadAhem(); }
protected:
@@ -165,10 +169,10 @@
ASSERT_TRUE(root_scroll_layer->scrollable());
ASSERT_FALSE(root_scroll_layer->GetMainThreadScrollingReasons());
ASSERT_EQ(cc::EventListenerProperties::kNone,
- GetWebLayerTreeView()->EventListenerProperties(
+ GetWidgetClient()->EventListenerProperties(
cc::EventListenerClass::kTouchStartOrMove));
ASSERT_EQ(cc::EventListenerProperties::kNone,
- GetWebLayerTreeView()->EventListenerProperties(
+ GetWidgetClient()->EventListenerProperties(
cc::EventListenerClass::kMouseWheel));
cc::Layer* inner_viewport_scroll_layer =
@@ -456,7 +460,7 @@
ForceFullCompositingUpdate();
ASSERT_EQ(cc::EventListenerProperties::kBlocking,
- GetWebLayerTreeView()->EventListenerProperties(
+ GetWidgetClient()->EventListenerProperties(
cc::EventListenerClass::kTouchStartOrMove));
}
@@ -484,7 +488,7 @@
ForceFullCompositingUpdate();
ASSERT_EQ(cc::EventListenerProperties::kPassive,
- GetWebLayerTreeView()->EventListenerProperties(
+ GetWidgetClient()->EventListenerProperties(
cc::EventListenerClass::kTouchStartOrMove));
}
@@ -529,7 +533,7 @@
ForceFullCompositingUpdate();
ASSERT_EQ(cc::EventListenerProperties::kBlockingAndPassive,
- GetWebLayerTreeView()->EventListenerProperties(
+ GetWidgetClient()->EventListenerProperties(
cc::EventListenerClass::kTouchStartOrMove));
}
@@ -539,7 +543,7 @@
ForceFullCompositingUpdate();
ASSERT_EQ(cc::EventListenerProperties::kBlocking,
- GetWebLayerTreeView()->EventListenerProperties(
+ GetWidgetClient()->EventListenerProperties(
cc::EventListenerClass::kMouseWheel));
}
@@ -549,7 +553,7 @@
ForceFullCompositingUpdate();
ASSERT_EQ(cc::EventListenerProperties::kPassive,
- GetWebLayerTreeView()->EventListenerProperties(
+ GetWidgetClient()->EventListenerProperties(
cc::EventListenerClass::kMouseWheel));
}
@@ -559,7 +563,7 @@
ForceFullCompositingUpdate();
ASSERT_EQ(cc::EventListenerProperties::kBlockingAndPassive,
- GetWebLayerTreeView()->EventListenerProperties(
+ GetWidgetClient()->EventListenerProperties(
cc::EventListenerClass::kMouseWheel));
}
