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

Side by Side Diff: content/renderer/pepper/pepper_platform_context_3d_impl.h

Issue 11267035: Fix layering violation where content is included by gpu. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove NOTIMPLEMENTED entrypoints Created 8 years, 1 month 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CONTENT_RENDERER_PEPPER_PEPPER_PLATFORM_CONTEXT_3D_IMPL_H_ 5 #ifndef CONTENT_RENDERER_PEPPER_PEPPER_PLATFORM_CONTEXT_3D_IMPL_H_
6 #define CONTENT_RENDERER_PEPPER_PEPPER_PLATFORM_CONTEXT_3D_IMPL_H_ 6 #define CONTENT_RENDERER_PEPPER_PEPPER_PLATFORM_CONTEXT_3D_IMPL_H_
7 7
8 #include "base/callback.h" 8 #include "base/callback.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/memory/ref_counted.h" 10 #include "base/memory/ref_counted.h"
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 bool InitRaw(); 49 bool InitRaw();
50 void OnContextLost(); 50 void OnContextLost();
51 void OnConsoleMessage(const std::string& msg, int id); 51 void OnConsoleMessage(const std::string& msg, int id);
52 52
53 // Implicitly weak pointer; must outlive this instance. 53 // Implicitly weak pointer; must outlive this instance.
54 PepperParentContextProvider* parent_context_provider_; 54 PepperParentContextProvider* parent_context_provider_;
55 base::WeakPtr<WebGraphicsContext3DCommandBufferImpl> parent_context_; 55 base::WeakPtr<WebGraphicsContext3DCommandBufferImpl> parent_context_;
56 scoped_refptr<GpuChannelHost> channel_; 56 scoped_refptr<GpuChannelHost> channel_;
57 unsigned int parent_texture_id_; 57 unsigned int parent_texture_id_;
58 bool has_alpha_; 58 bool has_alpha_;
59 CommandBufferProxy* command_buffer_; 59 CommandBufferProxyImpl* command_buffer_;
60 base::Closure context_lost_callback_; 60 base::Closure context_lost_callback_;
61 ConsoleMessageCallback console_message_callback_; 61 ConsoleMessageCallback console_message_callback_;
62 base::WeakPtrFactory<PlatformContext3DImpl> weak_ptr_factory_; 62 base::WeakPtrFactory<PlatformContext3DImpl> weak_ptr_factory_;
63 }; 63 };
64 64
65 } // namespace content 65 } // namespace content
66 66
67 #endif // ENABLE_GPU 67 #endif // ENABLE_GPU
68 68
69 #endif // CONTENT_RENDERER_PEPPER_PEPPER_PLATFORM_CONTEXT_3D_IMPL_H_ 69 #endif // CONTENT_RENDERER_PEPPER_PEPPER_PLATFORM_CONTEXT_3D_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698