Changeset 210761 in webkit

Timestamp:

Jan 13, 2017 8:04:59 PM (7 years ago)

Author:

beidson@apple.com

Message:

Crash when visiting a webpage that uses Gamepads in a new WebProcess after a previous page has used gamepads..
​https://bugs.webkit.org/show_bug.cgi?id=167033

Reviewed by Alex Christensen.

• UIProcess/Gamepad/UIGamepadProvider.cpp:

(WebKit::UIGamepadProvider::processPoolStartedUsingGamepads): Don't schedule a state update here.
(WebKit::UIGamepadProvider::processPoolStoppedUsingGamepads): Ditto.

• UIProcess/Gamepad/UIGamepadProvider.h:

• UIProcess/WebProcessPool.cpp:

(WebKit::WebProcessPool::startedUsingGamepads): Populate the WebProcess with initial gamepads.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/Gamepad/UIGamepadProvider.cpp (modified) (2 diffs)
• UIProcess/Gamepad/UIGamepadProvider.h (modified) (2 diffs)
• UIProcess/WebProcessPool.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2017-01-13  Brady Eidson  <beidson@apple.com>
+
+        Crash when visiting a webpage that uses Gamepads in a new WebProcess after a previous page has used gamepads..
+        https://bugs.webkit.org/show_bug.cgi?id=167033
+
+        Reviewed by Alex Christensen.
+
+        * UIProcess/Gamepad/UIGamepadProvider.cpp:
+        (WebKit::UIGamepadProvider::processPoolStartedUsingGamepads): Don't schedule a state update here.
+        (WebKit::UIGamepadProvider::processPoolStoppedUsingGamepads): Ditto.
+        * UIProcess/Gamepad/UIGamepadProvider.h:
+        
+        * UIProcess/WebProcessPool.cpp:
+        (WebKit::WebProcessPool::startedUsingGamepads): Populate the WebProcess with initial gamepads.
+
 2017-01-11  Darin Adler  <darin@apple.com>
 

trunk/Source/WebKit2/UIProcess/Gamepad/UIGamepadProvider.cpp

@@ -152 +152 @@
     if (!m_isMonitoringGamepads && platformWebPageProxyForGamepadInput())
         startMonitoringGamepads();
-
-    scheduleGamepadStateSync();
 }
 
@@ -163 +161 @@
     if (m_isMonitoringGamepads && !platformWebPageProxyForGamepadInput())
         platformStopMonitoringInput();
-
-    scheduleGamepadStateSync();
 }
 

trunk/Source/WebKit2/UIProcess/Gamepad/UIGamepadProvider.h

@@ -57 +57 @@
 #endif
 
+    Vector<GamepadData> snapshotGamepads();
+
 private:
     friend NeverDestroyed<UIGamepadProvider>;
@@ -78 +80 @@
     void gamepadSyncTimerFired();
 
-    Vector<GamepadData> snapshotGamepads();
-
     HashSet<WebProcessPool*> m_processPoolsUsingGamepads;
 

trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp

@@ -1274 +1274 @@
     if (!wereAnyProcessesUsingGamepads)
         UIGamepadProvider::singleton().processPoolStartedUsingGamepads(*this);
+
+    proxy->send(Messages::WebProcess::SetInitialGamepads(UIGamepadProvider::singleton().snapshotGamepads()), 0);
 }