Changeset 144742 in webkit
- Timestamp:
- Mar 5, 2013 1:30:47 AM (11 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r144741 r144742 1 2013-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 1 24 2013-03-05 Mike West <mkwst@chromium.org> 2 25 -
trunk/Source/WebCore/dom/UserGestureIndicator.cpp
r130267 r144742 31 31 namespace { 32 32 33 class GestureToken : public UserGesture Indicator::Token {33 class GestureToken : public UserGestureToken { 34 34 public: 35 static PassRefPtr<UserGesture Indicator::Token> create() { return adoptRef(new GestureToken); }35 static PassRefPtr<UserGestureToken> create() { return adoptRef(new GestureToken); } 36 36 37 37 virtual ~GestureToken() { } … … 84 84 } 85 85 86 UserGestureIndicator::UserGestureIndicator(PassRefPtr<UserGesture Indicator::Token> token)86 UserGestureIndicator::UserGestureIndicator(PassRefPtr<UserGestureToken> token) 87 87 : m_previousState(s_state) 88 88 { … … 122 122 } 123 123 124 UserGesture Indicator::Token* UserGestureIndicator::currentToken()124 UserGestureToken* UserGestureIndicator::currentToken() 125 125 { 126 126 if (!s_topmostIndicator) -
trunk/Source/WebCore/dom/UserGestureIndicator.h
r130267 r144742 39 39 }; 40 40 41 class UserGestureToken : public RefCounted<UserGestureToken> { 42 public: 43 virtual ~UserGestureToken() { } 44 }; 45 46 41 47 class UserGestureIndicator { 42 48 WTF_MAKE_NONCOPYABLE(UserGestureIndicator); 43 49 public: 44 class Token : public RefCounted<Token> {45 public:46 virtual ~Token() { }47 };48 49 50 static bool processingUserGesture(); 50 51 static bool consumeUserGesture(); 51 static Token* currentToken();52 static UserGestureToken* currentToken(); 52 53 53 54 explicit UserGestureIndicator(ProcessingUserGestureState); 54 explicit UserGestureIndicator(PassRefPtr< Token>);55 explicit UserGestureIndicator(PassRefPtr<UserGestureToken>); 55 56 ~UserGestureIndicator(); 56 57 … … 60 61 static UserGestureIndicator* s_topmostIndicator; 61 62 ProcessingUserGestureState m_previousState; 62 RefPtr< Token> m_token;63 RefPtr<UserGestureToken> m_token; 63 64 }; 64 65 -
trunk/Source/WebCore/page/DOMTimer.h
r135384 r144742 69 69 OwnPtr<ScheduledAction> m_action; 70 70 int m_originalInterval; 71 RefPtr<UserGesture Indicator::Token> m_userGestureToken;71 RefPtr<UserGestureToken> m_userGestureToken; 72 72 }; 73 73 -
trunk/Source/WebCore/page/EventHandler.h
r144553 r144742 453 453 double m_mouseDownTimestamp; 454 454 PlatformMouseEvent m_mouseDown; 455 RefPtr<UserGesture Indicator::Token> m_lastMouseDownUserGestureToken;455 RefPtr<UserGestureToken> m_lastMouseDownUserGestureToken; 456 456 457 457 RefPtr<Node> m_latchedWheelEventNode;
Note: See TracChangeset
for help on using the changeset viewer.