ppapi/proxy/callback_tracker.h - Issue 8364040: Revert 106677 (caused several PPAPI test timeouts, see http://crbug.com/101154)

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: ppapi/proxy/callback_tracker.h

Issue 8364040: Revert 106677 (caused several PPAPI test timeouts, see http://crbug.com/101154) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 9 years, 2 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 | Annotate | Revision Log

« no previous file with comments | « ppapi/ppapi_proxy.gypi ('k') | ppapi/proxy/callback_tracker.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #ifndef PPAPI_PROXY_CALLBACK_TRACKER_H_	5 #ifndef PPAPI_PROXY_CALLBACK_TRACKER_H_

6 #define PPAPI_PROXY_CALLBACK_TRACKER_H_	6 #define PPAPI_PROXY_CALLBACK_TRACKER_H_

7	7

8 #include <map>	8 #include <map>

9	9

10 #include "ppapi/c/pp_completion_callback.h"	10 #include "ppapi/c/pp_completion_callback.h"

(...skipping 46 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
57	57

58 // Maps callback IDs to the actual callback objects in the plugin process.	58 // Maps callback IDs to the actual callback objects in the plugin process.

59 typedef std::map<int32_t, PP_CompletionCallback> CallbackMap;	59 typedef std::map<int32_t, PP_CompletionCallback> CallbackMap;

60 CallbackMap callback_map_;	60 CallbackMap callback_map_;

61 };	61 };

62	62

63 } // namespace proxy	63 } // namespace proxy

64 } // namespace ppapi	64 } // namespace ppapi

65	65

66 #endif // PPAPI_PROXY_CALLBACK_TRACKER_H_	66 #endif // PPAPI_PROXY_CALLBACK_TRACKER_H_

OLD	NEW