Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4935)

Unified Diff: chrome/renderer/pepper_platform_context_3d_impl.h

Issue 6711013: Fix crash with pepper 3D on multiple windows in same renderer (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/renderer/pepper_platform_context_3d_impl.cc » ('j') | content/renderer/ggl.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/renderer/pepper_platform_context_3d_impl.h
diff --git a/chrome/renderer/pepper_platform_context_3d_impl.h b/chrome/renderer/pepper_platform_context_3d_impl.h
index dedbc798ef3c46dced6813c7c92dfd560139fee1..cb036835fff0ad50fdc69b440db591aa0d0d2dba 100644
--- a/chrome/renderer/pepper_platform_context_3d_impl.h
+++ b/chrome/renderer/pepper_platform_context_3d_impl.h
@@ -7,6 +7,7 @@
#include "base/callback.h"
#include "base/scoped_callback_factory.h"
#include "base/scoped_ptr.h"
+#include "base/weak_ptr.h"
#include "webkit/plugins/ppapi/plugin_delegate.h"
#ifdef ENABLE_GPU
@@ -42,7 +43,7 @@ class PlatformContext3DImpl
bool InitRaw();
void OnContextLost();
- ggl::Context* parent_context_;
+ base::WeakPtr<ggl::Context> parent_context_;
scoped_refptr<GpuChannelHost> channel_;
unsigned int parent_texture_id_;
CommandBufferProxy* command_buffer_;
« no previous file with comments | « no previous file | chrome/renderer/pepper_platform_context_3d_impl.cc » ('j') | content/renderer/ggl.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698