summaryrefslogtreecommitdiffstats
path: root/ppapi/proxy/host_dispatcher.cc
diff options
context:
space:
mode:
authordmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-12 19:38:55 +0000
committerdmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-12 19:38:55 +0000
commit73097564b57bad21efbb72e49a0edf0d13e9c249 (patch)
tree3f0e4f402f6fc1252765260241199519a94ce5e3 /ppapi/proxy/host_dispatcher.cc
parenta21d8087f7ca0a8ccf2d07344b7dcfa34d455886 (diff)
downloadchromium_src-73097564b57bad21efbb72e49a0edf0d13e9c249.zip
chromium_src-73097564b57bad21efbb72e49a0edf0d13e9c249.tar.gz
chromium_src-73097564b57bad21efbb72e49a0edf0d13e9c249.tar.bz2
Reland 9034035: Make it possible to have 1 PpapiGlobals per thread.
Original CL: r117399, http://codereview.chromium.org/9034035/ Reverted in r117414, http://codereview.chromium.org/9139054/ due to a static initializer. This is the same as r117399 except using a LazyInstance to eliminate the static initializer. BUG= TEST= TBR=dmichael@chromium.org Review URL: http://codereview.chromium.org/9187055 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@117475 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/proxy/host_dispatcher.cc')
-rw-r--r--ppapi/proxy/host_dispatcher.cc6
1 files changed, 2 insertions, 4 deletions
diff --git a/ppapi/proxy/host_dispatcher.cc b/ppapi/proxy/host_dispatcher.cc
index 1205189..efd1f56 100644
--- a/ppapi/proxy/host_dispatcher.cc
+++ b/ppapi/proxy/host_dispatcher.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -71,9 +71,7 @@ HostDispatcher::HostDispatcher(base::ProcessHandle remote_process_handle,
g_module_to_dispatcher = new ModuleToDispatcherMap;
(*g_module_to_dispatcher)[pp_module_] = this;
- const PPB_Var* var_interface =
- static_cast<const PPB_Var*>(local_get_interface(PPB_VAR_INTERFACE));
- SetSerializationRules(new HostVarSerializationRules(var_interface, module));
+ SetSerializationRules(new HostVarSerializationRules(module));
ppb_proxy_ = reinterpret_cast<const PPB_Proxy_Private*>(
local_get_interface(PPB_PROXY_PRIVATE_INTERFACE));