⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 211100 in webkit


Ignore:
Timestamp:
Jan 24, 2017, 1:22:36 PM (10 years ago)
Author:
matthew_hanson@apple.com
Message:

Merge r211007. rdar://problem/28620919

Location:
branches/safari-603-branch
Files:
2 added
27 edited

Legend:

Unmodified
Added
Removed

  • branches/safari-603-branch/LayoutTests/ChangeLog

    r210970 r211100  
     12017-01-24  Matthew Hanson  <matthew_hanson@apple.com>
     2
     3        Merge r211007. rdar://problem/28620919
     4
     5    2017-01-20  Brady Eidson  <beidson@apple.com>
     6
     7            Require a button press on a gamepad for them to be exposed to the DOM.
     8            <rdar://problem/28620919> and https://bugs.webkit.org/show_bug.cgi?id=167272
     9
     10            Reviewed by Alex Christensen.
     11
     12            * gamepad/gamepad-visibility-1-expected.txt: Added.
     13            * gamepad/gamepad-visibility-1.html: Added.
     14
    1152017-01-20  Matthew Hanson  <matthew_hanson@apple.com>
    216

  • branches/safari-603-branch/Source/WebCore/ChangeLog

    r210970 r211100  
     12017-01-24  Matthew Hanson  <matthew_hanson@apple.com>
     2
     3        Merge r211007. rdar://problem/28620919
     4
     5    2017-01-20  Brady Eidson  <beidson@apple.com>
     6
     7            Require a button press on a gamepad for them to be exposed to the DOM.
     8            <rdar://problem/28620919> and https://bugs.webkit.org/show_bug.cgi?id=167272
     9
     10            Reviewed by Alex Christensen.
     11
     12            Test: gamepad/gamepad-visibility-1.html
     13
     14            * Modules/gamepad/GamepadManager.cpp:
     15            (WebCore::GamepadManager::platformGamepadInputActivity):
     16            * Modules/gamepad/GamepadManager.h:
     17
     18            * platform/gamepad/GamepadProvider.cpp:
     19            (WebCore::GamepadProvider::dispatchPlatformGamepadInputActivity):
     20            * platform/gamepad/GamepadProvider.h:
     21            (WebCore::GamepadProvider::~GamepadProvider): Deleted.
     22            (WebCore::GamepadProvider::isMockGamepadProvider): Deleted.
     23
     24            * platform/gamepad/GamepadProviderClient.h:
     25
     26            * platform/gamepad/cocoa/GameControllerGamepad.h:
     27            * platform/gamepad/cocoa/GameControllerGamepad.mm:
     28            (WebCore::GameControllerGamepad::setupAsExtendedGamepad):
     29            (WebCore::GameControllerGamepad::setupAsGamepad):
     30
     31            * platform/gamepad/cocoa/GameControllerGamepadProvider.h:
     32            * platform/gamepad/cocoa/GameControllerGamepadProvider.mm:
     33            (WebCore::GameControllerGamepadProvider::gamepadHadInput):
     34            (WebCore::GameControllerGamepadProvider::inputNotificationTimerFired):
     35
     36            * platform/gamepad/mac/HIDGamepad.cpp:
     37            (WebCore::HIDGamepad::valueChanged):
     38            * platform/gamepad/mac/HIDGamepad.h:
     39
     40            * platform/gamepad/mac/HIDGamepadProvider.cpp:
     41            (WebCore::HIDGamepadProvider::valuesChanged):
     42            (WebCore::HIDGamepadProvider::inputNotificationTimerFired):
     43            * platform/gamepad/mac/HIDGamepadProvider.h:
     44
     45            * testing/MockGamepadProvider.cpp:
     46            (WebCore::MockGamepadProvider::setMockGamepadButtonValue):
     47            (WebCore::MockGamepadProvider::gamepadInputActivity):
     48            * testing/MockGamepadProvider.h:
     49
    1502017-01-20  Matthew Hanson  <matthew_hanson@apple.com>
    251

  • branches/safari-603-branch/Source/WebCore/Modules/gamepad/GamepadManager.cpp

    r205814 r211100  
    116116}
    117117
    118 void GamepadManager::platformGamepadInputActivity()
    119 {
     118void GamepadManager::platformGamepadInputActivity(bool shouldMakeGamepadVisible)
     119{
     120    if (!shouldMakeGamepadVisible)
     121        return;
     122
    120123    if (m_gamepadBlindNavigators.isEmpty() && m_gamepadBlindDOMWindows.isEmpty())
    121124        return;

  • branches/safari-603-branch/Source/WebCore/Modules/gamepad/GamepadManager.h

    r208646 r211100  
    4848    void platformGamepadConnected(PlatformGamepad&) final;
    4949    void platformGamepadDisconnected(PlatformGamepad&) final;
    50     void platformGamepadInputActivity() final;
     50    void platformGamepadInputActivity(bool shouldMakeGamepadVisible) final;
    5151
    5252    void registerNavigator(NavigatorGamepad*);

  • branches/safari-603-branch/Source/WebCore/platform/gamepad/GamepadProvider.cpp

    r204178 r211100  
    2929
    3030#include "EmptyGamepadProvider.h"
     31#include "GamepadProviderClient.h"
    3132#include <wtf/NeverDestroyed.h>
    3233
    … …  
    5051}
    5152
     53void GamepadProvider::dispatchPlatformGamepadInputActivity()
     54{
     55    for (auto& client : m_clients)
     56        client->platformGamepadInputActivity(m_shouldMakeGamepadsVisible);
     57
     58    m_shouldMakeGamepadsVisible = false;
     59}
     60
    5261} // namespace WebCore
    5362

  • branches/safari-603-branch/Source/WebCore/platform/gamepad/GamepadProvider.h

    r204853 r211100  
    2828#if ENABLE(GAMEPAD)
    2929
     30#include <wtf/HashSet.h>
    3031#include <wtf/Vector.h>
    3132
    … …  
    3536class PlatformGamepad;
    3637
    37 class GamepadProvider {
     38class WEBCORE_EXPORT GamepadProvider {
    3839public:
    3940    virtual ~GamepadProvider() { }
    … …  
    4748    virtual bool isMockGamepadProvider() const { return false; }
    4849
     50protected:
     51    void dispatchPlatformGamepadInputActivity();
     52    void setShouldMakeGamepadsVisibile() { m_shouldMakeGamepadsVisible = true; }
     53    HashSet<GamepadProviderClient*> m_clients;
     54
     55private:
     56    bool m_shouldMakeGamepadsVisible { false };
    4957};
    5058

  • branches/safari-603-branch/Source/WebCore/platform/gamepad/GamepadProviderClient.h

    r204524 r211100  
    4141    virtual void platformGamepadConnected(PlatformGamepad&) = 0;
    4242    virtual void platformGamepadDisconnected(PlatformGamepad&) = 0;
    43     virtual void platformGamepadInputActivity() = 0;
     43    virtual void platformGamepadInputActivity(bool shouldMakeGamepadVisible) = 0;
    4444};
    4545

  • branches/safari-603-branch/Source/WebCore/platform/gamepad/cocoa/GameControllerGamepad.h

    r205247 r211100  
    5959    RetainPtr<GCGamepad> m_gamepad;
    6060    RetainPtr<GCExtendedGamepad> m_extendedGamepad;
     61
     62    bool m_hadButtonPresses { false };
    6163};
    6264

  • branches/safari-603-branch/Source/WebCore/platform/gamepad/cocoa/GameControllerGamepad.mm

    r205247 r211100  
    6060    m_extendedGamepad.get().valueChangedHandler = ^(GCExtendedGamepad *, GCControllerElement *) {
    6161        m_lastUpdateTime = monotonicallyIncreasingTime();
    62         GameControllerGamepadProvider::singleton().gamepadHadInput(*this);
     62        GameControllerGamepadProvider::singleton().gamepadHadInput(*this, m_hadButtonPresses);
     63        m_hadButtonPresses = false;
    6364    };
    6465
    … …  
    8182    m_axisValues[5] = m_extendedGamepad.get().dpad.yAxis.value;
    8283
    83     m_extendedGamepad.get().buttonA.valueChangedHandler = ^(GCControllerButtonInput *, float value, BOOL) {
     84    m_extendedGamepad.get().buttonA.valueChangedHandler = ^(GCControllerButtonInput *, float value, BOOL pressed) {
    8485        m_buttonValues[0] = value;
    85     };
    86     m_extendedGamepad.get().buttonB.valueChangedHandler = ^(GCControllerButtonInput *, float value, BOOL) {
     86        if (pressed)
     87            m_hadButtonPresses = true;
     88    };
     89    m_extendedGamepad.get().buttonB.valueChangedHandler = ^(GCControllerButtonInput *, float value, BOOL pressed) {
    8790        m_buttonValues[1] = value;
    88     };
    89     m_extendedGamepad.get().buttonX.valueChangedHandler = ^(GCControllerButtonInput *, float value, BOOL) {
     91        if (pressed)
     92            m_hadButtonPresses = true;
     93    };
     94    m_extendedGamepad.get().buttonX.valueChangedHandler = ^(GCControllerButtonInput *, float value, BOOL pressed) {
    9095        m_buttonValues[2] = value;
    91     };
    92     m_extendedGamepad.get().buttonY.valueChangedHandler = ^(GCControllerButtonInput *, float value, BOOL) {
     96        if (pressed)
     97            m_hadButtonPresses = true;
     98    };
     99    m_extendedGamepad.get().buttonY.valueChangedHandler = ^(GCControllerButtonInput *, float value, BOOL pressed) {
    93100        m_buttonValues[3] = value;
    94     };
    95     m_extendedGamepad.get().leftShoulder.valueChangedHandler = ^(GCControllerButtonInput *, float value, BOOL) {
     101        if (pressed)
     102            m_hadButtonPresses = true;
     103    };
     104    m_extendedGamepad.get().leftShoulder.valueChangedHandler = ^(GCControllerButtonInput *, float value, BOOL pressed) {
    96105        m_buttonValues[4] = value;
    97     };
    98     m_extendedGamepad.get().rightShoulder.valueChangedHandler = ^(GCControllerButtonInput *, float value, BOOL) {
     106        if (pressed)
     107            m_hadButtonPresses = true;
     108    };
     109    m_extendedGamepad.get().rightShoulder.valueChangedHandler = ^(GCControllerButtonInput *, float value, BOOL pressed) {
    99110        m_buttonValues[5] = value;
    100     };
    101     m_extendedGamepad.get().leftTrigger.valueChangedHandler = ^(GCControllerButtonInput *, float value, BOOL) {
     111        if (pressed)
     112            m_hadButtonPresses = true;
     113    };
     114    m_extendedGamepad.get().leftTrigger.valueChangedHandler = ^(GCControllerButtonInput *, float value, BOOL pressed) {
    102115        m_buttonValues[6] = value;
    103     };
    104     m_extendedGamepad.get().rightTrigger.valueChangedHandler = ^(GCControllerButtonInput *, float value, BOOL) {
     116        if (pressed)
     117            m_hadButtonPresses = true;
     118    };
     119    m_extendedGamepad.get().rightTrigger.valueChangedHandler = ^(GCControllerButtonInput *, float value, BOOL pressed) {
    105120        m_buttonValues[7] = value;
     121        if (pressed)
     122            m_hadButtonPresses = true;
    106123    };
    107124
    … …  
    134151    m_gamepad.get().valueChangedHandler = ^(GCGamepad *, GCControllerElement *) {
    135152        m_lastUpdateTime = monotonicallyIncreasingTime();
    136         GameControllerGamepadProvider::singleton().gamepadHadInput(*this);
     153        GameControllerGamepadProvider::singleton().gamepadHadInput(*this, m_hadButtonPresses);
     154        m_hadButtonPresses = false;
    137155    };
    138156
    … …  
    149167    m_axisValues[1] = m_extendedGamepad.get().dpad.yAxis.value;
    150168
    151     m_extendedGamepad.get().buttonA.valueChangedHandler = ^(GCControllerButtonInput *, float value, BOOL) {
     169    m_extendedGamepad.get().buttonA.valueChangedHandler = ^(GCControllerButtonInput *, float value, BOOL pressed) {
    152170        m_buttonValues[0] = value;
    153     };
    154     m_extendedGamepad.get().buttonB.valueChangedHandler = ^(GCControllerButtonInput *, float value, BOOL) {
     171        if (pressed)
     172            m_hadButtonPresses = true;
     173    };
     174    m_extendedGamepad.get().buttonB.valueChangedHandler = ^(GCControllerButtonInput *, float value, BOOL pressed) {
    155175        m_buttonValues[1] = value;
    156     };
    157     m_extendedGamepad.get().buttonX.valueChangedHandler = ^(GCControllerButtonInput *, float value, BOOL) {
     176        if (pressed)
     177            m_hadButtonPresses = true;
     178    };
     179    m_extendedGamepad.get().buttonX.valueChangedHandler = ^(GCControllerButtonInput *, float value, BOOL pressed) {
    158180        m_buttonValues[2] = value;
    159     };
    160     m_extendedGamepad.get().buttonY.valueChangedHandler = ^(GCControllerButtonInput *, float value, BOOL) {
     181        if (pressed)
     182            m_hadButtonPresses = true;
     183    };
     184    m_extendedGamepad.get().buttonY.valueChangedHandler = ^(GCControllerButtonInput *, float value, BOOL pressed) {
    161185        m_buttonValues[3] = value;
    162     };
    163     m_extendedGamepad.get().leftShoulder.valueChangedHandler = ^(GCControllerButtonInput *, float value, BOOL) {
     186        if (pressed)
     187            m_hadButtonPresses = true;
     188    };
     189    m_extendedGamepad.get().leftShoulder.valueChangedHandler = ^(GCControllerButtonInput *, float value, BOOL pressed) {
    164190        m_buttonValues[4] = value;
    165     };
    166     m_extendedGamepad.get().rightShoulder.valueChangedHandler = ^(GCControllerButtonInput *, float value, BOOL) {
     191        if (pressed)
     192            m_hadButtonPresses = true;
     193    };
     194    m_extendedGamepad.get().rightShoulder.valueChangedHandler = ^(GCControllerButtonInput *, float value, BOOL pressed) {
    167195        m_buttonValues[5] = value;
     196        if (pressed)
     197            m_hadButtonPresses = true;
    168198    };
    169199

  • branches/safari-603-branch/Source/WebCore/platform/gamepad/cocoa/GameControllerGamepadProvider.h

    r205247 r211100  
    3030#include "GamepadProvider.h"
    3131#include <wtf/HashMap.h>
    32 #include <wtf/HashSet.h>
    3332#include <wtf/NeverDestroyed.h>
    3433#include <wtf/RetainPtr.h>
    … …  
    5655    WEBCORE_EXPORT void startMonitoringInput();
    5756
    58     void gamepadHadInput(GameControllerGamepad&);
     57    void gamepadHadInput(GameControllerGamepad&, bool hadButtonPresses);
    5958
    6059private:
    … …  
    7574    void makeInvisibileGamepadsVisible();
    7675
    77     HashSet<GamepadProviderClient*> m_clients;
    78 
    7976    HashMap<GCController *, std::unique_ptr<GameControllerGamepad>> m_gamepadMap;
    8077    Vector<PlatformGamepad*> m_gamepadVector;
    … …  
    8582
    8683    RunLoop::Timer<GameControllerGamepadProvider> m_inputNotificationTimer;
     84    bool m_shouldMakeInvisibileGamepadsVisible { false };
    8785};
    8886

  • branches/safari-603-branch/Source/WebCore/platform/gamepad/cocoa/GameControllerGamepadProvider.mm

    r205756 r211100  
    142142}
    143143
    144 void GameControllerGamepadProvider::gamepadHadInput(GameControllerGamepad&)
     144void GameControllerGamepadProvider::gamepadHadInput(GameControllerGamepad&, bool hadButtonPresses)
    145145{
    146146    if (!m_inputNotificationTimer.isActive())
    147147        m_inputNotificationTimer.startOneShot(InputNotificationDelay);
     148
     149    if (hadButtonPresses)
     150        m_shouldMakeInvisibileGamepadsVisible = true;
    148151}
    149152
    … …  
    160163void GameControllerGamepadProvider::inputNotificationTimerFired()
    161164{
    162     makeInvisibileGamepadsVisible();
     165    if (m_shouldMakeInvisibileGamepadsVisible) {
     166        setShouldMakeGamepadsVisibile();
     167        makeInvisibileGamepadsVisible();
     168    }
    163169
    164     for (auto& client : m_clients)
    165         client->platformGamepadInputActivity();
     170    m_shouldMakeInvisibileGamepadsVisible = false;
     171
     172    dispatchPlatformGamepadInputActivity();
    166173}
    167174

  • branches/safari-603-branch/Source/WebCore/platform/gamepad/mac/HIDGamepad.cpp

    r205247 r211100  
    159159}
    160160
    161 void HIDGamepad::valueChanged(IOHIDValueRef value)
     161HIDInputType HIDGamepad::valueChanged(IOHIDValueRef value)
    162162{
    163163    IOHIDElementCookie cookie = IOHIDElementGetCookie(IOHIDValueGetElement(value));
    … …  
    166166    // This might be an element we don't currently handle as input so we can skip it.
    167167    if (!element)
    168         return;
     168        return HIDInputType::NotAButtonPress;
    169169
    170170    element->rawValue = IOHIDValueGetScaledValue(value, kIOHIDValueScaleTypePhysical);
    … …  
    184184
    185185    m_lastUpdateTime = monotonicallyIncreasingTime();
     186
     187    return element->isButton() ? HIDInputType::ButtonPress : HIDInputType::NotAButtonPress;
    186188}
    187189

  • branches/safari-603-branch/Source/WebCore/platform/gamepad/mac/HIDGamepad.h

    r205247 r211100  
    9292};
    9393
     94enum class HIDInputType {
     95    ButtonPress,
     96    NotAButtonPress,
     97};
     98
    9499class HIDGamepad : public PlatformGamepad {
    95100public:
    … …  
    98103    IOHIDDeviceRef hidDevice() const { return m_hidDevice.get(); }
    99104
    100     void valueChanged(IOHIDValueRef);
     105    HIDInputType valueChanged(IOHIDValueRef);
    101106
    102107    const Vector<double>& axisValues() const final { return m_axisValues; }

  • branches/safari-603-branch/Source/WebCore/platform/gamepad/mac/HIDGamepadProvider.cpp

    r205247 r211100  
    238238        return;
    239239
    240     gamepad->valueChanged(value);
     240    if (gamepad->valueChanged(value) == HIDInputType::ButtonPress)
     241        setShouldMakeGamepadsVisibile();
    241242
    242243    // This isActive check is necessary as we want to delay input notifications from the time of the first input,
    … …  
    251252        return;
    252253
    253     for (auto& client : m_clients)
    254         client->platformGamepadInputActivity();
     254    dispatchPlatformGamepadInputActivity();
    255255}
    256256

  • branches/safari-603-branch/Source/WebCore/platform/gamepad/mac/HIDGamepadProvider.h

    r205247 r211100  
    3434#include <wtf/Deque.h>
    3535#include <wtf/HashMap.h>
    36 #include <wtf/HashSet.h>
    3736#include <wtf/NeverDestroyed.h>
    3837#include <wtf/RetainPtr.h>
    … …  
    7776    RetainPtr<IOHIDManagerRef> m_manager;
    7877
    79     HashSet<GamepadProviderClient*> m_clients;
    8078    bool m_shouldDispatchCallbacks;
    8179

  • branches/safari-603-branch/Source/WebCore/testing/MockGamepadProvider.cpp

    r204853 r211100  
    133133
    134134    m_mockGamepadVector[index]->setButtonValue(buttonIndex, value);
     135    setShouldMakeGamepadsVisibile();
    135136    gamepadInputActivity();
    136137    return true;
    … …  
    144145    m_shouldScheduleActivityCallback = false;
    145146    callOnMainThread([this]() {
    146         for (auto& client : m_clients)
    147             client->platformGamepadInputActivity();
     147        dispatchPlatformGamepadInputActivity();
    148148
    149149        m_shouldScheduleActivityCallback = true;

  • branches/safari-603-branch/Source/WebCore/testing/MockGamepadProvider.h

    r204853 r211100  
    3030#include "GamepadProvider.h"
    3131#include "MockGamepad.h"
    32 #include <wtf/HashSet.h>
    3332#include <wtf/NeverDestroyed.h>
    3433#include <wtf/text/WTFString.h>
    … …  
    6362    Vector<std::unique_ptr<MockGamepad>> m_mockGamepadVector;
    6463
    65     HashSet<GamepadProviderClient*> m_clients;
    66 
    6764    bool m_shouldScheduleActivityCallback { true };
    6865};

  • branches/safari-603-branch/Source/WebKit2/ChangeLog

    r211098 r211100  
     12017-01-24  Matthew Hanson  <matthew_hanson@apple.com>
     2
     3        Merge r211007. rdar://problem/28620919
     4
     5    2017-01-20  Brady Eidson  <beidson@apple.com>
     6
     7            Require a button press on a gamepad for them to be exposed to the DOM.
     8            <rdar://problem/28620919> and https://bugs.webkit.org/show_bug.cgi?id=167272
     9
     10            Reviewed by Alex Christensen.
     11
     12            * UIProcess/Gamepad/UIGamepadProvider.cpp:
     13            (WebKit::UIGamepadProvider::gamepadSyncTimerFired):
     14            (WebKit::UIGamepadProvider::platformGamepadInputActivity):
     15            * UIProcess/Gamepad/UIGamepadProvider.h:
     16
     17            * UIProcess/WebPageProxy.cpp:
     18            (WebKit::WebPageProxy::gamepadActivity):
     19            * UIProcess/WebPageProxy.h:
     20
     21            * WebProcess/Gamepad/WebGamepadProvider.cpp:
     22            (WebKit::WebGamepadProvider::gamepadActivity):
     23            * WebProcess/Gamepad/WebGamepadProvider.h:
     24
     25            * WebProcess/WebPage/WebPage.cpp:
     26            (WebKit::WebPage::gamepadActivity):
     27            * WebProcess/WebPage/WebPage.h:
     28            * WebProcess/WebPage/WebPage.messages.in:
     29
    1302017-01-24  Matthew Hanson  <matthew_hanson@apple.com>
    231

  • branches/safari-603-branch/Source/WebKit2/UIProcess/Gamepad/UIGamepadProvider.cpp

    r210871 r211100  
    6666        return;
    6767
    68     webPageProxy->gamepadActivity(snapshotGamepads());
     68    webPageProxy->gamepadActivity(snapshotGamepads(), m_shouldMakeGamepadsVisibleOnSync);
     69    m_shouldMakeGamepadsVisibleOnSync = false;
    6970}
    7071
    … …  
    127128}
    128129
    129 void UIGamepadProvider::platformGamepadInputActivity()
     130void UIGamepadProvider::platformGamepadInputActivity(bool shouldMakeGamepadsVisible)
    130131{
    131132    auto platformGamepads = GamepadProvider::singleton().platformGamepads();
    … …  
    142143    }
    143144
     145    if (shouldMakeGamepadsVisible)
     146        m_shouldMakeGamepadsVisibleOnSync = true;
     147
    144148    scheduleGamepadStateSync();
    145149}

  • branches/safari-603-branch/Source/WebKit2/UIProcess/Gamepad/UIGamepadProvider.h

    r210871 r211100  
    7575    void platformGamepadConnected(WebCore::PlatformGamepad&) final;
    7676    void platformGamepadDisconnected(WebCore::PlatformGamepad&) final;
    77     void platformGamepadInputActivity() final;
     77    void platformGamepadInputActivity(bool shouldMakeGamepadsVisible) final;
    7878
    7979    void scheduleGamepadStateSync();
    … …  
    8888    bool m_isMonitoringGamepads { false };
    8989    bool m_hasInitialGamepads { false };
     90    bool m_shouldMakeGamepadsVisibleOnSync { false };
    9091};
    9192

  • branches/safari-603-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp

    r210641 r211100  
    55955595#if ENABLE(GAMEPAD)
    55965596
    5597 void WebPageProxy::gamepadActivity(const Vector<GamepadData>& gamepadDatas)
    5598 {
    5599     m_process->send(Messages::WebPage::GamepadActivity(gamepadDatas), m_pageID);
     5597void WebPageProxy::gamepadActivity(const Vector<GamepadData>& gamepadDatas, bool shouldMakeGamepadsVisible)
     5598{
     5599    m_process->send(Messages::WebPage::GamepadActivity(gamepadDatas, shouldMakeGamepadsVisible), m_pageID);
    56005600}
    56015601

  • branches/safari-603-branch/Source/WebKit2/UIProcess/WebPageProxy.h

    r210876 r211100  
    11761176
    11771177#if ENABLE(GAMEPAD)
    1178     void gamepadActivity(const Vector<GamepadData>&);
     1178    void gamepadActivity(const Vector<GamepadData>&, bool shouldMakeGamepadsVisible);
    11791179#endif
    11801180       

  • branches/safari-603-branch/Source/WebKit2/WebProcess/Gamepad/WebGamepadProvider.cpp

    r204853 r211100  
    9696}
    9797
    98 void WebGamepadProvider::gamepadActivity(const Vector<GamepadData>& gamepadDatas)
     98void WebGamepadProvider::gamepadActivity(const Vector<GamepadData>& gamepadDatas, bool shouldMakeGamepadsVisible)
    9999{
    100100    ASSERT(m_gamepads.size() == gamepadDatas.size());
    … …  
    106106
    107107    for (auto* client : m_clients)
    108         client->platformGamepadInputActivity();
     108        client->platformGamepadInputActivity(shouldMakeGamepadsVisible);
    109109}
    110110

  • branches/safari-603-branch/Source/WebKit2/WebProcess/Gamepad/WebGamepadProvider.h

    r204853 r211100  
    4545    void gamepadConnected(const GamepadData&);
    4646    void gamepadDisconnected(unsigned index);
    47     void gamepadActivity(const Vector<GamepadData>&);
     47    void gamepadActivity(const Vector<GamepadData>&, bool shouldMakeGamepadsVisible);
    4848
    4949    void setInitialGamepads(const Vector<GamepadData>&);

  • branches/safari-603-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp

    r210969 r211100  
    56915691#if ENABLE(GAMEPAD)
    56925692
    5693 void WebPage::gamepadActivity(const Vector<GamepadData>& gamepadDatas)
    5694 {
    5695     WebGamepadProvider::singleton().gamepadActivity(gamepadDatas);
     5693void WebPage::gamepadActivity(const Vector<GamepadData>& gamepadDatas, bool shouldMakeGamepadsVisible)
     5694{
     5695    WebGamepadProvider::singleton().gamepadActivity(gamepadDatas, shouldMakeGamepadsVisible);
    56965696}
    56975697

  • branches/safari-603-branch/Source/WebKit2/WebProcess/WebPage/WebPage.h

    r209975 r211100  
    965965
    966966#if ENABLE(GAMEPAD)
    967     void gamepadActivity(const Vector<GamepadData>&);
     967    void gamepadActivity(const Vector<GamepadData>&, bool shouldMakeGamepadsVisible);
    968968#endif
    969969   

  • branches/safari-603-branch/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in

    r209975 r211100  
    458458
    459459#if ENABLE(GAMEPAD)
    460     GamepadActivity(Vector<WebKit::GamepadData> gamepadDatas)
     460    GamepadActivity(Vector<WebKit::GamepadData> gamepadDatas, bool shouldMakeGamepadsVisible)
    461461#endif
    462462}
Note: See TracChangeset for help on using the changeset viewer.