<!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>[152238] trunk/Source</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/152238">152238</a></dd>
<dt>Author</dt> <dd>jochen@chromium.org</dd>
<dt>Date</dt> <dd>2013-07-01 12:24:19 -0700 (Mon, 01 Jul 2013)</dd>
</dl>

<h3>Log Message</h3>
<pre>Remove support for consumable user gestures
https://bugs.webkit.org/show_bug.cgi?id=118247

Reviewed by Geoffrey Garen.

Source/WebCore:

The features was not enabled on any port, and is meanwhile broken, so we
should delete it.

No new tests, just deleting dead code.

* accessibility/AccessibilityNodeObject.cpp:
(WebCore::AccessibilityNodeObject::increment):
(WebCore::AccessibilityNodeObject::decrement):
* accessibility/AccessibilityObject.cpp:
(WebCore::AccessibilityObject::press):
* bindings/ScriptControllerBase.cpp:
(WebCore::ScriptController::executeScript):
* bindings/js/ScriptController.cpp:
(WebCore::ScriptController::executeScriptInWorld):
* dom/UserGestureIndicator.cpp:
(WebCore::isDefinite):
(WebCore::UserGestureIndicator::UserGestureIndicator):
(WebCore::UserGestureIndicator::~UserGestureIndicator):
* dom/UserGestureIndicator.h:
(WebCore::UserGestureIndicator::processingUserGesture):
* inspector/InspectorFrontendClientLocal.cpp:
(WebCore::InspectorFrontendClientLocal::openInNewTab):
* inspector/InspectorFrontendHost.cpp:
(WebCore::FrontendMenuProvider::contextMenuItemSelected):
* inspector/InspectorPageAgent.cpp:
(WebCore::InspectorPageAgent::navigate):
* loader/NavigationScheduler.cpp:
(WebCore::ScheduledURLNavigation::fire):
(WebCore::ScheduledURLNavigation::didStartTimer):
(WebCore::ScheduledRedirect::fire):
(WebCore::ScheduledRefresh::fire):
(WebCore::ScheduledHistoryNavigation::fire):
(WebCore::ScheduledFormSubmission::fire):
(WebCore::ScheduledFormSubmission::didStartTimer):
* page/DOMTimer.cpp:
(WebCore::DOMTimer::DOMTimer):
(WebCore::DOMTimer::fired):
* page/DOMTimer.h:
* page/DOMWindow.cpp:
(WebCore::DOMWindow::showModalDialog):
* page/EventHandler.cpp:
(WebCore::EventHandler::clear):
(WebCore::EventHandler::handleMousePressEvent):
(WebCore::EventHandler::handleMouseReleaseEvent):
* page/EventHandler.h:
* rendering/HitTestResult.cpp:
(WebCore::HitTestResult::toggleMediaFullscreenState):
(WebCore::HitTestResult::enterFullscreenForVideo):

Source/WebKit/blackberry:

* WebKitSupport/NotificationManager.cpp:
(BlackBerry::WebKit::NotificationManager::notificationClicked):

Source/WebKit/mac:

* Plugins/Hosted/NetscapePluginInstanceProxy.mm:
(WebKit::NetscapePluginInstanceProxy::evaluate):
* Plugins/WebNetscapePluginView.mm:
(-[WebNetscapePluginView sendEvent:isDrawRect:]):

Source/WebKit/qt:

* WebCoreSupport/NotificationPresenterClientQt.cpp:
(WebCore::NotificationPresenterClientQt::notificationClicked):

Source/WebKit/win:

* WebCoreSupport/WebContextMenuClient.cpp:
(WebContextMenuClient::searchWithGoogle):

Source/WebKit2:

