<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[144742] trunk/Source/WebCore</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/144742">144742</a></dd>
<dt>Author</dt> <dd>jochen@chromium.org</dd>
<dt>Date</dt> <dd>2013-03-05 01:30:47 -0800 (Tue, 05 Mar 2013)</dd>
</dl>

<h3>Log Message</h3>
<pre>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:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomUserGestureIndicatorcpp">trunk/Source/WebCore/dom/UserGestureIndicator.cpp</a></li>
<li><a href="#trunkSourceWebCoredomUserGestureIndicatorh">trunk/Source/WebCore/dom/UserGestureIndicator.h</a></li>
<li><a href="#trunkSourceWebCorepageDOMTimerh">trunk/Source/WebCore/page/DOMTimer.h</a></li>
<li><a href="#trunkSourceWebCorepageEventHandlerh">trunk/Source/WebCore/page/EventHandler.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (144741 => 144742)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2013-03-05  Jochen Eisinger  &lt;jochen@chromium.org&gt;
+
+        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:
+
</ins><span class="cx"> 2013-03-05  Mike West  &lt;mkwst@chromium.org&gt;
</span><span class="cx"> 
</span><span class="cx">         Remove redundant code in Document::updateHoverActiveState.
</span></span></pre></div>
<a id="trunkSourceWebCoredomUserGestureIndicatorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/UserGestureIndicator.cpp (144741 => 144742)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -30,9 +30,9 @@
</span><span class="cx"> 
</span><span class="cx"> namespace {
</span><span class="cx"> 
</span><del>-class GestureToken : public UserGestureIndicator::Token {
</del><ins>+class GestureToken : public UserGestureToken {
</ins><span class="cx"> public:
</span><del>-    static PassRefPtr&lt;UserGestureIndicator::Token&gt; create() { return adoptRef(new GestureToken); }
</del><ins>+    static PassRefPtr&lt;UserGestureToken&gt; create() { return adoptRef(new GestureToken); }
</ins><span class="cx"> 
</span><span class="cx">     virtual ~GestureToken() { }
</span><span class="cx"> 
</span><span class="lines">@@ -83,7 +83,7 @@
</span><span class="cx">     ASSERT(isDefinite(s_state));
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-UserGestureIndicator::UserGestureIndicator(PassRefPtr&lt;UserGestureIndicator::Token&gt; token)
</del><ins>+UserGestureIndicator::UserGestureIndicator(PassRefPtr&lt;UserGestureToken&gt; token)
</ins><span class="cx">     : m_previousState(s_state)
</span><span class="cx"> {
</span><span class="cx">     if (token &amp;&amp; static_cast&lt;GestureToken*&gt;(token.get())-&gt;hasGestures()) {
</span><span class="lines">@@ -121,7 +121,7 @@
</span><span class="cx">     return static_cast&lt;GestureToken*&gt;(s_topmostIndicator-&gt;currentToken())-&gt;consumeGesture();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-UserGestureIndicator::Token* UserGestureIndicator::currentToken()
</del><ins>+UserGestureToken* UserGestureIndicator::currentToken()
</ins><span class="cx"> {
</span><span class="cx">     if (!s_topmostIndicator)
</span><span class="cx">         return 0;
</span></span></pre></div>
<a id="trunkSourceWebCoredomUserGestureIndicatorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/UserGestureIndicator.h (144741 => 144742)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -38,20 +38,21 @@
</span><span class="cx">     DefinitelyNotProcessingUserGesture
</span><span class="cx"> };
</span><span class="cx"> 
</span><ins>+class UserGestureToken : public RefCounted&lt;UserGestureToken&gt; {
+public:
+    virtual ~UserGestureToken() { }
+};
+
+
</ins><span class="cx"> class UserGestureIndicator {
</span><span class="cx">     WTF_MAKE_NONCOPYABLE(UserGestureIndicator);
</span><span class="cx"> public:
</span><del>-    class Token : public RefCounted&lt;Token&gt; {
-    public:
-        virtual ~Token() { }
-    };
-
</del><span class="cx">     static bool processingUserGesture();
</span><span class="cx">     static bool consumeUserGesture();
</span><del>-    static Token* currentToken();
</del><ins>+    static UserGestureToken* currentToken();
</ins><span class="cx"> 
</span><span class="cx">     explicit UserGestureIndicator(ProcessingUserGestureState);
</span><del>-    explicit UserGestureIndicator(PassRefPtr&lt;Token&gt;);
</del><ins>+    explicit UserGestureIndicator(PassRefPtr&lt;UserGestureToken&gt;);
</ins><span class="cx">     ~UserGestureIndicator();
</span><span class="cx"> 
</span><span class="cx"> 
</span><span class="lines">@@ -59,7 +60,7 @@
</span><span class="cx">     static ProcessingUserGestureState s_state;
</span><span class="cx">     static UserGestureIndicator* s_topmostIndicator;
</span><span class="cx">     ProcessingUserGestureState m_previousState;
</span><del>-    RefPtr&lt;Token&gt; m_token;
</del><ins>+    RefPtr&lt;UserGestureToken&gt; m_token;
</ins><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorepageDOMTimerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/DOMTimer.h (144741 => 144742)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -68,7 +68,7 @@
</span><span class="cx">         int m_nestingLevel;
</span><span class="cx">         OwnPtr&lt;ScheduledAction&gt; m_action;
</span><span class="cx">         int m_originalInterval;
</span><del>-        RefPtr&lt;UserGestureIndicator::Token&gt; m_userGestureToken;
</del><ins>+        RefPtr&lt;UserGestureToken&gt; m_userGestureToken;
</ins><span class="cx">     };
</span><span class="cx"> 
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorepageEventHandlerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/EventHandler.h (144741 => 144742)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -452,7 +452,7 @@
</span><span class="cx">     IntPoint m_mouseDownPos; // In our view's coords.
</span><span class="cx">     double m_mouseDownTimestamp;
</span><span class="cx">     PlatformMouseEvent m_mouseDown;
</span><del>-    RefPtr&lt;UserGestureIndicator::Token&gt; m_lastMouseDownUserGestureToken;
</del><ins>+    RefPtr&lt;UserGestureToken&gt; m_lastMouseDownUserGestureToken;
</ins><span class="cx"> 
</span><span class="cx">     RefPtr&lt;Node&gt; m_latchedWheelEventNode;
</span><span class="cx">     bool m_widgetIsLatched;
</span></span></pre>
</div>
</div>

</body>
</html>