OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2011 Google Inc. All rights reserved. | 2 * Copyright (C) 2011 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 12 matching lines...) Expand all Loading... |
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 "public/web/WebScopedUserGesture.h" | 31 #include "public/web/WebScopedUserGesture.h" |
32 | 32 |
| 33 #include "core/dom/DocumentUserGestureToken.h" |
33 #include "platform/UserGestureIndicator.h" | 34 #include "platform/UserGestureIndicator.h" |
34 #include "public/web/WebUserGestureToken.h" | 35 #include "public/web/WebUserGestureToken.h" |
| 36 #include "web/WebLocalFrameImpl.h" |
35 | 37 |
36 namespace blink { | 38 namespace blink { |
37 | 39 |
38 WebScopedUserGesture::WebScopedUserGesture(const WebUserGestureToken& token) { | 40 WebScopedUserGesture::WebScopedUserGesture(const WebUserGestureToken& token) { |
39 if (!token.isNull()) | 41 if (!token.isNull()) |
40 m_indicator.reset(new UserGestureIndicator(token)); | 42 m_indicator.reset(new UserGestureIndicator(token)); |
41 } | 43 } |
42 | 44 |
43 WebScopedUserGesture::WebScopedUserGesture() { | 45 WebScopedUserGesture::WebScopedUserGesture(WebLocalFrame* frame) { |
44 m_indicator.reset(new UserGestureIndicator( | 46 m_indicator.reset(new UserGestureIndicator(DocumentUserGestureToken::create( |
45 UserGestureToken::create(UserGestureToken::NewGesture))); | 47 frame ? toWebLocalFrameImpl(frame)->frame()->document() : nullptr, |
| 48 UserGestureToken::NewGesture))); |
46 } | 49 } |
47 | 50 |
48 WebScopedUserGesture::~WebScopedUserGesture() {} | 51 WebScopedUserGesture::~WebScopedUserGesture() {} |
49 | 52 |
50 } // namespace blink | 53 } // namespace blink |
OLD | NEW |