Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(703)

Unified Diff: sky/engine/platform/UserGestureIndicator.cpp

Issue 868933003: Remove user gesture tracking (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: sky/engine/platform/UserGestureIndicator.cpp
diff --git a/sky/engine/platform/UserGestureIndicator.cpp b/sky/engine/platform/UserGestureIndicator.cpp
deleted file mode 100644
index 82392458ee031e2424317d17486f8801bd073485..0000000000000000000000000000000000000000
--- a/sky/engine/platform/UserGestureIndicator.cpp
+++ /dev/null
@@ -1,230 +0,0 @@
-/*
- * Copyright (C) 2010 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "sky/engine/config.h"
-#include "sky/engine/platform/UserGestureIndicator.h"
-
-#include "sky/engine/wtf/Assertions.h"
-#include "sky/engine/wtf/CurrentTime.h"
-#include "sky/engine/wtf/MainThread.h"
-
-namespace blink {
-
-namespace {
-
-// User gestures timeout in 1 second.
-const double userGestureTimeout = 1.0;
-
-// For out of process tokens we allow a 10 second delay.
-const double userGestureOutOfProcessTimeout = 10.0;
-
-class GestureToken : public UserGestureToken {
-public:
- static PassRefPtr<UserGestureToken> create() { return adoptRef(new GestureToken); }
-
- virtual ~GestureToken() { }
- virtual bool hasGestures() const override
- {
- // Do not enforce timeouts for gestures which spawned javascript prompts.
- if (m_consumableGestures < 1 || (WTF::currentTime() - m_timestamp > (m_outOfProcess ? userGestureOutOfProcessTimeout : userGestureTimeout) && !m_javascriptPrompt))
- return false;
- return true;
- }
-
- void addGesture()
- {
- m_consumableGestures++;
- m_timestamp = WTF::currentTime();
- }
-
- void resetTimestamp()
- {
- m_timestamp = WTF::currentTime();
- }
-
- bool consumeGesture()
- {
- if (!m_consumableGestures)
- return false;
- m_consumableGestures--;
- return true;
- }
-
- virtual void setOutOfProcess() override
- {
- if (WTF::currentTime() - m_timestamp > userGestureTimeout)
- return;
- if (hasGestures())
- m_outOfProcess = true;
- }
-
- virtual void setJavascriptPrompt() override
- {
- if (WTF::currentTime() - m_timestamp > userGestureTimeout)
- return;
- if (hasGestures())
- m_javascriptPrompt = true;
- }
-
-private:
- GestureToken()
- : m_consumableGestures(0)
- , m_timestamp(0)
- , m_outOfProcess(false)
- , m_javascriptPrompt(false)
- {
- }
-
- size_t m_consumableGestures;
- double m_timestamp;
- bool m_outOfProcess;
- bool m_javascriptPrompt;
-};
-
-}
-
-static bool isDefinite(ProcessingUserGestureState state)
-{
- return state == DefinitelyProcessingNewUserGesture || state == DefinitelyProcessingUserGesture || state == DefinitelyNotProcessingUserGesture;
-}
-
-ProcessingUserGestureState UserGestureIndicator::s_state = DefinitelyNotProcessingUserGesture;
-UserGestureIndicator* UserGestureIndicator::s_topmostIndicator = 0;
-bool UserGestureIndicator::s_processedUserGestureSinceLoad = false;
-
-UserGestureIndicator::UserGestureIndicator(ProcessingUserGestureState state)
- : m_previousState(s_state)
-{
- // Silently ignore UserGestureIndicators on non-main threads.
- if (!isMainThread())
- return;
-
- // We overwrite s_state only if the caller is definite about the gesture state.
- if (isDefinite(state)) {
- if (!s_topmostIndicator) {
- s_topmostIndicator = this;
- m_token = GestureToken::create();
- } else {
- m_token = s_topmostIndicator->currentToken();
- }
- s_state = state;
- }
-
- if (state == DefinitelyProcessingNewUserGesture) {
- static_cast<GestureToken*>(m_token.get())->addGesture();
- s_processedUserGestureSinceLoad = true;
- } else if (state == DefinitelyProcessingUserGesture && s_topmostIndicator == this) {
- static_cast<GestureToken*>(m_token.get())->addGesture();
- s_processedUserGestureSinceLoad = true;
- }
- ASSERT(isDefinite(s_state));
-}
-
-UserGestureIndicator::UserGestureIndicator(PassRefPtr<UserGestureToken> token)
- : m_previousState(s_state)
-{
- // Silently ignore UserGestureIndicators on non-main threads.
- if (!isMainThread())
- return;
-
- if (token) {
- static_cast<GestureToken*>(token.get())->resetTimestamp();
- if (!s_topmostIndicator) {
- s_topmostIndicator = this;
- m_token = token;
- } else {
- m_token = s_topmostIndicator->currentToken();
- if (static_cast<GestureToken*>(token.get())->hasGestures()) {
- static_cast<GestureToken*>(m_token.get())->addGesture();
- static_cast<GestureToken*>(token.get())->consumeGesture();
- }
- }
- s_state = DefinitelyProcessingUserGesture;
- }
-
- ASSERT(isDefinite(s_state));
-}
-
-UserGestureIndicator::~UserGestureIndicator()
-{
- if (!isMainThread())
- return;
- s_state = m_previousState;
- if (s_topmostIndicator == this)
- s_topmostIndicator = 0;
- ASSERT(isDefinite(s_state));
-}
-
-bool UserGestureIndicator::processingUserGesture()
-{
- if (!isMainThread())
- return false;
- return s_topmostIndicator && static_cast<GestureToken*>(s_topmostIndicator->currentToken())->hasGestures() && (s_state == DefinitelyProcessingNewUserGesture || s_state == DefinitelyProcessingUserGesture);
-}
-
-bool UserGestureIndicator::consumeUserGesture()
-{
- if (!isMainThread() || !s_topmostIndicator)
- return false;
- return static_cast<GestureToken*>(s_topmostIndicator->currentToken())->consumeGesture();
-}
-
-UserGestureToken* UserGestureIndicator::currentToken()
-{
- if (!isMainThread() || !s_topmostIndicator)
- return 0;
- return s_topmostIndicator->m_token.get();
-}
-
-void UserGestureIndicator::clearProcessedUserGestureSinceLoad()
-{
- if (isMainThread())
- s_processedUserGestureSinceLoad = false;
-}
-
-bool UserGestureIndicator::processedUserGestureSinceLoad()
-{
- if (!isMainThread())
- return false;
- return s_processedUserGestureSinceLoad;
-}
-
-UserGestureIndicatorDisabler::UserGestureIndicatorDisabler()
- : m_savedState(UserGestureIndicator::s_state)
- , m_savedIndicator(UserGestureIndicator::s_topmostIndicator)
-{
- RELEASE_ASSERT(isMainThread());
- UserGestureIndicator::s_state = DefinitelyNotProcessingUserGesture;
- UserGestureIndicator::s_topmostIndicator = 0;
-}
-
-UserGestureIndicatorDisabler::~UserGestureIndicatorDisabler()
-{
- RELEASE_ASSERT(isMainThread());
- UserGestureIndicator::s_state = m_savedState;
- UserGestureIndicator::s_topmostIndicator = m_savedIndicator;
-}
-
-}

Powered by Google App Engine
This is Rietveld 408576698