Source/WebKit/chromium/src/WebScopedUserGesture.cpp - Issue 12918021: Merge 145453

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: Source/WebKit/chromium/src/WebScopedUserGesture.cpp

Issue 12918021: Merge 145453 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1410/

Patch Set: Created 7 years, 9 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

« no previous file with comments | « Source/WebKit/chromium/src/WebPluginContainerImpl.cpp ('k') | no next file » | no next file with comments »

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 19 matching lines...) Expand all Loading...
30	30

31 #include "config.h"	31 #include "config.h"

32 #include "WebScopedUserGesture.h"	32 #include "WebScopedUserGesture.h"

33	33

34 #include "UserGestureIndicator.h"	34 #include "UserGestureIndicator.h"

35	35

36 namespace WebKit {	36 namespace WebKit {

37	37

38 void WebScopedUserGesture::initialize()	38 void WebScopedUserGesture::initialize()

39 {	39 {

40 m_indicator.reset(new WebCore::UserGestureIndicator(WebCore::DefinitelyProce ssingUserGesture));	40 m_indicator.reset(new WebCore::UserGestureIndicator(WebCore::DefinitelyProce ssingNewUserGesture));

41 }	41 }

42	42

43 void WebScopedUserGesture::reset()	43 void WebScopedUserGesture::reset()

44 {	44 {

45 m_indicator.reset(0);	45 m_indicator.reset(0);

46 }	46 }

47	47

48 } // namespace WebKit	48 } // namespace WebKit

OLD	NEW