Title: [144742] trunk/Source/WebCore
- Revision
- 144742
- Author
- joc...@chromium.org
- Date
- 2013-03-05 01:30:47 -0800 (Tue, 05 Mar 2013)
Log 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:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (144741 => 144742)
--- trunk/Source/WebCore/ChangeLog 2013-03-05 09:15:59 UTC (rev 144741)
+++ trunk/Source/WebCore/ChangeLog 2013-03-05 09:30:47 UTC (rev 144742)
@@ -1,3 +1,26 @@
+2013-03-05 Jochen Eisinger <joc...@chromium.org>
+
+ 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:
+
2013-03-05 Mike West <mk...@chromium.org>
Remove redundant code in Document::updateHoverActiveState.
Modified: trunk/Source/WebCore/dom/UserGestureIndicator.cpp (144741 => 144742)
--- trunk/Source/WebCore/dom/UserGestureIndicator.cpp 2013-03-05 09:15:59 UTC (rev 144741)
+++ trunk/Source/WebCore/dom/UserGestureIndicator.cpp 2013-03-05 09:30:47 UTC (rev 144742)
@@ -30,9 +30,9 @@
namespace {
-class GestureToken : public UserGestureIndicator::Token {
+class GestureToken : public UserGestureToken {
public:
- static PassRefPtr<UserGestureIndicator::Token> create() { return adoptRef(new GestureToken); }
+ static PassRefPtr<UserGestureToken> create() { return adoptRef(new GestureToken); }
virtual ~GestureToken() { }
@@ -83,7 +83,7 @@
ASSERT(isDefinite(s_state));
}
-UserGestureIndicator::UserGestureIndicator(PassRefPtr<UserGestureIndicator::Token> token)
+UserGestureIndicator::UserGestureIndicator(PassRefPtr<UserGestureToken> token)
: m_previousState(s_state)
{
if (token && static_cast<GestureToken*>(token.get())->hasGestures()) {
@@ -121,7 +121,7 @@
return static_cast<GestureToken*>(s_topmostIndicator->currentToken())->consumeGesture();
}
-UserGestureIndicator::Token* UserGestureIndicator::currentToken()
+UserGestureToken* UserGestureIndicator::currentToken()
{
if (!s_topmostIndicator)
return 0;
Modified: trunk/Source/WebCore/dom/UserGestureIndicator.h (144741 => 144742)
--- trunk/Source/WebCore/dom/UserGestureIndicator.h 2013-03-05 09:15:59 UTC (rev 144741)
+++ trunk/Source/WebCore/dom/UserGestureIndicator.h 2013-03-05 09:30:47 UTC (rev 144742)
@@ -38,20 +38,21 @@
DefinitelyNotProcessingUserGesture
};
+class UserGestureToken : public RefCounted<UserGestureToken> {
+public:
+ virtual ~UserGestureToken() { }
+};
+
+
class UserGestureIndicator {
WTF_MAKE_NONCOPYABLE(UserGestureIndicator);
public:
- class Token : public RefCounted<Token> {
- public:
- virtual ~Token() { }
- };
-
static bool processingUserGesture();
static bool consumeUserGesture();
- static Token* currentToken();
+ static UserGestureToken* currentToken();
explicit UserGestureIndicator(ProcessingUserGestureState);
- explicit UserGestureIndicator(PassRefPtr<Token>);
+ explicit UserGestureIndicator(PassRefPtr<UserGestureToken>);
~UserGestureIndicator();
@@ -59,7 +60,7 @@
static ProcessingUserGestureState s_state;
static UserGestureIndicator* s_topmostIndicator;
ProcessingUserGestureState m_previousState;
- RefPtr<Token> m_token;
+ RefPtr<UserGestureToken> m_token;
};
}
Modified: trunk/Source/WebCore/page/DOMTimer.h (144741 => 144742)
--- trunk/Source/WebCore/page/DOMTimer.h 2013-03-05 09:15:59 UTC (rev 144741)
+++ trunk/Source/WebCore/page/DOMTimer.h 2013-03-05 09:30:47 UTC (rev 144742)
@@ -68,7 +68,7 @@
int m_nestingLevel;
OwnPtr<ScheduledAction> m_action;
int m_originalInterval;
- RefPtr<UserGestureIndicator::Token> m_userGestureToken;
+ RefPtr<UserGestureToken> m_userGestureToken;
};
} // namespace WebCore
Modified: trunk/Source/WebCore/page/EventHandler.h (144741 => 144742)
--- trunk/Source/WebCore/page/EventHandler.h 2013-03-05 09:15:59 UTC (rev 144741)
+++ trunk/Source/WebCore/page/EventHandler.h 2013-03-05 09:30:47 UTC (rev 144742)
@@ -452,7 +452,7 @@
IntPoint m_mouseDownPos; // In our view's coords.
double m_mouseDownTimestamp;
PlatformMouseEvent m_mouseDown;
- RefPtr<UserGestureIndicator::Token> m_lastMouseDownUserGestureToken;
+ RefPtr<UserGestureToken> m_lastMouseDownUserGestureToken;
RefPtr<Node> m_latchedWheelEventNode;
bool m_widgetIsLatched;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
