| OLD | NEW |
| 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 22 matching lines...) Expand all Loading... |
| 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 } | 41 } |
| 42 | 42 |
| 43 bool WebUserGestureIndicator::isProcessingUserGestureThreadSafe() { |
| 44 return UserGestureIndicator::processingUserGestureThreadSafe(); |
| 45 } |
| 46 |
| 47 // TODO(csharrison): consumeUserGesture() and currentUserGestureToken() use |
| 48 // the thread-safe API, which many callers probably do not need. Consider |
| 49 // updating them if they are in any sort of critical path or called often. |
| 43 bool WebUserGestureIndicator::consumeUserGesture() { | 50 bool WebUserGestureIndicator::consumeUserGesture() { |
| 44 return UserGestureIndicator::consumeUserGesture(); | 51 return UserGestureIndicator::consumeUserGestureThreadSafe(); |
| 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::currentTokenThreadSafe()); |
| 55 } | 62 } |
| 56 | 63 |
| 57 } // namespace blink | 64 } // namespace blink |
| OLD | NEW |