| Index: webkit/common/gpu/context_provider_in_process.h
|
| diff --git a/webkit/common/gpu/context_provider_in_process.h b/webkit/common/gpu/context_provider_in_process.h
|
| index 7953b304a9f6cabffc95b4bfcbb1a0e78f410e4d..2379dd29ce17ac91942c119188b364afd9b5e229 100644
|
| --- a/webkit/common/gpu/context_provider_in_process.h
|
| +++ b/webkit/common/gpu/context_provider_in_process.h
|
| @@ -25,12 +25,8 @@ class GrContextForWebGraphicsContext3D;
|
| class WEBKIT_GPU_EXPORT ContextProviderInProcess
|
| : NON_EXPORTED_BASE(public cc::ContextProvider) {
|
| public:
|
| - typedef base::Callback<
|
| - scoped_ptr<WebGraphicsContext3DInProcessCommandBufferImpl>(void)>
|
| - CreateCallback;
|
| -
|
| static scoped_refptr<ContextProviderInProcess> Create(
|
| - const CreateCallback& create_callback);
|
| + scoped_ptr<WebGraphicsContext3DInProcessCommandBufferImpl> context3d);
|
|
|
| // Calls Create() with a default factory method for creating an offscreen
|
| // context.
|
| @@ -52,12 +48,10 @@ class WEBKIT_GPU_EXPORT ContextProviderInProcess
|
| OVERRIDE;
|
|
|
| protected:
|
| - ContextProviderInProcess();
|
| + ContextProviderInProcess(
|
| + scoped_ptr<WebGraphicsContext3DInProcessCommandBufferImpl> context3d);
|
| virtual ~ContextProviderInProcess();
|
|
|
| - bool InitializeOnMainThread(
|
| - const CreateCallback& create_callback);
|
| -
|
| void OnLostContext();
|
| void OnSwapBuffersComplete();
|
| void OnMemoryAllocationChanged(
|
|
|