* WebProcess/Notifications/WebNotificationManager.cpp:
(WebKit::WebNotificationManager::didClickNotification):
* WebProcess/Plugins/PluginView.cpp:
(WebKit::PluginView::performFrameLoadURLRequest):
(WebKit::PluginView::evaluate):
* WebProcess/WebCoreSupport/WebContextMenuClient.cpp:
(WebKit::WebContextMenuClient::searchWithGoogle):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityNodeObjectcpp">trunk/Source/WebCore/accessibility/AccessibilityNodeObject.cpp</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityObjectcpp">trunk/Source/WebCore/accessibility/AccessibilityObject.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsScriptControllerBasecpp">trunk/Source/WebCore/bindings/ScriptControllerBase.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsScriptControllercpp">trunk/Source/WebCore/bindings/js/ScriptController.cpp</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="#trunkSourceWebCoreinspectorInspectorFrontendClientLocalcpp">trunk/Source/WebCore/inspector/InspectorFrontendClientLocal.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorFrontendHostcpp">trunk/Source/WebCore/inspector/InspectorFrontendHost.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorPageAgentcpp">trunk/Source/WebCore/inspector/InspectorPageAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderNavigationSchedulercpp">trunk/Source/WebCore/loader/NavigationScheduler.cpp</a></li>
<li><a href="#trunkSourceWebCorepageDOMTimercpp">trunk/Source/WebCore/page/DOMTimer.cpp</a></li>
<li><a href="#trunkSourceWebCorepageDOMTimerh">trunk/Source/WebCore/page/DOMTimer.h</a></li>
<li><a href="#trunkSourceWebCorepageDOMWindowcpp">trunk/Source/WebCore/page/DOMWindow.cpp</a></li>
<li><a href="#trunkSourceWebCorepageEventHandlercpp">trunk/Source/WebCore/page/EventHandler.cpp</a></li>
<li><a href="#trunkSourceWebCorepageEventHandlerh">trunk/Source/WebCore/page/EventHandler.h</a></li>
<li><a href="#trunkSourceWebCorerenderingHitTestResultcpp">trunk/Source/WebCore/rendering/HitTestResult.cpp</a></li>
<li><a href="#trunkSourceWebKitblackberryChangeLog">trunk/Source/WebKit/blackberry/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitblackberryWebKitSupportNotificationManagercpp">trunk/Source/WebKit/blackberry/WebKitSupport/NotificationManager.cpp</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacPluginsHostedNetscapePluginInstanceProxymm">trunk/Source/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.mm</a></li>
<li><a href="#trunkSourceWebKitmacPluginsWebNetscapePluginViewmm">trunk/Source/WebKit/mac/Plugins/WebNetscapePluginView.mm</a></li>
<li><a href="#trunkSourceWebKitqtChangeLog">trunk/Source/WebKit/qt/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitqtWebCoreSupportNotificationPresenterClientQtcpp">trunk/Source/WebKit/qt/WebCoreSupport/NotificationPresenterClientQt.cpp</a></li>
<li><a href="#trunkSourceWebKitwinChangeLog">trunk/Source/WebKit/win/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitwinWebCoreSupportWebContextMenuClientcpp">trunk/Source/WebKit/win/WebCoreSupport/WebContextMenuClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessNotificationsWebNotificationManagercpp">trunk/Source/WebKit2/WebProcess/Notifications/WebNotificationManager.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsPluginViewcpp">trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebContextMenuClientcpp">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebContextMenuClient.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (152237 => 152238)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2013-07-01 19:14:53 UTC (rev 152237)
+++ trunk/Source/WebCore/ChangeLog        2013-07-01 19:24:19 UTC (rev 152238)
</span><span class="lines">@@ -1,3 +1,59 @@
</span><ins>+2013-07-01  Jochen Eisinger  &lt;jochen@chromium.org&gt;
+
+        Remove support for consumable user gestures
+        https://bugs.webkit.org/show_bug.cgi?id=118247
+
+        Reviewed by Geoffrey Garen.
+
+        The features was not enabled on any port, and is meanwhile broken, so we
+        should delete it.
+
+        No new tests, just deleting dead code.
+
+        * accessibility/AccessibilityNodeObject.cpp:
+        (WebCore::AccessibilityNodeObject::increment):
+        (WebCore::AccessibilityNodeObject::decrement):
+        * accessibility/AccessibilityObject.cpp:
+        (WebCore::AccessibilityObject::press):
+        * bindings/ScriptControllerBase.cpp:
+        (WebCore::ScriptController::executeScript):
+        * bindings/js/ScriptController.cpp:
+        (WebCore::ScriptController::executeScriptInWorld):
+        * dom/UserGestureIndicator.cpp:
+        (WebCore::isDefinite):
+        (WebCore::UserGestureIndicator::UserGestureIndicator):
+        (WebCore::UserGestureIndicator::~UserGestureIndicator):
+        * dom/UserGestureIndicator.h:
+        (WebCore::UserGestureIndicator::processingUserGesture):
+        * inspector/InspectorFrontendClientLocal.cpp:
+        (WebCore::InspectorFrontendClientLocal::openInNewTab):
+        * inspector/InspectorFrontendHost.cpp:
+        (WebCore::FrontendMenuProvider::contextMenuItemSelected):
+        * inspector/InspectorPageAgent.cpp:
+        (WebCore::InspectorPageAgent::navigate):
+        * loader/NavigationScheduler.cpp:
+        (WebCore::ScheduledURLNavigation::fire):
+        (WebCore::ScheduledURLNavigation::didStartTimer):
+        (WebCore::ScheduledRedirect::fire):
+        (WebCore::ScheduledRefresh::fire):
+        (WebCore::ScheduledHistoryNavigation::fire):
+        (WebCore::ScheduledFormSubmission::fire):
+        (WebCore::ScheduledFormSubmission::didStartTimer):
+        * page/DOMTimer.cpp:
+        (WebCore::DOMTimer::DOMTimer):
+        (WebCore::DOMTimer::fired):
+        * page/DOMTimer.h:
+        * page/DOMWindow.cpp:
+        (WebCore::DOMWindow::showModalDialog):
+        * page/EventHandler.cpp:
+        (WebCore::EventHandler::clear):
+        (WebCore::EventHandler::handleMousePressEvent):
+        (WebCore::EventHandler::handleMouseReleaseEvent):
+        * page/EventHandler.h:
+        * rendering/HitTestResult.cpp:
+        (WebCore::HitTestResult::toggleMediaFullscreenState):
+        (WebCore::HitTestResult::enterFullscreenForVideo):
+
</ins><span class="cx"> 2013-07-01  Frédéric Wang  &lt;fred.wang@free.fr&gt;
</span><span class="cx"> 
</span><span class="cx">         Add Support for mspace element
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityNodeObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityNodeObject.cpp (152237 => 152238)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityNodeObject.cpp        2013-07-01 19:14:53 UTC (rev 152237)
+++ trunk/Source/WebCore/accessibility/AccessibilityNodeObject.cpp        2013-07-01 19:24:19 UTC (rev 152238)
</span><span class="lines">@@ -1020,13 +1020,13 @@
</span><span class="cx">     
</span><span class="cx"> void AccessibilityNodeObject::increment()
</span><span class="cx"> {
</span><del>-    UserGestureIndicator gestureIndicator(DefinitelyProcessingNewUserGesture);
</del><ins>+    UserGestureIndicator gestureIndicator(DefinitelyProcessingUserGesture);
</ins><span class="cx">     alterSliderValue(true);
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void AccessibilityNodeObject::decrement()
</span><span class="cx"> {
</span><del>-    UserGestureIndicator gestureIndicator(DefinitelyProcessingNewUserGesture);
</del><ins>+    UserGestureIndicator gestureIndicator(DefinitelyProcessingUserGesture);
</ins><span class="cx">     alterSliderValue(false);
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityObject.cpp (152237 => 152238)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityObject.cpp        2013-07-01 19:14:53 UTC (rev 152237)
+++ trunk/Source/WebCore/accessibility/AccessibilityObject.cpp        2013-07-01 19:24:19 UTC (rev 152238)
</span><span class="lines">@@ -580,7 +580,7 @@
</span><span class="cx">     if (Frame* f = actionElem-&gt;document()-&gt;frame())
</span><span class="cx">         f-&gt;loader()-&gt;resetMultipleFormSubmissionProtection();
</span><span class="cx">     
</span><del>-    UserGestureIndicator gestureIndicator(DefinitelyProcessingNewUserGesture);
</del><ins>+    UserGestureIndicator gestureIndicator(DefinitelyProcessingUserGesture);
</ins><span class="cx">     actionElem-&gt;accessKeyAction(true);
</span><span class="cx">     return true;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsScriptControllerBasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/ScriptControllerBase.cpp (152237 => 152238)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/ScriptControllerBase.cpp        2013-07-01 19:14:53 UTC (rev 152237)
+++ trunk/Source/WebCore/bindings/ScriptControllerBase.cpp        2013-07-01 19:24:19 UTC (rev 152238)
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx"> 
</span><span class="cx"> ScriptValue ScriptController::executeScript(const String&amp; script, bool forceUserGesture)
</span><span class="cx"> {
</span><del>-    UserGestureIndicator gestureIndicator(forceUserGesture ? DefinitelyProcessingNewUserGesture : PossiblyProcessingUserGesture);
</del><ins>+    UserGestureIndicator gestureIndicator(forceUserGesture ? DefinitelyProcessingUserGesture : PossiblyProcessingUserGesture);
</ins><span class="cx">     return executeScript(ScriptSourceCode(script, m_frame-&gt;document()-&gt;url()));
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsScriptControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/ScriptController.cpp (152237 => 152238)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/ScriptController.cpp        2013-07-01 19:14:53 UTC (rev 152237)
+++ trunk/Source/WebCore/bindings/js/ScriptController.cpp        2013-07-01 19:24:19 UTC (rev 152238)
</span><span class="lines">@@ -457,7 +457,7 @@
</span><span class="cx"> 
</span><span class="cx"> ScriptValue ScriptController::executeScriptInWorld(DOMWrapperWorld* world, const String&amp; script, bool forceUserGesture)
</span><span class="cx"> {
</span><del>-    UserGestureIndicator gestureIndicator(forceUserGesture ? DefinitelyProcessingNewUserGesture : PossiblyProcessingUserGesture);
</del><ins>+    UserGestureIndicator gestureIndicator(forceUserGesture ? DefinitelyProcessingUserGesture : PossiblyProcessingUserGesture);
</ins><span class="cx">     ScriptSourceCode sourceCode(script, m_frame-&gt;document()-&gt;url());
</span><span class="cx"> 
</span><span class="cx">     if (!canExecuteScripts(AboutToExecuteScript) || isPaused())
</span></span></pre></div>
<a id="trunkSourceWebCoredomUserGestureIndicatorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/UserGestureIndicator.cpp (152237 => 152238)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/UserGestureIndicator.cpp        2013-07-01 19:14:53 UTC (rev 152237)
+++ trunk/Source/WebCore/dom/UserGestureIndicator.cpp        2013-07-01 19:24:19 UTC (rev 152238)
</span><span class="lines">@@ -28,120 +28,26 @@
</span><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span><del>-namespace {
-
-class GestureToken : public UserGestureToken {
-public:
-    static PassRefPtr&lt;UserGestureToken&gt; create() { return adoptRef(new GestureToken); }
-
-    virtual ~GestureToken() { }
-    virtual bool hasGestures() const OVERRIDE { return m_consumableGestures &gt; 0; }
-
-    void addGesture() { m_consumableGestures++; }
-    bool consumeGesture()
-    {
-        if (!m_consumableGestures)
-            return false;
-        m_consumableGestures--;
-        return true;
-    }
-
-private:
-    GestureToken()
-        : m_consumableGestures(0)
-    {
-    }
-
-    size_t m_consumableGestures;
-};
-
-}
-
</del><span class="cx"> static bool isDefinite(ProcessingUserGestureState state)
</span><span class="cx"> {
</span><del>-    return state == DefinitelyProcessingNewUserGesture || state == DefinitelyProcessingUserGesture || state == DefinitelyNotProcessingUserGesture;
</del><ins>+    return state == DefinitelyProcessingUserGesture || state == DefinitelyNotProcessingUserGesture;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> ProcessingUserGestureState UserGestureIndicator::s_state = DefinitelyNotProcessingUserGesture;
</span><del>-UserGestureIndicator* UserGestureIndicator::s_topmostIndicator = 0;
</del><span class="cx"> 
</span><span class="cx"> UserGestureIndicator::UserGestureIndicator(ProcessingUserGestureState state)
</span><span class="cx">     : m_previousState(s_state)
</span><span class="cx"> {
</span><span class="cx">     // We overwrite s_state only if the caller is definite about the gesture state.
</span><del>-    if (isDefinite(state)) {
-        if (!s_topmostIndicator) {
-            s_topmostIndicator = this;
-            m_token = GestureToken::create();
-        } else
-            m_token = s_topmostIndicator-&gt;currentToken();
</del><ins>+    if (isDefinite(state))
</ins><span class="cx">         s_state = state;
</span><del>-    }
-
-    if (state == DefinitelyProcessingNewUserGesture)
-        static_cast&lt;GestureToken*&gt;(m_token.get())-&gt;addGesture();
-    else if (state == DefinitelyProcessingUserGesture &amp;&amp; s_topmostIndicator == this)
-        static_cast&lt;GestureToken*&gt;(m_token.get())-&gt;addGesture();
</del><span class="cx">     ASSERT(isDefinite(s_state));
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-UserGestureIndicator::UserGestureIndicator(PassRefPtr&lt;UserGestureToken&gt; token)
-    : m_previousState(s_state)
-{
-    if (token &amp;&amp; static_cast&lt;GestureToken*&gt;(token.get())-&gt;hasGestures()) {
-        if (!s_topmostIndicator) {
-            s_topmostIndicator = this;
-            m_token = token;
-        } else {
-            m_token = s_topmostIndicator-&gt;currentToken();
-            static_cast&lt;GestureToken*&gt;(m_token.get())-&gt;addGesture();
-            static_cast&lt;GestureToken*&gt;(token.get())-&gt;consumeGesture();
-        }
-        s_state = DefinitelyProcessingUserGesture;
-    }
-
-    ASSERT(isDefinite(s_state));
-}
-
</del><span class="cx"> UserGestureIndicator::~UserGestureIndicator()
</span><span class="cx"> {
</span><span class="cx">     s_state = m_previousState;
</span><del>-    if (s_topmostIndicator == this)
-        s_topmostIndicator = 0;
</del><span class="cx">     ASSERT(isDefinite(s_state));
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-bool UserGestureIndicator::processingUserGesture()
-{
-    return s_topmostIndicator &amp;&amp; static_cast&lt;GestureToken*&gt;(s_topmostIndicator-&gt;currentToken())-&gt;hasGestures() &amp;&amp; (s_state == DefinitelyProcessingNewUserGesture || s_state == DefinitelyProcessingUserGesture);
</del><span class="cx"> }
</span><del>-
-bool UserGestureIndicator::consumeUserGesture()
-{
-    if (!s_topmostIndicator)
-        return false;
-    return static_cast&lt;GestureToken*&gt;(s_topmostIndicator-&gt;currentToken())-&gt;consumeGesture();
-}
-
-UserGestureToken* UserGestureIndicator::currentToken()
-{
-    if (!s_topmostIndicator)
-        return 0;
-    return s_topmostIndicator-&gt;m_token.get();
-}
-
-UserGestureIndicatorDisabler::UserGestureIndicatorDisabler()
-    : m_savedState(UserGestureIndicator::s_state)
-    , m_savedIndicator(UserGestureIndicator::s_topmostIndicator)
-{
-    UserGestureIndicator::s_state = DefinitelyNotProcessingUserGesture;
-    UserGestureIndicator::s_topmostIndicator = 0;
-}
-
-UserGestureIndicatorDisabler::~UserGestureIndicatorDisabler()
-{
-    UserGestureIndicator::s_state = m_savedState;
-    UserGestureIndicator::s_topmostIndicator = m_savedIndicator;
-}
-
-}
</del></span></pre></div>
<a id="trunkSourceWebCoredomUserGestureIndicatorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/UserGestureIndicator.h (152237 => 152238)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/UserGestureIndicator.h        2013-07-01 19:14:53 UTC (rev 152237)
+++ trunk/Source/WebCore/dom/UserGestureIndicator.h        2013-07-01 19:24:19 UTC (rev 152238)
</span><span class="lines">@@ -27,55 +27,27 @@
</span><span class="cx"> #define UserGestureIndicator_h
</span><span class="cx"> 
</span><span class="cx"> #include &lt;wtf/Noncopyable.h&gt;
</span><del>-#include &lt;wtf/RefCounted.h&gt;
-#include &lt;wtf/RefPtr.h&gt;
</del><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span><del>-class UserGestureIndicator;
-
</del><span class="cx"> enum ProcessingUserGestureState {
</span><del>-    DefinitelyProcessingNewUserGesture,
</del><span class="cx">     DefinitelyProcessingUserGesture,
</span><span class="cx">     PossiblyProcessingUserGesture,
</span><span class="cx">     DefinitelyNotProcessingUserGesture
</span><span class="cx"> };
</span><span class="cx"> 
</span><del>-class UserGestureToken : public RefCounted&lt;UserGestureToken&gt; {
-public:
-    virtual ~UserGestureToken() { }
-    virtual bool hasGestures() const = 0;
-};
-
-class UserGestureIndicatorDisabler {
-    WTF_MAKE_NONCOPYABLE(UserGestureIndicatorDisabler);
-public:
-    UserGestureIndicatorDisabler();
-    ~UserGestureIndicatorDisabler();
-
-private:
-    ProcessingUserGestureState m_savedState;
-    UserGestureIndicator* m_savedIndicator;
-};
-
</del><span class="cx"> class UserGestureIndicator {
</span><span class="cx">     WTF_MAKE_NONCOPYABLE(UserGestureIndicator);
</span><del>-    friend class UserGestureIndicatorDisabler;
</del><span class="cx"> public:
</span><del>-    static bool processingUserGesture();
-    static bool consumeUserGesture();
-    static UserGestureToken* currentToken();
</del><ins>+    static bool processingUserGesture() { return s_state == DefinitelyProcessingUserGesture; }
</ins><span class="cx"> 
</span><span class="cx">     explicit UserGestureIndicator(ProcessingUserGestureState);
</span><del>-    explicit UserGestureIndicator(PassRefPtr&lt;UserGestureToken&gt;);
</del><span class="cx">     ~UserGestureIndicator();
</span><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx"> private:
</span><span class="cx">     static ProcessingUserGestureState s_state;
</span><del>-    static UserGestureIndicator* s_topmostIndicator;
</del><span class="cx">     ProcessingUserGestureState m_previousState;
</span><del>-    RefPtr&lt;UserGestureToken&gt; m_token;
</del><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorFrontendClientLocalcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorFrontendClientLocal.cpp (152237 => 152238)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorFrontendClientLocal.cpp        2013-07-01 19:14:53 UTC (rev 152237)
+++ trunk/Source/WebCore/inspector/InspectorFrontendClientLocal.cpp        2013-07-01 19:24:19 UTC (rev 152238)
</span><span class="lines">@@ -208,7 +208,7 @@
</span><span class="cx"> 
</span><span class="cx"> void InspectorFrontendClientLocal::openInNewTab(const String&amp; url)
</span><span class="cx"> {
</span><del>-    UserGestureIndicator indicator(DefinitelyProcessingNewUserGesture);
</del><ins>+    UserGestureIndicator indicator(DefinitelyProcessingUserGesture);
</ins><span class="cx">     Page* page = m_inspectorController-&gt;inspectedPage();
</span><span class="cx">     Frame* mainFrame = page-&gt;mainFrame();
</span><span class="cx">     FrameLoadRequest request(mainFrame-&gt;document()-&gt;securityOrigin(), ResourceRequest(), &quot;_blank&quot;);
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorFrontendHostcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorFrontendHost.cpp (152237 => 152238)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorFrontendHost.cpp        2013-07-01 19:14:53 UTC (rev 152237)
+++ trunk/Source/WebCore/inspector/InspectorFrontendHost.cpp        2013-07-01 19:24:19 UTC (rev 152238)
</span><span class="lines">@@ -94,7 +94,7 @@
</span><span class="cx">     virtual void contextMenuItemSelected(ContextMenuItem* item)
</span><span class="cx">     {
</span><span class="cx">         if (m_frontendHost) {
</span><del>-            UserGestureIndicator gestureIndicator(DefinitelyProcessingNewUserGesture);
</del><ins>+            UserGestureIndicator gestureIndicator(DefinitelyProcessingUserGesture);
</ins><span class="cx">             int itemNumber = item-&gt;action() - ContextMenuItemBaseCustomTag;
</span><span class="cx"> 
</span><span class="cx">             ScriptFunctionCall function(m_frontendApiObject, &quot;contextMenuItemSelected&quot;);
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorPageAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorPageAgent.cpp (152237 => 152238)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorPageAgent.cpp        2013-07-01 19:14:53 UTC (rev 152237)
+++ trunk/Source/WebCore/inspector/InspectorPageAgent.cpp        2013-07-01 19:24:19 UTC (rev 152238)
</span><span class="lines">@@ -499,7 +499,7 @@
</span><span class="cx"> 
</span><span class="cx"> void InspectorPageAgent::navigate(ErrorString*, const String&amp; url)
</span><span class="cx"> {
</span><del>-    UserGestureIndicator indicator(DefinitelyProcessingNewUserGesture);
</del><ins>+    UserGestureIndicator indicator(DefinitelyProcessingUserGesture);
</ins><span class="cx">     Frame* frame = m_page-&gt;mainFrame();
</span><span class="cx">     frame-&gt;loader()-&gt;changeLocation(frame-&gt;document()-&gt;securityOrigin(), frame-&gt;document()-&gt;completeURL(url), &quot;&quot;, false, false);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderNavigationSchedulercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/NavigationScheduler.cpp (152237 => 152238)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/NavigationScheduler.cpp        2013-07-01 19:14:53 UTC (rev 152237)
+++ trunk/Source/WebCore/loader/NavigationScheduler.cpp        2013-07-01 19:24:19 UTC (rev 152238)
</span><span class="lines">@@ -107,7 +107,7 @@
</span><span class="cx"> 
</span><span class="cx">     virtual void fire(Frame* frame)
</span><span class="cx">     {
</span><del>-        UserGestureIndicator gestureIndicator(wasUserGesture() ? DefinitelyProcessingNewUserGesture : DefinitelyNotProcessingUserGesture);
</del><ins>+        UserGestureIndicator gestureIndicator(wasUserGesture() ? DefinitelyProcessingUserGesture : DefinitelyNotProcessingUserGesture);
</ins><span class="cx">         frame-&gt;loader()-&gt;changeLocation(m_securityOrigin.get(), KURL(ParsedURLString, m_url), m_referrer, lockHistory(), lockBackForwardList(), false);
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="lines">@@ -117,7 +117,7 @@
</span><span class="cx">             return;
</span><span class="cx">         m_haveToldClient = true;
</span><span class="cx"> 
</span><del>-        UserGestureIndicator gestureIndicator(wasUserGesture() ? DefinitelyProcessingNewUserGesture : DefinitelyNotProcessingUserGesture);
</del><ins>+        UserGestureIndicator gestureIndicator(wasUserGesture() ? DefinitelyProcessingUserGesture : DefinitelyNotProcessingUserGesture);
</ins><span class="cx">         frame-&gt;loader()-&gt;clientRedirected(KURL(ParsedURLString, m_url), delay(), currentTime() + timer-&gt;nextFireInterval(), lockBackForwardList());
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="lines">@@ -158,7 +158,7 @@
</span><span class="cx"> 
</span><span class="cx">     virtual void fire(Frame* frame)
</span><span class="cx">     {
</span><del>-        UserGestureIndicator gestureIndicator(wasUserGesture() ? DefinitelyProcessingNewUserGesture : DefinitelyNotProcessingUserGesture);
</del><ins>+        UserGestureIndicator gestureIndicator(wasUserGesture() ? DefinitelyProcessingUserGesture : DefinitelyNotProcessingUserGesture);
</ins><span class="cx">         bool refresh = equalIgnoringFragmentIdentifier(frame-&gt;document()-&gt;url(), KURL(ParsedURLString, url()));
</span><span class="cx">         frame-&gt;loader()-&gt;changeLocation(securityOrigin(), KURL(ParsedURLString, url()), referrer(), lockHistory(), lockBackForwardList(), refresh);
</span><span class="cx">     }
</span><span class="lines">@@ -179,7 +179,7 @@
</span><span class="cx"> 
</span><span class="cx">     virtual void fire(Frame* frame)
</span><span class="cx">     {
</span><del>-        UserGestureIndicator gestureIndicator(wasUserGesture() ? DefinitelyProcessingNewUserGesture : DefinitelyNotProcessingUserGesture);
</del><ins>+        UserGestureIndicator gestureIndicator(wasUserGesture() ? DefinitelyProcessingUserGesture : DefinitelyNotProcessingUserGesture);
</ins><span class="cx">         frame-&gt;loader()-&gt;changeLocation(securityOrigin(), KURL(ParsedURLString, url()), referrer(), lockHistory(), lockBackForwardList(), true);
</span><span class="cx">     }
</span><span class="cx"> };
</span><span class="lines">@@ -194,7 +194,7 @@
</span><span class="cx"> 
</span><span class="cx">     virtual void fire(Frame* frame)
</span><span class="cx">     {
</span><del>-        UserGestureIndicator gestureIndicator(wasUserGesture() ? DefinitelyProcessingNewUserGesture : DefinitelyNotProcessingUserGesture);
</del><ins>+        UserGestureIndicator gestureIndicator(wasUserGesture() ? DefinitelyProcessingUserGesture : DefinitelyNotProcessingUserGesture);
</ins><span class="cx"> 
</span><span class="cx">         if (!m_historySteps) {
</span><span class="cx">             // Special case for go(0) from a frame -&gt; reload only the frame
</span><span class="lines">@@ -223,7 +223,7 @@
</span><span class="cx"> 
</span><span class="cx">     virtual void fire(Frame* frame)
</span><span class="cx">     {
</span><del>-        UserGestureIndicator gestureIndicator(wasUserGesture() ? DefinitelyProcessingNewUserGesture : DefinitelyNotProcessingUserGesture);
</del><ins>+        UserGestureIndicator gestureIndicator(wasUserGesture() ? DefinitelyProcessingUserGesture : DefinitelyNotProcessingUserGesture);
</ins><span class="cx"> 
</span><span class="cx">         // The submitForm function will find a target frame before using the redirection timer.
</span><span class="cx">         // Now that the timer has fired, we need to repeat the security check which normally is done when
</span><span class="lines">@@ -243,7 +243,7 @@
</span><span class="cx">             return;
</span><span class="cx">         m_haveToldClient = true;
</span><span class="cx"> 
</span><del>-        UserGestureIndicator gestureIndicator(wasUserGesture() ? DefinitelyProcessingNewUserGesture : DefinitelyNotProcessingUserGesture);
</del><ins>+        UserGestureIndicator gestureIndicator(wasUserGesture() ? DefinitelyProcessingUserGesture : DefinitelyNotProcessingUserGesture);
</ins><span class="cx">         frame-&gt;loader()-&gt;clientRedirected(m_submission-&gt;requestURL(), delay(), currentTime() + timer-&gt;nextFireInterval(), lockBackForwardList());
</span><span class="cx">     }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorepageDOMTimercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/DOMTimer.cpp (152237 => 152238)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DOMTimer.cpp        2013-07-01 19:14:53 UTC (rev 152237)
+++ trunk/Source/WebCore/page/DOMTimer.cpp        2013-07-01 19:24:19 UTC (rev 152238)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx"> #include &quot;InspectorInstrumentation.h&quot;
</span><span class="cx"> #include &quot;ScheduledAction.h&quot;
</span><span class="cx"> #include &quot;ScriptExecutionContext.h&quot;
</span><ins>+#include &quot;UserGestureIndicator.h&quot;
</ins><span class="cx"> #include &lt;wtf/CurrentTime.h&gt;
</span><span class="cx"> #include &lt;wtf/HashSet.h&gt;
</span><span class="cx"> #include &lt;wtf/StdLibExtras.h&gt;
</span><span class="lines">@@ -56,10 +57,8 @@
</span><span class="cx">     , m_nestingLevel(timerNestingLevel + 1)
</span><span class="cx">     , m_action(action)
</span><span class="cx">     , m_originalInterval(interval)
</span><ins>+    , m_shouldForwardUserGesture(shouldForwardUserGesture(interval, m_nestingLevel))
</ins><span class="cx"> {
</span><del>-    if (shouldForwardUserGesture(interval, m_nestingLevel))
-        m_userGestureToken = UserGestureIndicator::currentToken();
-
</del><span class="cx">     // Keep asking for the next id until we're given one that we don't already have.
</span><span class="cx">     do {
</span><span class="cx">         m_timeoutId = context-&gt;circularSequentialID();
</span><span class="lines">@@ -109,8 +108,9 @@
</span><span class="cx">     ScriptExecutionContext* context = scriptExecutionContext();
</span><span class="cx">     timerNestingLevel = m_nestingLevel;
</span><span class="cx">     ASSERT(!context-&gt;activeDOMObjectsAreSuspended());
</span><ins>+    UserGestureIndicator gestureIndicator(m_shouldForwardUserGesture ? DefinitelyProcessingUserGesture : PossiblyProcessingUserGesture);
</ins><span class="cx">     // Only the first execution of a multi-shot timer should get an affirmative user gesture indicator.
</span><del>-    UserGestureIndicator gestureIndicator(m_userGestureToken.release());
</del><ins>+    m_shouldForwardUserGesture = false;
</ins><span class="cx"> 
</span><span class="cx">     InspectorInstrumentationCookie cookie = InspectorInstrumentation::willFireTimer(context, m_timeoutId);
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorepageDOMTimerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/DOMTimer.h (152237 => 152238)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DOMTimer.h        2013-07-01 19:14:53 UTC (rev 152237)
+++ trunk/Source/WebCore/page/DOMTimer.h        2013-07-01 19:24:19 UTC (rev 152238)
</span><span class="lines">@@ -28,7 +28,6 @@
</span><span class="cx"> #define DOMTimer_h
</span><span class="cx"> 
</span><span class="cx"> #include &quot;SuspendableTimer.h&quot;
</span><del>-#include &quot;UserGestureIndicator.h&quot;
</del><span class="cx"> #include &lt;wtf/OwnPtr.h&gt;
</span><span class="cx"> #include &lt;wtf/PassOwnPtr.h&gt;
</span><span class="cx"> 
</span><span class="lines">@@ -66,7 +65,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;UserGestureToken&gt; m_userGestureToken;
</del><ins>+        bool m_shouldForwardUserGesture;
</ins><span class="cx">     };
</span><span class="cx"> 
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorepageDOMWindowcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/DOMWindow.cpp (152237 => 152238)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DOMWindow.cpp        2013-07-01 19:14:53 UTC (rev 152237)
+++ trunk/Source/WebCore/page/DOMWindow.cpp        2013-07-01 19:24:19 UTC (rev 152238)
</span><span class="lines">@@ -2002,7 +2002,6 @@
</span><span class="cx">         activeWindow, firstFrame, m_frame, function, functionContext);
</span><span class="cx">     if (!dialogFrame)
</span><span class="cx">         return;
</span><del>-    UserGestureIndicatorDisabler disabler;
</del><span class="cx">     dialogFrame-&gt;page()-&gt;chrome().runModal();
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorepageEventHandlercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/EventHandler.cpp (152237 => 152238)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/EventHandler.cpp        2013-07-01 19:14:53 UTC (rev 152237)
+++ trunk/Source/WebCore/page/EventHandler.cpp        2013-07-01 19:24:19 UTC (rev 152238)
</span><span class="lines">@@ -82,6 +82,7 @@
</span><span class="cx"> #include &quot;StyleCachedImage.h&quot;
</span><span class="cx"> #include &quot;TextEvent.h&quot;
</span><span class="cx"> #include &quot;TextIterator.h&quot;
</span><ins>+#include &quot;UserGestureIndicator.h&quot;
</ins><span class="cx"> #include &quot;UserTypingGestureIndicator.h&quot;
</span><span class="cx"> #include &quot;WheelEvent.h&quot;
</span><span class="cx"> #include &quot;WindowsKeyboardCodes.h&quot;
</span><span class="lines">@@ -397,7 +398,6 @@
</span><span class="cx">     m_mousePositionIsUnknown = true;
</span><span class="cx">     m_lastKnownMousePosition = IntPoint();
</span><span class="cx">     m_lastKnownMouseGlobalPosition = IntPoint();
</span><del>-    m_lastMouseDownUserGestureToken.clear();
</del><span class="cx">     m_mousePressNode = 0;
</span><span class="cx">     m_mousePressed = false;
</span><span class="cx">     m_capturesDragging = false;
</span><span class="lines">@@ -1514,7 +1514,6 @@
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx">     UserGestureIndicator gestureIndicator(DefinitelyProcessingUserGesture);
</span><del>-    m_lastMouseDownUserGestureToken = gestureIndicator.currentToken();
</del><span class="cx"> 
</span><span class="cx">     // FIXME (bug 68185): this call should be made at another abstraction layer
</span><span class="cx">     m_frame-&gt;loader()-&gt;resetMultipleFormSubmissionProtection();
</span><span class="lines">@@ -1880,13 +1879,8 @@
</span><span class="cx">         return true;
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-    OwnPtr&lt;UserGestureIndicator&gt; gestureIndicator;
</del><ins>+    UserGestureIndicator gestureIndicator(DefinitelyProcessingUserGesture);
</ins><span class="cx"> 
</span><del>-    if (m_lastMouseDownUserGestureToken)
-        gestureIndicator = adoptPtr(new UserGestureIndicator(m_lastMouseDownUserGestureToken.release()));
-    else
-        gestureIndicator = adoptPtr(new UserGestureIndicator(DefinitelyProcessingUserGesture));
-
</del><span class="cx"> #if ENABLE(PAN_SCROLLING)
</span><span class="cx">     m_autoscrollController-&gt;handleMouseReleaseEvent(mouseEvent);
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorepageEventHandlerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/EventHandler.h (152237 => 152238)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/EventHandler.h        2013-07-01 19:14:53 UTC (rev 152237)
+++ trunk/Source/WebCore/page/EventHandler.h        2013-07-01 19:24:19 UTC (rev 152238)
</span><span class="lines">@@ -37,7 +37,6 @@
</span><span class="cx"> #include &quot;TextEventInputType.h&quot;
</span><span class="cx"> #include &quot;TextGranularity.h&quot;
</span><span class="cx"> #include &quot;Timer.h&quot;
</span><del>-#include &quot;UserGestureIndicator.h&quot;
</del><span class="cx"> #include &lt;wtf/Forward.h&gt;
</span><span class="cx"> #include &lt;wtf/OwnPtr.h&gt;
</span><span class="cx"> #include &lt;wtf/RefPtr.h&gt;
</span><span class="lines">@@ -464,7 +463,6 @@
</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;UserGestureToken&gt; m_lastMouseDownUserGestureToken;
</del><span class="cx"> 
</span><span class="cx">     RefPtr&lt;Node&gt; m_latchedWheelEventNode;
</span><span class="cx">     bool m_widgetIsLatched;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingHitTestResultcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/HitTestResult.cpp (152237 => 152238)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/HitTestResult.cpp        2013-07-01 19:14:53 UTC (rev 152237)
+++ trunk/Source/WebCore/rendering/HitTestResult.cpp        2013-07-01 19:24:19 UTC (rev 152238)
</span><span class="lines">@@ -416,7 +416,7 @@
</span><span class="cx"> #if ENABLE(VIDEO)
</span><span class="cx">     if (HTMLMediaElement* mediaElement = this-&gt;mediaElement()) {
</span><span class="cx">         if (mediaElement-&gt;isVideo() &amp;&amp; mediaElement-&gt;supportsFullscreen()) {
</span><del>-            UserGestureIndicator indicator(DefinitelyProcessingNewUserGesture);
</del><ins>+            UserGestureIndicator indicator(DefinitelyProcessingUserGesture);
</ins><span class="cx">             mediaElement-&gt;toggleFullscreenState();
</span><span class="cx">         }
</span><span class="cx">     }
</span><span class="lines">@@ -430,7 +430,7 @@
</span><span class="cx">     if (mediaElt &amp;&amp; mediaElt-&gt;hasTagName(HTMLNames::videoTag)) {
</span><span class="cx">         HTMLVideoElement* videoElt = static_cast&lt;HTMLVideoElement*&gt;(mediaElt);
</span><span class="cx">         if (!videoElt-&gt;isFullscreen() &amp;&amp; mediaElt-&gt;supportsFullscreen()) {
</span><del>-            UserGestureIndicator indicator(DefinitelyProcessingNewUserGesture);
</del><ins>+            UserGestureIndicator indicator(DefinitelyProcessingUserGesture);
</ins><span class="cx">             videoElt-&gt;enterFullscreen();
</span><span class="cx">         }
</span><span class="cx">     }
</span></span></pre></div>
<a id="trunkSourceWebKitblackberryChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/blackberry/ChangeLog (152237 => 152238)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/blackberry/ChangeLog        2013-07-01 19:14:53 UTC (rev 152237)
+++ trunk/Source/WebKit/blackberry/ChangeLog        2013-07-01 19:24:19 UTC (rev 152238)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2013-07-01  Jochen Eisinger  &lt;jochen@chromium.org&gt;
+
+        Remove support for consumable user gestures
+        https://bugs.webkit.org/show_bug.cgi?id=118247
+
+        Reviewed by Geoffrey Garen.
+
+        * WebKitSupport/NotificationManager.cpp:
+        (BlackBerry::WebKit::NotificationManager::notificationClicked):
+
</ins><span class="cx"> 2013-07-01  Kangil Han  &lt;kangil.han@samsung.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Adopt toHTMLTextAreaElement for code cleanup
</span></span></pre></div>
<a id="trunkSourceWebKitblackberryWebKitSupportNotificationManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/blackberry/WebKitSupport/NotificationManager.cpp (152237 => 152238)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/blackberry/WebKitSupport/NotificationManager.cpp        2013-07-01 19:14:53 UTC (rev 152237)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/NotificationManager.cpp        2013-07-01 19:24:19 UTC (rev 152238)
</span><span class="lines">@@ -180,7 +180,7 @@
</span><span class="cx">         return;
</span><span class="cx"> 
</span><span class="cx">     // Indicate that this event is being dispatched in reaction to a user's interaction with a platform notification.
</span><del>-    UserGestureIndicator indicator(DefinitelyProcessingNewUserGesture);
</del><ins>+    UserGestureIndicator indicator(DefinitelyProcessingUserGesture);
</ins><span class="cx">     notification-&gt;dispatchClickEvent();
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (152237 => 152238)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog        2013-07-01 19:14:53 UTC (rev 152237)
+++ trunk/Source/WebKit/mac/ChangeLog        2013-07-01 19:24:19 UTC (rev 152238)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2013-07-01  Jochen Eisinger  &lt;jochen@chromium.org&gt;
+
+        Remove support for consumable user gestures
+        https://bugs.webkit.org/show_bug.cgi?id=118247
+
+        Reviewed by Geoffrey Garen.
+
+        * Plugins/Hosted/NetscapePluginInstanceProxy.mm:
+        (WebKit::NetscapePluginInstanceProxy::evaluate):
+        * Plugins/WebNetscapePluginView.mm:
+        (-[WebNetscapePluginView sendEvent:isDrawRect:]):
+
</ins><span class="cx"> 2013-06-27  Jer Noble  &lt;jer.noble@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Audio in apps which embed WebViews is corrupted.
</span></span></pre></div>
<a id="trunkSourceWebKitmacPluginsHostedNetscapePluginInstanceProxymm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.mm (152237 => 152238)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.mm        2013-07-01 19:14:53 UTC (rev 152237)
+++ trunk/Source/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.mm        2013-07-01 19:24:19 UTC (rev 152238)
</span><span class="lines">@@ -873,7 +873,7 @@
</span><span class="cx">     Strong&lt;JSGlobalObject&gt; globalObject(*pluginWorld()-&gt;vm(), frame-&gt;script()-&gt;globalObject(pluginWorld()));
</span><span class="cx">     ExecState* exec = globalObject-&gt;globalExec();
</span><span class="cx"> 
</span><del>-    UserGestureIndicator gestureIndicator(allowPopups ? DefinitelyProcessingNewUserGesture : PossiblyProcessingUserGesture);
</del><ins>+    UserGestureIndicator gestureIndicator(allowPopups ? DefinitelyProcessingUserGesture : PossiblyProcessingUserGesture);
</ins><span class="cx">     
</span><span class="cx">     JSValue result = JSC::evaluate(exec, makeSource(script));
</span><span class="cx">     
</span></span></pre></div>
<a id="trunkSourceWebKitmacPluginsWebNetscapePluginViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Plugins/WebNetscapePluginView.mm (152237 => 152238)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Plugins/WebNetscapePluginView.mm        2013-07-01 19:14:53 UTC (rev 152237)
+++ trunk/Source/WebKit/mac/Plugins/WebNetscapePluginView.mm        2013-07-01 19:24:19 UTC (rev 152238)
</span><span class="lines">@@ -669,7 +669,7 @@
</span><span class="cx">     ASSERT(_eventHandler);
</span><span class="cx">     {
</span><span class="cx">         JSC::JSLock::DropAllLocks dropAllLocks(JSDOMWindowBase::commonVM());
</span><del>-        UserGestureIndicator gestureIndicator(_eventHandler-&gt;currentEventIsUserGesture() ? DefinitelyProcessingNewUserGesture : PossiblyProcessingUserGesture);
</del><ins>+        UserGestureIndicator gestureIndicator(_eventHandler-&gt;currentEventIsUserGesture() ? DefinitelyProcessingUserGesture : PossiblyProcessingUserGesture);
</ins><span class="cx">         acceptedEvent = [_pluginPackage.get() pluginFuncs]-&gt;event(plugin, event);
</span><span class="cx">     }
</span><span class="cx">     [self didCallPlugInFunction];
</span></span></pre></div>
<a id="trunkSourceWebKitqtChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/qt/ChangeLog (152237 => 152238)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/qt/ChangeLog        2013-07-01 19:14:53 UTC (rev 152237)
+++ trunk/Source/WebKit/qt/ChangeLog        2013-07-01 19:24:19 UTC (rev 152238)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2013-07-01  Jochen Eisinger  &lt;jochen@chromium.org&gt;
+
+        Remove support for consumable user gestures
+        https://bugs.webkit.org/show_bug.cgi?id=118247
+
+        Reviewed by Geoffrey Garen.
+
+        * WebCoreSupport/NotificationPresenterClientQt.cpp:
+        (WebCore::NotificationPresenterClientQt::notificationClicked):
+
</ins><span class="cx"> 2013-06-27  Kangil Han  &lt;kangil.han@samsung.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Adopt is/toHTMLInputElement for code cleanup
</span></span></pre></div>
<a id="trunkSourceWebKitqtWebCoreSupportNotificationPresenterClientQtcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/qt/WebCoreSupport/NotificationPresenterClientQt.cpp (152237 => 152238)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/qt/WebCoreSupport/NotificationPresenterClientQt.cpp        2013-07-01 19:14:53 UTC (rev 152237)
+++ trunk/Source/WebKit/qt/WebCoreSupport/NotificationPresenterClientQt.cpp        2013-07-01 19:24:19 UTC (rev 152238)
</span><span class="lines">@@ -244,7 +244,7 @@
</span><span class="cx">     Notification* notification =  notificationForWrapper(wrapper);
</span><span class="cx">     if (notification) {
</span><span class="cx">         // Make sure clicks on notifications are treated as user gestures.
</span><del>-        UserGestureIndicator gestureIndicator(DefinitelyProcessingNewUserGesture);
</del><ins>+        UserGestureIndicator gestureIndicator(DefinitelyProcessingUserGesture);
</ins><span class="cx">         sendEvent(notification, eventNames().clickEvent);
</span><span class="cx">     }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKitwinChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/ChangeLog (152237 => 152238)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/ChangeLog        2013-07-01 19:14:53 UTC (rev 152237)
+++ trunk/Source/WebKit/win/ChangeLog        2013-07-01 19:24:19 UTC (rev 152238)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2013-07-01  Jochen Eisinger  &lt;jochen@chromium.org&gt;
+
+        Remove support for consumable user gestures
+        https://bugs.webkit.org/show_bug.cgi?id=118247
+
+        Reviewed by Geoffrey Garen.
+
+        * WebCoreSupport/WebContextMenuClient.cpp:
+        (WebContextMenuClient::searchWithGoogle):
+
</ins><span class="cx"> 2013-07-01  peavo@outlook.com  &lt;peavo@outlook.com&gt;
</span><span class="cx"> 
</span><span class="cx">         [Curl] WebDownload init method is not implemented.
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebCoreSupportWebContextMenuClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebCoreSupport/WebContextMenuClient.cpp (152237 => 152238)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebCoreSupport/WebContextMenuClient.cpp        2013-07-01 19:14:53 UTC (rev 152237)
+++ trunk/Source/WebKit/win/WebCoreSupport/WebContextMenuClient.cpp        2013-07-01 19:24:19 UTC (rev 152238)
</span><span class="lines">@@ -121,7 +121,7 @@
</span><span class="cx">     url.append(&quot;&amp;ie=UTF-8&amp;oe=UTF-8&quot;);
</span><span class="cx"> 
</span><span class="cx">     if (Page* page = frame-&gt;page()) {
</span><del>-        UserGestureIndicator indicator(DefinitelyProcessingNewUserGesture);
</del><ins>+        UserGestureIndicator indicator(DefinitelyProcessingUserGesture);
</ins><span class="cx">         page-&gt;mainFrame()-&gt;loader()-&gt;urlSelected(KURL(ParsedURLString, url), String(), 0, false, false, MaybeSendReferrer);
</span><span class="cx">     }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (152237 => 152238)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog        2013-07-01 19:14:53 UTC (rev 152237)
+++ trunk/Source/WebKit2/ChangeLog        2013-07-01 19:24:19 UTC (rev 152238)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2013-07-01  Jochen Eisinger  &lt;jochen@chromium.org&gt;
+
+        Remove support for consumable user gestures
+        https://bugs.webkit.org/show_bug.cgi?id=118247
+
+        Reviewed by Geoffrey Garen.
+
+        * WebProcess/Notifications/WebNotificationManager.cpp:
+        (WebKit::WebNotificationManager::didClickNotification):
+        * WebProcess/Plugins/PluginView.cpp:
+        (WebKit::PluginView::performFrameLoadURLRequest):
+        (WebKit::PluginView::evaluate):
+        * WebProcess/WebCoreSupport/WebContextMenuClient.cpp:
+        (WebKit::WebContextMenuClient::searchWithGoogle):
+
</ins><span class="cx"> 2013-06-27  Jer Noble  &lt;jer.noble@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Audio in apps which embed WebViews is corrupted.
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessNotificationsWebNotificationManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Notifications/WebNotificationManager.cpp (152237 => 152238)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Notifications/WebNotificationManager.cpp        2013-07-01 19:14:53 UTC (rev 152237)
+++ trunk/Source/WebKit2/WebProcess/Notifications/WebNotificationManager.cpp        2013-07-01 19:24:19 UTC (rev 152238)
</span><span class="lines">@@ -249,7 +249,7 @@
</span><span class="cx">         return;
</span><span class="cx"> 
</span><span class="cx">     // Indicate that this event is being dispatched in reaction to a user's interaction with a platform notification.
</span><del>-    UserGestureIndicator indicator(DefinitelyProcessingNewUserGesture);
</del><ins>+    UserGestureIndicator indicator(DefinitelyProcessingUserGesture);
</ins><span class="cx">     notification-&gt;dispatchClickEvent();
</span><span class="cx"> #else
</span><span class="cx">     UNUSED_PARAM(notificationID);
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsPluginViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp (152237 => 152238)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp        2013-07-01 19:14:53 UTC (rev 152237)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp        2013-07-01 19:24:19 UTC (rev 152238)
</span><span class="lines">@@ -1097,7 +1097,7 @@
</span><span class="cx">         return;
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    UserGestureIndicator gestureIndicator(request-&gt;allowPopups() ? DefinitelyProcessingNewUserGesture : PossiblyProcessingUserGesture);
</del><ins>+    UserGestureIndicator gestureIndicator(request-&gt;allowPopups() ? DefinitelyProcessingUserGesture : PossiblyProcessingUserGesture);
</ins><span class="cx"> 
</span><span class="cx">     // First, try to find a target frame.
</span><span class="cx">     Frame* targetFrame = frame-&gt;loader()-&gt;findFrameForNavigation(request-&gt;target());
</span><span class="lines">@@ -1370,7 +1370,7 @@
</span><span class="cx">     // protect the plug-in view from destruction.
</span><span class="cx">     NPRuntimeObjectMap::PluginProtector pluginProtector(&amp;m_npRuntimeObjectMap);
</span><span class="cx"> 
</span><del>-    UserGestureIndicator gestureIndicator(allowPopups ? DefinitelyProcessingNewUserGesture : PossiblyProcessingUserGesture);
</del><ins>+    UserGestureIndicator gestureIndicator(allowPopups ? DefinitelyProcessingUserGesture : PossiblyProcessingUserGesture);
</ins><span class="cx">     return m_npRuntimeObjectMap.evaluate(npObject, scriptString, result);
</span><span class="cx"> }
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebContextMenuClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebContextMenuClient.cpp (152237 => 152238)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebContextMenuClient.cpp        2013-07-01 19:14:53 UTC (rev 152237)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebContextMenuClient.cpp        2013-07-01 19:24:19 UTC (rev 152238)
</span><span class="lines">@@ -85,7 +85,7 @@
</span><span class="cx">     String url = &quot;http://www.google.com/search?q=&quot; + encoded + &quot;&amp;ie=UTF-8&amp;oe=UTF-8&quot;;
</span><span class="cx"> 
</span><span class="cx">     if (Page* page = frame-&gt;page()) {
</span><del>-        UserGestureIndicator indicator(DefinitelyProcessingNewUserGesture);
</del><ins>+        UserGestureIndicator indicator(DefinitelyProcessingUserGesture);
</ins><span class="cx">         page-&gt;mainFrame()-&gt;loader()-&gt;urlSelected(KURL(ParsedURLString, url), String(), 0, false, false, MaybeSendReferrer);
</span><span class="cx">     }
</span><span class="cx"> }
</span></span></pre>
</div>
</div>

</body>
</html>