UserGestureIndicator: remove many unnecessary calls to isMainThread

third_party/WebKit/Source/platform/UserGestureIndicator.cpp

 /*
  * 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
@@ skipping 24 matching lines @@
 const double userGestureTimeout = 1.0;
 
 // For out of process tokens we allow a 10 second delay.
 const double userGestureOutOfProcessTimeout = 10.0;
 
 UserGestureToken::UserGestureToken(Status status)
     : m_consumableGestures(0),
       m_timestamp(WTF::currentTime()),
       m_timeoutPolicy(Default),
       m_usageCallback(nullptr) {
-  if (status == NewGesture || !UserGestureIndicator::currentToken())
+  if (status == NewGesture ||
+      !UserGestureIndicator::currentToken(
+          UserGestureIndicator::CheckThreadState)) {
     m_consumableGestures++;
+  }
 }
 
 bool UserGestureToken::hasGestures() const {
   return m_consumableGestures && !hasTimedOut();
 }
 
 void UserGestureToken::transferGestureTo(UserGestureToken* other) {
   if (!hasGestures())
     return;
   m_consumableGestures--;
@@ skipping 86 matching lines @@
 
 // static
 bool UserGestureIndicator::utilizeUserGesture() {
   if (UserGestureIndicator::processingUserGesture()) {
     s_rootToken->userGestureUtilized();
     return true;
   }
   return false;
 }
 
-bool UserGestureIndicator::processingUserGesture() {
-  if (auto* token = currentToken()) {
-    ASSERT(isMainThread());
+bool UserGestureIndicator::processingUserGesture(ThreadCheck threadCheck) {
+  if (auto* token = currentToken(threadCheck))
     return token->hasGestures();
-  }
-
   return false;
 }
 
 // static
-bool UserGestureIndicator::consumeUserGesture() {
-  if (auto* token = currentToken()) {
-    ASSERT(isMainThread());
+bool UserGestureIndicator::consumeUserGesture(ThreadCheck threadCheck) {
+  if (auto* token = currentToken(threadCheck)) {
     if (token->consumeGesture()) {
       token->userGestureUtilized();
       return true;
     }
   }
   return false;
 }
 
-// static
-UserGestureToken* UserGestureIndicator::currentToken() {
-  if (!isMainThread() || !s_rootToken)
+UserGestureToken* UserGestureIndicator::currentToken(ThreadCheck threadCheck) {
+  if (threadCheck == CheckThreadState && !isMainThread())
     return nullptr;
+  DCHECK(isMainThread());
   return s_rootToken;
 }
 
 }  // namespace blink