summaryrefslogtreecommitdiffstats
path: root/o3d
diff options
context:
space:
mode:
authorapatrick@google.com <apatrick@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-30 20:03:17 +0000
committerapatrick@google.com <apatrick@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-30 20:03:17 +0000
commita282a138e9dce5e4d44fb7edd1ac664e8771c349 (patch)
tree885d9842958d6750693c6f4db382b66e3ec7953f /o3d
parent4083f0521b25dfe74914421f632d18e87dad4048 (diff)
downloadchromium_src-a282a138e9dce5e4d44fb7edd1ac664e8771c349.zip
chromium_src-a282a138e9dce5e4d44fb7edd1ac664e8771c349.tar.gz
chromium_src-a282a138e9dce5e4d44fb7edd1ac664e8771c349.tar.bz2
Made CHostControl use atomic reference counting because it is accessed from StreamOperation threads.
Review URL: http://codereview.chromium.org/151096 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19635 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d')
-rw-r--r--o3d/plugin/npapi_host_control/win/host_control.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/o3d/plugin/npapi_host_control/win/host_control.h b/o3d/plugin/npapi_host_control/win/host_control.h
index 0cb0075..31763e7 100644
--- a/o3d/plugin/npapi_host_control/win/host_control.h
+++ b/o3d/plugin/npapi_host_control/win/host_control.h
@@ -59,8 +59,10 @@
class NPPluginProxy;
// Class implementing an ActiveX control for containing NPAPI plugin-objects.
+// This needs to be CComMultiThreadModel because these objects are concurrently
+// AddRefed and Released from StreamOperation threads.
class ATL_NO_VTABLE CHostControl
- : public CComObjectRootEx<CComSingleThreadModel>,
+ : public CComObjectRootEx<CComMultiThreadModel>,
public CComCoClass<CHostControl, &CLSID_HostControl>,
public CComControl<CHostControl>,
// IMPORTANT IMPLEMENTATION NOTE: