Changeset 144742 in webkit


Ignore:
Timestamp:
Mar 5, 2013 1:30:47 AM (11 years ago)
Author:
jochen@chromium.org
Message:

Refactor UserGestureIndicator::Token to be a top-level class
https://bugs.webkit.org/show_bug.cgi?id=111412

Reviewed by Nico Weber.

This will allow for forward declaring the class in a public WebKit
API header. The goal is to enable the embedder to hold on to a
UserGestureToken.

  • dom/UserGestureIndicator.cpp:

(WebCore::UserGestureIndicator::UserGestureIndicator):
(WebCore::UserGestureIndicator::currentToken):

  • dom/UserGestureIndicator.h:

(UserGestureToken):
(WebCore::UserGestureToken::~UserGestureToken):
(WebCore):
(UserGestureIndicator):

  • page/DOMTimer.h:

(DOMTimer):

  • page/EventHandler.h:
Location:
trunk/Source/WebCore
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r144741 r144742  
     12013-03-05  Jochen Eisinger  <jochen@chromium.org>
     2
     3        Refactor UserGestureIndicator::Token to be a top-level class
     4        https://bugs.webkit.org/show_bug.cgi?id=111412
     5
     6        Reviewed by Nico Weber.
     7
     8        This will allow for forward declaring the class in a public WebKit
     9        API header. The goal is to enable the embedder to hold on to a
     10        UserGestureToken.
     11
     12        * dom/UserGestureIndicator.cpp:
     13        (WebCore::UserGestureIndicator::UserGestureIndicator):
     14        (WebCore::UserGestureIndicator::currentToken):
     15        * dom/UserGestureIndicator.h:
     16        (UserGestureToken):
     17        (WebCore::UserGestureToken::~UserGestureToken):
     18        (WebCore):
     19        (UserGestureIndicator):
     20        * page/DOMTimer.h:
     21        (DOMTimer):
     22        * page/EventHandler.h:
     23
    1242013-03-05  Mike West  <mkwst@chromium.org>
    225
  • trunk/Source/WebCore/dom/UserGestureIndicator.cpp

    r130267 r144742  
    3131namespace {
    3232
    33 class GestureToken : public UserGestureIndicator::Token {
     33class GestureToken : public UserGestureToken {
    3434public:
    35     static PassRefPtr<UserGestureIndicator::Token> create() { return adoptRef(new GestureToken); }
     35    static PassRefPtr<UserGestureToken> create() { return adoptRef(new GestureToken); }
    3636
    3737    virtual ~GestureToken() { }
     
    8484}
    8585
    86 UserGestureIndicator::UserGestureIndicator(PassRefPtr<UserGestureIndicator::Token> token)
     86UserGestureIndicator::UserGestureIndicator(PassRefPtr<UserGestureToken> token)
    8787    : m_previousState(s_state)
    8888{
     
    122122}
    123123
    124 UserGestureIndicator::Token* UserGestureIndicator::currentToken()
     124UserGestureToken* UserGestureIndicator::currentToken()
    125125{
    126126    if (!s_topmostIndicator)
  • trunk/Source/WebCore/dom/UserGestureIndicator.h

    r130267 r144742  
    3939};
    4040
     41class UserGestureToken : public RefCounted<UserGestureToken> {
     42public:
     43    virtual ~UserGestureToken() { }
     44};
     45
     46
    4147class UserGestureIndicator {
    4248    WTF_MAKE_NONCOPYABLE(UserGestureIndicator);
    4349public:
    44     class Token : public RefCounted<Token> {
    45     public:
    46         virtual ~Token() { }
    47     };
    48 
    4950    static bool processingUserGesture();
    5051    static bool consumeUserGesture();
    51     static Token* currentToken();
     52    static UserGestureToken* currentToken();
    5253
    5354    explicit UserGestureIndicator(ProcessingUserGestureState);
    54     explicit UserGestureIndicator(PassRefPtr<Token>);
     55    explicit UserGestureIndicator(PassRefPtr<UserGestureToken>);
    5556    ~UserGestureIndicator();
    5657
     
    6061    static UserGestureIndicator* s_topmostIndicator;
    6162    ProcessingUserGestureState m_previousState;
    62     RefPtr<Token> m_token;
     63    RefPtr<UserGestureToken> m_token;
    6364};
    6465
  • trunk/Source/WebCore/page/DOMTimer.h

    r135384 r144742  
    6969        OwnPtr<ScheduledAction> m_action;
    7070        int m_originalInterval;
    71         RefPtr<UserGestureIndicator::Token> m_userGestureToken;
     71        RefPtr<UserGestureToken> m_userGestureToken;
    7272    };
    7373
  • trunk/Source/WebCore/page/EventHandler.h

    r144553 r144742  
    453453    double m_mouseDownTimestamp;
    454454    PlatformMouseEvent m_mouseDown;
    455     RefPtr<UserGestureIndicator::Token> m_lastMouseDownUserGestureToken;
     455    RefPtr<UserGestureToken> m_lastMouseDownUserGestureToken;
    456456
    457457    RefPtr<Node> m_latchedWheelEventNode;
Note: See TracChangeset for help on using the changeset viewer.