ppapi/proxy/plugin_dispatcher.cc - Issue 11450025: Revert 171389

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/plugin_dispatcher.cc

Issue 11450025: Revert 171389 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years 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/proxy/plugin_dispatcher.h ('k') | ppapi/proxy/plugin_resource.h » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 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 #include "ppapi/proxy/plugin_dispatcher.h"	5 #include "ppapi/proxy/plugin_dispatcher.h"

6	6

7 #include <map>	7 #include <map>

8	8

9 #include "base/compiler_specific.h"	9 #include "base/compiler_specific.h"

10 #include "base/logging.h"	10 #include "base/logging.h"

11 #include "base/message_loop.h"	11 #include "base/message_loop.h"

12 #include "ipc/ipc_message.h"	12 #include "ipc/ipc_message.h"

13 #include "ipc/ipc_sync_channel.h"	13 #include "ipc/ipc_sync_channel.h"

14 #include "base/debug/trace_event.h"	14 #include "base/debug/trace_event.h"

15 #include "ppapi/c/pp_errors.h"	15 #include "ppapi/c/pp_errors.h"

16 #include "ppapi/c/ppp_instance.h"	16 #include "ppapi/c/ppp_instance.h"

17 #include "ppapi/proxy/flash_resource.h"	17 #include "ppapi/proxy/flash_resource.h"

18 #include "ppapi/proxy/flash_clipboard_resource.h"	18 #include "ppapi/proxy/flash_clipboard_resource.h"

	19 #include "ppapi/proxy/flash_file_resource.h"

19 #include "ppapi/proxy/gamepad_resource.h"	20 #include "ppapi/proxy/gamepad_resource.h"

20 #include "ppapi/proxy/interface_list.h"	21 #include "ppapi/proxy/interface_list.h"

21 #include "ppapi/proxy/interface_proxy.h"	22 #include "ppapi/proxy/interface_proxy.h"

22 #include "ppapi/proxy/plugin_message_filter.h"	23 #include "ppapi/proxy/plugin_message_filter.h"

23 #include "ppapi/proxy/plugin_resource_tracker.h"	24 #include "ppapi/proxy/plugin_resource_tracker.h"

24 #include "ppapi/proxy/plugin_var_serialization_rules.h"	25 #include "ppapi/proxy/plugin_var_serialization_rules.h"

25 #include "ppapi/proxy/ppapi_messages.h"	26 #include "ppapi/proxy/ppapi_messages.h"

26 #include "ppapi/proxy/ppb_instance_proxy.h"	27 #include "ppapi/proxy/ppb_instance_proxy.h"

27 #include "ppapi/proxy/ppp_class_proxy.h"	28 #include "ppapi/proxy/ppp_class_proxy.h"

28 #include "ppapi/proxy/resource_creation_proxy.h"	29 #include "ppapi/proxy/resource_creation_proxy.h"

(...skipping 316 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
345 DLOG_IF(INFO, reply_params.sequence() != 0)	346 DLOG_IF(INFO, reply_params.sequence() != 0)

346 << "Pepper resource reply message received but the resource doesn't "	347 << "Pepper resource reply message received but the resource doesn't "

347 "exist (probably has been destroyed).";	348 "exist (probably has been destroyed).";

348 return;	349 return;

349 }	350 }

350 resource->OnReplyReceived(reply_params, nested_msg);	351 resource->OnReplyReceived(reply_params, nested_msg);

351 }	352 }

352	353

353 } // namespace proxy	354 } // namespace proxy

354 } // namespace ppapi	355 } // namespace ppapi

OLD	NEW