| 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 11 matching lines...) Expand all Loading... |
| 22 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | 22 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
| 23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | 23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT |
| 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
| 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
| 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 29 */ | 29 */ |
| 30 | 30 |
| 31 #include "config.h" | 31 #include "config.h" |
| 32 #include "public/web/WebUserGestureIndicator.h" | 32 #include "platform/PlatformThreadData.h" |
| 33 | 33 |
| 34 #include "platform/UserGestureIndicator.h" | 34 #include "platform/ThreadTimers.h" |
| 35 #include "public/web/WebUserGestureToken.h" | 35 #include "wtf/PassOwnPtr.h" |
| 36 #include "wtf/ThreadSpecific.h" |
| 36 | 37 |
| 37 namespace blink { | 38 namespace blink { |
| 38 | 39 |
| 39 bool WebUserGestureIndicator::isProcessingUserGesture() | 40 static ThreadSpecific<PlatformThreadData>* s_data; |
| 41 |
| 42 PlatformThreadData::PlatformThreadData() |
| 43 : m_threadTimers(adoptPtr(new ThreadTimers)) |
| 40 { | 44 { |
| 41 return UserGestureIndicator::processingUserGesture(); | |
| 42 } | 45 } |
| 43 | 46 |
| 44 bool WebUserGestureIndicator::consumeUserGesture() | 47 PlatformThreadData::~PlatformThreadData() |
| 45 { | 48 { |
| 46 return UserGestureIndicator::consumeUserGesture(); | |
| 47 } | 49 } |
| 48 | 50 |
| 49 WebUserGestureToken WebUserGestureIndicator::currentUserGestureToken() | 51 void PlatformThreadData::destroy() |
| 50 { | 52 { |
| 51 return WebUserGestureToken(UserGestureIndicator::currentToken()); | 53 m_threadTimers.clear(); |
| 54 } |
| 55 |
| 56 PlatformThreadData& PlatformThreadData::current() |
| 57 { |
| 58 if (!s_data) |
| 59 s_data = new ThreadSpecific<PlatformThreadData>; |
| 60 return **s_data; |
| 52 } | 61 } |
| 53 | 62 |
| 54 } // namespace blink | 63 } // namespace blink |
| OLD | NEW |