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

Side by Side Diff: third_party/WebKit/public/web/WebScopedUserGesture.h

Issue 2143323002: Remove WebPrivateOwnPtr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix Created 4 years, 5 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) 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 13 matching lines...) Expand all
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 #ifndef WebScopedUserGesture_h 31 #ifndef WebScopedUserGesture_h
32 #define WebScopedUserGesture_h 32 #define WebScopedUserGesture_h
33 33
34 #include "../platform/WebPrivateOwnPtr.h" 34 #include "public/platform/WebCommon.h"
35 #include <memory>
35 36
36 namespace blink { 37 namespace blink {
37 38
38 class UserGestureIndicator; 39 class UserGestureIndicator;
39 class WebUserGestureToken; 40 class WebUserGestureToken;
40 41
41 // An instance of this class, while kept alive, will indicate that we are in 42 // An instance of this class, while kept alive, will indicate that we are in
42 // the context of a known user gesture. To use, create one, perform whatever 43 // the context of a known user gesture. To use, create one, perform whatever
43 // actions were done under color of a known user gesture, and then delete it. 44 // actions were done under color of a known user gesture, and then delete it.
44 // Usually this will be done on the stack. 45 // Usually this will be done on the stack.
45 // 46 //
46 // SECURITY WARNING: Do not create several instances of this class for the same 47 // SECURITY WARNING: Do not create several instances of this class for the same
47 // user gesture. Doing so might enable malicious code to work around certain 48 // user gesture. Doing so might enable malicious code to work around certain
48 // restrictions such as opening multiple windows. 49 // restrictions such as opening multiple windows.
49 // Instead, obtain the current WebUserGestureToken from the 50 // Instead, obtain the current WebUserGestureToken from the
50 // WebUserGestureIndicator, and use this token to create a 51 // WebUserGestureIndicator, and use this token to create a
51 // WebScopedUserGesture. If the token was alrady consumed, the new 52 // WebScopedUserGesture. If the token was alrady consumed, the new
52 // WebScopedUserGesture will not indicate that we are in the context of a user 53 // WebScopedUserGesture will not indicate that we are in the context of a user
53 // gesture. 54 // gesture.
54 class WebScopedUserGesture { 55 class WebScopedUserGesture {
55 public: 56 public:
56 explicit WebScopedUserGesture(const WebUserGestureToken& token) { initialize WithToken(token); } 57 BLINK_EXPORT explicit WebScopedUserGesture(const WebUserGestureToken& token) ;
57 WebScopedUserGesture() { initialize(); } 58 BLINK_EXPORT WebScopedUserGesture();
58 ~WebScopedUserGesture() { reset(); } 59 BLINK_EXPORT ~WebScopedUserGesture();
59 60
60 private: 61 private:
61 BLINK_EXPORT void initialize(); 62 std::unique_ptr<UserGestureIndicator> m_indicator;
62 BLINK_EXPORT void initializeWithToken(const WebUserGestureToken&);
63 BLINK_EXPORT void reset();
64
65 WebPrivateOwnPtr<UserGestureIndicator> m_indicator;
66 }; 63 };
67 64
68 } // namespace blink 65 } // namespace blink
69 66
70 #endif // WebScopedUserGesture_h 67 #endif // WebScopedUserGesture_h
OLDNEW
« no previous file with comments | « third_party/WebKit/public/web/WebFrame.h ('k') | third_party/WebKit/public/web/WebScopedWindowFocusAllowedIndicator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698