Commit d04545c8 authored by Johann's avatar Johann Committed by Commit Bot

gamepad: DomWindow() returns an ExecutionContext

Change-Id: I6ac521afd6daa88556801e23ca3d7668e628f6a4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2152133Reviewed-by: default avatarKentaro Hara <haraken@chromium.org>
Reviewed-by: default avatarKouhei Ueno <kouhei@chromium.org>
Commit-Queue: Johann Koenig <johannkoenig@google.com>
Cr-Commit-Position: refs/heads/master@{#759882}
parent 5534eb6f
......@@ -98,8 +98,7 @@ GamepadList* NavigatorGamepad::Gamepads() {
}
is_gamepads_exposed_ = true;
ExecutionContext* context =
DomWindow() ? DomWindow()->GetExecutionContext() : nullptr;
ExecutionContext* context = DomWindow();
if (GetFrame() && GetFrame()->IsCrossOriginToMainFrame()) {
UseCounter::Count(context, WebFeature::kGetGamepadsFromCrossOriginSubframe);
......@@ -116,7 +115,6 @@ void NavigatorGamepad::SampleGamepads() {
device::Gamepads gamepads;
gamepad_dispatcher_->SampleGamepads(gamepads);
for (uint32_t i = 0; i < device::Gamepads::kItemsLengthCap; ++i) {
device::Gamepad& device_gamepad = gamepads.items[i];
......@@ -150,8 +148,7 @@ GamepadHapticActuator* NavigatorGamepad::GetVibrationActuatorForGamepad(
int pad_index = gamepad.index();
DCHECK_GE(pad_index, 0);
if (!vibration_actuators_[pad_index]) {
ExecutionContext* context =
DomWindow() ? DomWindow()->GetExecutionContext() : nullptr;
ExecutionContext* context = DomWindow();
auto* actuator = GamepadHapticActuator::Create(context, pad_index);
actuator->SetType(gamepad.GetVibrationActuatorType());
vibration_actuators_[pad_index] = actuator;
......
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