webkit/plugins/ppapi/plugin_module.cc - Issue 12047066: Reland: Add trace event Pepper API

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: webkit/plugins/ppapi/plugin_module.cc

Issue 12047066: Reland: Add trace event Pepper API (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: rebase Created 7 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

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 "webkit/plugins/ppapi/plugin_module.h"	5 #include "webkit/plugins/ppapi/plugin_module.h"

6	6

7 #include <set>	7 #include <set>

8	8

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

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

(...skipping 14 matching lines...) Expand all Loading...
25 #include "ppapi/c/dev/ppb_font_dev.h"	25 #include "ppapi/c/dev/ppb_font_dev.h"

26 #include "ppapi/c/dev/ppb_gles_chromium_texture_mapping_dev.h"	26 #include "ppapi/c/dev/ppb_gles_chromium_texture_mapping_dev.h"

27 #include "ppapi/c/dev/ppb_graphics_2d_dev.h"	27 #include "ppapi/c/dev/ppb_graphics_2d_dev.h"

28 #include "ppapi/c/dev/ppb_memory_dev.h"	28 #include "ppapi/c/dev/ppb_memory_dev.h"

29 #include "ppapi/c/dev/ppb_opengles2ext_dev.h"	29 #include "ppapi/c/dev/ppb_opengles2ext_dev.h"

30 #include "ppapi/c/dev/ppb_printing_dev.h"	30 #include "ppapi/c/dev/ppb_printing_dev.h"

31 #include "ppapi/c/dev/ppb_resource_array_dev.h"	31 #include "ppapi/c/dev/ppb_resource_array_dev.h"

32 #include "ppapi/c/dev/ppb_scrollbar_dev.h"	32 #include "ppapi/c/dev/ppb_scrollbar_dev.h"

33 #include "ppapi/c/dev/ppb_testing_dev.h"	33 #include "ppapi/c/dev/ppb_testing_dev.h"

34 #include "ppapi/c/dev/ppb_text_input_dev.h"	34 #include "ppapi/c/dev/ppb_text_input_dev.h"

	35 #include "ppapi/c/dev/ppb_trace_event_dev.h"

35 #include "ppapi/c/dev/ppb_url_util_dev.h"	36 #include "ppapi/c/dev/ppb_url_util_dev.h"

36 #include "ppapi/c/dev/ppb_var_deprecated.h"	37 #include "ppapi/c/dev/ppb_var_deprecated.h"

37 #include "ppapi/c/dev/ppb_video_capture_dev.h"	38 #include "ppapi/c/dev/ppb_video_capture_dev.h"

38 #include "ppapi/c/dev/ppb_video_decoder_dev.h"	39 #include "ppapi/c/dev/ppb_video_decoder_dev.h"

39 #include "ppapi/c/dev/ppb_view_dev.h"	40 #include "ppapi/c/dev/ppb_view_dev.h"

40 #include "ppapi/c/dev/ppb_widget_dev.h"	41 #include "ppapi/c/dev/ppb_widget_dev.h"

41 #include "ppapi/c/dev/ppb_zoom_dev.h"	42 #include "ppapi/c/dev/ppb_zoom_dev.h"

42 #include "ppapi/c/pp_module.h"	43 #include "ppapi/c/pp_module.h"

43 #include "ppapi/c/pp_resource.h"	44 #include "ppapi/c/pp_resource.h"

44 #include "ppapi/c/pp_var.h"	45 #include "ppapi/c/pp_var.h"

(...skipping 588 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
633 int retval = entry_points.initialize_module(pp_module(), &GetInterface);	634 int retval = entry_points.initialize_module(pp_module(), &GetInterface);

634 if (retval != 0) {	635 if (retval != 0) {

635 LOG(WARNING) << "PPP_InitializeModule returned failure " << retval;	636 LOG(WARNING) << "PPP_InitializeModule returned failure " << retval;

636 return false;	637 return false;

637 }	638 }

638 return true;	639 return true;

639 }	640 }

640	641

641 } // namespace ppapi	642 } // namespace ppapi

642 } // namespace webkit	643 } // namespace webkit

OLD	NEW

« no previous file with comments | « ppapi/thunk/interfaces_ppb_public_dev.h ('k') | no next file » | no next file with comments »