summaryrefslogtreecommitdiffstats
path: root/webkit/glue
diff options
context:
space:
mode:
authorviettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-21 00:45:43 +0000
committerviettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-21 00:45:43 +0000
commit64264efa8b4a0bf37b19042f295f9990a7f388c9 (patch)
tree5e7cbf44e04f00388078da62d6e0eed878da3d6d /webkit/glue
parentc85b0ba71b5a55647b01de9d345e46896979033d (diff)
downloadchromium_src-64264efa8b4a0bf37b19042f295f9990a7f388c9.zip
chromium_src-64264efa8b4a0bf37b19042f295f9990a7f388c9.tar.gz
chromium_src-64264efa8b4a0bf37b19042f295f9990a7f388c9.tar.bz2
Properly cancel PPAPI callbacks.
This sets up infrastructure to properly cancel PPAPI callbacks (which have particular semantics), and converts a couple things to use them. BUG= TEST=test_shell_tests and PPAPI tests Review URL: http://codereview.chromium.org/5562008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69773 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue')
-rw-r--r--webkit/glue/webkit_glue.gypi2
1 files changed, 2 insertions, 0 deletions
diff --git a/webkit/glue/webkit_glue.gypi b/webkit/glue/webkit_glue.gypi
index 13545b8..1499a6f 100644
--- a/webkit/glue/webkit_glue.gypi
+++ b/webkit/glue/webkit_glue.gypi
@@ -170,6 +170,8 @@
# names.
'../plugins/plugin_switches.cc',
'../plugins/plugin_switches.h',
+ '../plugins/ppapi/callbacks.cc',
+ '../plugins/ppapi/callbacks.h',
'../plugins/ppapi/common.h',
'../plugins/ppapi/dir_contents.h',
'../plugins/ppapi/error_util.cc',