webkit/plugins/ppapi/ppapi_plugin_instance.h - Issue 7782020: Revert 99855 - Move PPAPI graphics3d and opengles interfaces out of Dev.

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

Unified Diff: webkit/plugins/ppapi/ppapi_plugin_instance.h

Issue 7782020: Revert 99855 - Move PPAPI graphics3d and opengles interfaces out of Dev. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 9 years, 3 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 side-by-side diff with in-line comments

Download patch

Index: webkit/plugins/ppapi/ppapi_plugin_instance.h

===================================================================

--- webkit/plugins/ppapi/ppapi_plugin_instance.h (revision 99860)

+++ webkit/plugins/ppapi/ppapi_plugin_instance.h (working copy)

@@ -17,11 +17,11 @@

#include "base/string16.h"

#include "googleurl/src/gurl.h"

#include "ppapi/c/dev/pp_cursor_type_dev.h"

+#include "ppapi/c/dev/ppp_graphics_3d_dev.h"

#include "ppapi/c/dev/ppp_printing_dev.h"

#include "ppapi/c/pp_instance.h"

#include "ppapi/c/pp_resource.h"

#include "ppapi/c/pp_var.h"

-#include "ppapi/c/ppp_graphics_3d.h"

#include "ppapi/c/ppp_instance.h"

#include "ppapi/shared_impl/function_group_base.h"

#include "ppapi/shared_impl/instance_impl.h"

@@ -432,7 +432,7 @@

const PPP_Printing_Dev* plugin_print_interface_;

// The plugin 3D interface.

- const PPP_Graphics3D* plugin_graphics_3d_interface_;

+ const PPP_Graphics3D_Dev* plugin_graphics_3d_interface_;

// Contains the cursor if it's set by the plugin.

scoped_ptr<WebKit::WebCursorInfo> cursor_;

Property changes on: webkit/plugins/ppapi/ppapi_plugin_instance.h

___________________________________________________________________

Added: svn:mergeinfo

Merged /branches/chrome_webkit_merge_branch/src/webkit/plugins/ppapi/ppapi_plugin_instance.h:r3734-4217,4606-5108,5177-5263

« no previous file with comments | « webkit/plugins/ppapi/plugin_module.cc ('k') | webkit/plugins/ppapi/ppb_graphics_3d_impl.cc » ('j') | no next file with comments »