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

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

Issue 2408333004: Move persistent gesture state to Document, add DocumentUserGestureToken (Closed)
Patch Set: Re-add dropped null check Created 4 years, 1 month 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 14 matching lines...) Expand all
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/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 36
36 namespace blink { 37 namespace blink {
37 38
38 bool WebUserGestureIndicator::isProcessingUserGesture() { 39 bool WebUserGestureIndicator::isProcessingUserGesture() {
39 return UserGestureIndicator::processingUserGesture(); 40 return UserGestureIndicator::processingUserGesture();
40 } 41 }
41 42
42 bool WebUserGestureIndicator::consumeUserGesture() { 43 bool WebUserGestureIndicator::consumeUserGesture() {
43 return UserGestureIndicator::consumeUserGesture(); 44 return UserGestureIndicator::consumeUserGesture();
44 } 45 }
45 46
46 bool WebUserGestureIndicator::processedUserGestureSinceLoad() { 47 bool WebUserGestureIndicator::processedUserGestureSinceLoad(
47 return UserGestureIndicator::processedUserGestureSinceLoad(); 48 WebLocalFrame* frame) {
49 Document* document = toWebLocalFrameImpl(frame)->frame()->document();
50 return document->hasReceivedUserGesture();
48 } 51 }
49 52
50 WebUserGestureToken WebUserGestureIndicator::currentUserGestureToken() { 53 WebUserGestureToken WebUserGestureIndicator::currentUserGestureToken() {
51 return WebUserGestureToken(UserGestureIndicator::currentToken()); 54 return WebUserGestureToken(UserGestureIndicator::currentToken());
52 } 55 }
53 56
54 } // namespace blink 57 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/web/WebScopedUserGesture.cpp ('k') | third_party/WebKit/Source/web/WebViewImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698