summaryrefslogtreecommitdiffstats
path: root/ppapi/proxy/proxy_channel.h
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-18 21:58:02 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-18 21:58:02 +0000
commit4d2efd2e100bc961d3e19e0a6f242c7914917690 (patch)
treec29e1a627687c0ef29a207378ff19fcd9927fb67 /ppapi/proxy/proxy_channel.h
parent6fa9e6f0c0fd3a66789de9df381cc16c36ca6da1 (diff)
downloadchromium_src-4d2efd2e100bc961d3e19e0a6f242c7914917690.zip
chromium_src-4d2efd2e100bc961d3e19e0a6f242c7914917690.tar.gz
chromium_src-4d2efd2e100bc961d3e19e0a6f242c7914917690.tar.bz2
Convert the pp::proxy namespace to the ppapi::proxy namespace.
This is more consistent with the stuff in shared_impl, and removes a lot of namespace using goop. Add a unified resource tracker shared between the proxy and the impl. This renames the old ResourceObjectBase to Resource and removes the old PluginResource. It moves the resource tracker from the impl to the shared_impl, and makes the proxy use it. Some things become a little less neat because there's no proxy resource base class. In particular GetDispatcher() is now gone. I considered whether to add a helper base class that provides this function, but decided against it and had individual resource classes implement this when their implementation would find it useful. This is because ultimately I want more of this functionality to move into the shared_impl, and it's easier to do that if there are fewer proxy-specific things in the resources. This changes the way that plugins are added to the tracker. Previously they would only be in the tracker if the plugin had a reference to them, although they could be alive if the impl had a scoped_ptr referencing an object. This actually has the bug that if we then give the resource back to the plugin, it wouldn't be refcounted properly and everything would get confused. Now the tracker tracks all live resource objects whether or not the plugin has a ref. This works basically like the var tracker (it would be nice if the var and resource trackers shared more code, but that would further complicate this already overcomplicated patch). The resource tracker takes an extra ref whenever the plugin has one or more, and otherwise just tracks live resources. BUG= TEST= Review URL: http://codereview.chromium.org/7655002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@97367 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/proxy/proxy_channel.h')
-rw-r--r--ppapi/proxy/proxy_channel.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/ppapi/proxy/proxy_channel.h b/ppapi/proxy/proxy_channel.h
index 3dbb977..2aba843 100644
--- a/ppapi/proxy/proxy_channel.h
+++ b/ppapi/proxy/proxy_channel.h
@@ -20,7 +20,7 @@ namespace IPC {
class TestSink;
}
-namespace pp {
+namespace ppapi {
namespace proxy {
class VarSerializationRules;
@@ -105,6 +105,6 @@ class ProxyChannel : public IPC::Channel::Listener,
};
} // namespace proxy
-} // namespace pp
+} // namespace ppapi
#endif // PPAPI_PROXY_PROXY_CHANNEL_H_