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

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

Issue 2625773002: Reenable framebusting (Closed)
Patch Set: Pass through FrameReplicationState Created 3 years, 11 months 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 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 46
47 // TODO(csharrison): consumeUserGesture() and currentUserGestureToken() use 47 // TODO(csharrison): consumeUserGesture() and currentUserGestureToken() use
48 // the thread-safe API, which many callers probably do not need. Consider 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. 49 // updating them if they are in any sort of critical path or called often.
50 bool WebUserGestureIndicator::consumeUserGesture() { 50 bool WebUserGestureIndicator::consumeUserGesture() {
51 return UserGestureIndicator::consumeUserGestureThreadSafe(); 51 return UserGestureIndicator::consumeUserGestureThreadSafe();
52 } 52 }
53 53
54 bool WebUserGestureIndicator::processedUserGestureSinceLoad( 54 bool WebUserGestureIndicator::processedUserGestureSinceLoad(
55 WebLocalFrame* frame) { 55 WebLocalFrame* frame) {
56 Document* document = toWebLocalFrameImpl(frame)->frame()->document(); 56 return toWebLocalFrameImpl(frame)->frame()->hasReceivedUserGesture();
57 return document->hasReceivedUserGesture();
58 } 57 }
59 58
60 WebUserGestureToken WebUserGestureIndicator::currentUserGestureToken() { 59 WebUserGestureToken WebUserGestureIndicator::currentUserGestureToken() {
61 return WebUserGestureToken(UserGestureIndicator::currentTokenThreadSafe()); 60 return WebUserGestureToken(UserGestureIndicator::currentTokenThreadSafe());
62 } 61 }
63 62
64 } // namespace blink 63 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/web/WebRemoteFrameImpl.cpp ('k') | third_party/WebKit/Source/web/WebViewImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698