summaryrefslogtreecommitdiffstats
path: root/ppapi/proxy
diff options
context:
space:
mode:
authordmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-08 19:23:33 +0000
committerdmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-08 19:23:33 +0000
commitdcf10631a987ee1d2609e8538dcd6af0b8bb73fe (patch)
treeed44db242355c5b2c852742b5b396e51db0901af /ppapi/proxy
parente8e396fe7c0f64223bee3c485312797b8b7b6024 (diff)
downloadchromium_src-dcf10631a987ee1d2609e8538dcd6af0b8bb73fe.zip
chromium_src-dcf10631a987ee1d2609e8538dcd6af0b8bb73fe.tar.gz
chromium_src-dcf10631a987ee1d2609e8538dcd6af0b8bb73fe.tar.bz2
Fix some WeakPtrFactory members that aren't last
BUG=303818 Review URL: https://codereview.chromium.org/26308002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@227566 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/proxy')
-rw-r--r--ppapi/proxy/ppb_image_data_proxy.cc6
-rw-r--r--ppapi/proxy/ppb_var_deprecated_proxy.cc4
-rw-r--r--ppapi/proxy/ppb_var_deprecated_proxy.h3
3 files changed, 7 insertions, 6 deletions
diff --git a/ppapi/proxy/ppb_image_data_proxy.cc b/ppapi/proxy/ppb_image_data_proxy.cc
index 0ed3c24..c9d61f9 100644
--- a/ppapi/proxy/ppb_image_data_proxy.cc
+++ b/ppapi/proxy/ppb_image_data_proxy.cc
@@ -249,15 +249,15 @@ class ImageDataCache {
// Timer callback to expire entries for the given instance.
void OnTimer(PP_Instance instance);
+ typedef std::map<PP_Instance, ImageDataInstanceCache> CacheMap;
+ CacheMap cache_;
+
// This class does timer calls and we don't want to run these outside of the
// scope of the object. Technically, since this class is a leaked static,
// this will never happen and this factory is unnecessary. However, it's
// probably better not to make assumptions about the lifetime of this class.
base::WeakPtrFactory<ImageDataCache> weak_factory_;
- typedef std::map<PP_Instance, ImageDataInstanceCache> CacheMap;
- CacheMap cache_;
-
DISALLOW_COPY_AND_ASSIGN(ImageDataCache);
};
diff --git a/ppapi/proxy/ppb_var_deprecated_proxy.cc b/ppapi/proxy/ppb_var_deprecated_proxy.cc
index 43452ef..212a839 100644
--- a/ppapi/proxy/ppb_var_deprecated_proxy.cc
+++ b/ppapi/proxy/ppb_var_deprecated_proxy.cc
@@ -285,8 +285,8 @@ InterfaceProxy* CreateVarDeprecatedProxy(Dispatcher* dispatcher) {
PPB_Var_Deprecated_Proxy::PPB_Var_Deprecated_Proxy(
Dispatcher* dispatcher)
: InterfaceProxy(dispatcher),
- task_factory_(this),
- ppb_var_impl_(NULL) {
+ ppb_var_impl_(NULL),
+ task_factory_(this) {
if (!dispatcher->IsPlugin()) {
ppb_var_impl_ = static_cast<const PPB_Var_Deprecated*>(
dispatcher->local_get_interface()(PPB_VAR_DEPRECATED_INTERFACE));
diff --git a/ppapi/proxy/ppb_var_deprecated_proxy.h b/ppapi/proxy/ppb_var_deprecated_proxy.h
index 59400ae..195c29a 100644
--- a/ppapi/proxy/ppb_var_deprecated_proxy.h
+++ b/ppapi/proxy/ppb_var_deprecated_proxy.h
@@ -89,10 +89,11 @@ class PPB_Var_Deprecated_Proxy : public InterfaceProxy {
void SetAllowPluginReentrancy();
void DoReleaseObject(int64 object_id);
- base::WeakPtrFactory<PPB_Var_Deprecated_Proxy> task_factory_;
const PPB_Var_Deprecated* ppb_var_impl_;
+ base::WeakPtrFactory<PPB_Var_Deprecated_Proxy> task_factory_;
+
DISALLOW_COPY_AND_ASSIGN(PPB_Var_Deprecated_Proxy);
};