| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2010 Apple Inc. All rights reserved. | 2 * Copyright (C) 2010 Apple 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 | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
| 8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
| 9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
| 10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
| (...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 83 virtual void setJavascriptPrompt() OVERRIDE | 83 virtual void setJavascriptPrompt() OVERRIDE |
| 84 { | 84 { |
| 85 if (WTF::currentTime() - m_timestamp > userGestureTimeout) | 85 if (WTF::currentTime() - m_timestamp > userGestureTimeout) |
| 86 return; | 86 return; |
| 87 if (hasGestures()) | 87 if (hasGestures()) |
| 88 m_javascriptPrompt = true; | 88 m_javascriptPrompt = true; |
| 89 } | 89 } |
| 90 | 90 |
| 91 private: | 91 private: |
| 92 GestureToken() | 92 GestureToken() |
| 93 : m_consumableGestures(0), | 93 : m_consumableGestures(0) |
| 94 m_timestamp(0), | 94 , m_timestamp(0) |
| 95 m_outOfProcess(false), | 95 , m_outOfProcess(false) |
| 96 m_javascriptPrompt(false) | 96 , m_javascriptPrompt(false) |
| 97 { | 97 { |
| 98 } | 98 } |
| 99 | 99 |
| 100 size_t m_consumableGestures; | 100 size_t m_consumableGestures; |
| 101 double m_timestamp; | 101 double m_timestamp; |
| 102 bool m_outOfProcess; | 102 bool m_outOfProcess; |
| 103 bool m_javascriptPrompt; | 103 bool m_javascriptPrompt; |
| 104 }; | 104 }; |
| 105 | 105 |
| 106 } | 106 } |
| (...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 221 } | 221 } |
| 222 | 222 |
| 223 UserGestureIndicatorDisabler::~UserGestureIndicatorDisabler() | 223 UserGestureIndicatorDisabler::~UserGestureIndicatorDisabler() |
| 224 { | 224 { |
| 225 RELEASE_ASSERT(isMainThread()); | 225 RELEASE_ASSERT(isMainThread()); |
| 226 UserGestureIndicator::s_state = m_savedState; | 226 UserGestureIndicator::s_state = m_savedState; |
| 227 UserGestureIndicator::s_topmostIndicator = m_savedIndicator; | 227 UserGestureIndicator::s_topmostIndicator = m_savedIndicator; |
| 228 } | 228 } |
| 229 | 229 |
| 230 } | 230 } |
| OLD | NEW |