webkit/tools/pepper_test_plugin/plugin_object.h - Issue 529004: Fixed some bugs that prevented the GPU plugin from shutting down without cras...

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/tools/pepper_test_plugin/plugin_object.h

Issue 529004: Fixed some bugs that prevented the GPU plugin from shutting down without cras... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: Created 10 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 | Annotate | Revision Log

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 2006, 2007 Apple Inc. All rights reserved.	2 * Copyright (C) 2006, 2007 Apple 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	5 * modification, are permitted provided that the following conditions

6 * are met:	6 * are met:

7 * 1. Redistributions of source code must retain the above copyright	7 * 1. Redistributions of source code must retain the above copyright

8 * notice, this list of conditions and the following disclaimer.	8 * notice, this list of conditions and the following disclaimer.

9 * 2. Redistributions in binary form must reproduce the above copyright	9 * 2. Redistributions in binary form must reproduce the above copyright

10 * notice, this list of conditions and the following disclaimer in the	10 * notice, this list of conditions and the following disclaimer in the

(...skipping 41 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
52 private:	52 private:

53 bool InitializeCommandBuffer();	53 bool InitializeCommandBuffer();

54	54

55 NPObject header_;	55 NPObject header_;

56 NPP npp_;	56 NPP npp_;

57 NPObject* test_object_;	57 NPObject* test_object_;

58 int dimensions_;	58 int dimensions_;

59	59

60 NPDevice* device2d_;	60 NPDevice* device2d_;

61	61

62 // TODO(apatrick): this destruction order causes the plugin to crash on

63 // shutdown.

64 scoped_ptr<CommandBufferPepper> command_buffer_;	62 scoped_ptr<CommandBufferPepper> command_buffer_;

	63 scoped_ptr<gpu::gles2::GLES2CmdHelper> helper_;

65 scoped_ptr<gpu::gles2::GLES2Implementation> gles2_implementation_;	64 scoped_ptr<gpu::gles2::GLES2Implementation> gles2_implementation_;

66 scoped_ptr<gpu::gles2::GLES2CmdHelper> helper_;

67	65

68 gfx::Size size_;	66 gfx::Size size_;

69	67

70 DISALLOW_COPY_AND_ASSIGN(PluginObject);	68 DISALLOW_COPY_AND_ASSIGN(PluginObject);

71 };	69 };

72	70

73	71

74 #endif // WEBKIT_TOOLS_PEPPER_TEST_PLUGIN_PLUGIN_OBJECT_H_	72 #endif // WEBKIT_TOOLS_PEPPER_TEST_PLUGIN_PLUGIN_OBJECT_H_

OLD	NEW

« no previous file with comments | « gpu/command_buffer/service/gles2_cmd_decoder.cc ('k') | no next file » | no next file with comments »