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

Side by Side Diff: third_party/WebKit/Source/web/WebUserGestureIndicator.cpp

Issue 2555013004: UserGestureIndicator: remove many unnecessary calls to isMainThread (Closed)
Patch Set: [test] remove isMainThread() check in currentToken() Created 4 years 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 19 matching lines...) Expand all
30 30
31 #include "public/web/WebUserGestureIndicator.h" 31 #include "public/web/WebUserGestureIndicator.h"
32 32
33 #include "platform/UserGestureIndicator.h" 33 #include "platform/UserGestureIndicator.h"
34 #include "public/web/WebUserGestureToken.h" 34 #include "public/web/WebUserGestureToken.h"
35 #include "web/WebLocalFrameImpl.h" 35 #include "web/WebLocalFrameImpl.h"
36 36
37 namespace blink { 37 namespace blink {
38 38
39 bool WebUserGestureIndicator::isProcessingUserGesture() { 39 bool WebUserGestureIndicator::isProcessingUserGesture() {
40 return UserGestureIndicator::processingUserGesture(); 40 return UserGestureIndicator::processingUserGesture(
41 UserGestureIndicator::DoNotCheckThreadState);
42 }
43
44 bool WebUserGestureIndicator::isProcessingUserGestureThreadSafe() {
45 return UserGestureIndicator::processingUserGesture(
46 UserGestureIndicator::CheckThreadState);
41 } 47 }
42 48
43 bool WebUserGestureIndicator::consumeUserGesture() { 49 bool WebUserGestureIndicator::consumeUserGesture() {
44 return UserGestureIndicator::consumeUserGesture(); 50 return UserGestureIndicator::consumeUserGesture(
51 UserGestureIndicator::CheckThreadState);
45 } 52 }
46 53
47 bool WebUserGestureIndicator::processedUserGestureSinceLoad( 54 bool WebUserGestureIndicator::processedUserGestureSinceLoad(
48 WebLocalFrame* frame) { 55 WebLocalFrame* frame) {
49 Document* document = toWebLocalFrameImpl(frame)->frame()->document(); 56 Document* document = toWebLocalFrameImpl(frame)->frame()->document();
50 return document->hasReceivedUserGesture(); 57 return document->hasReceivedUserGesture();
51 } 58 }
52 59
53 WebUserGestureToken WebUserGestureIndicator::currentUserGestureToken() { 60 WebUserGestureToken WebUserGestureIndicator::currentUserGestureToken() {
54 return WebUserGestureToken(UserGestureIndicator::currentToken()); 61 return WebUserGestureToken(UserGestureIndicator::currentToken(
62 UserGestureIndicator::CheckThreadState));
55 } 63 }
56 64
57 } // namespace blink 65 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698