| Index: content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h
|
| diff --git a/content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h b/content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h
|
| index b556c1bcdf546ae823012219686463d69e89e186..6ce0ccae912c3b8d471de543d382c486e472923a 100644
|
| --- a/content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h
|
| +++ b/content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h
|
| @@ -24,7 +24,6 @@
|
| #include "third_party/WebKit/public/platform/WebString.h"
|
| #include "ui/gfx/native_widget_types.h"
|
| #include "ui/gl/gpu_preference.h"
|
| -#include "url/gurl.h"
|
|
|
| namespace gpu {
|
|
|
| @@ -109,7 +108,7 @@ class WebGraphicsContext3DCommandBufferImpl
|
|
|
| WebGraphicsContext3DCommandBufferImpl(
|
| int surface_id,
|
| - const GURL& active_url,
|
| + const std::string& active_url,
|
| GpuChannelHost* host,
|
| const Attributes& attributes,
|
| bool lose_context_when_out_of_memory,
|
| @@ -135,13 +134,12 @@ class WebGraphicsContext3DCommandBufferImpl
|
| // Create & initialize a WebGraphicsContext3DCommandBufferImpl. Return NULL
|
| // on any failure.
|
| static CONTENT_EXPORT WebGraphicsContext3DCommandBufferImpl*
|
| - CreateOffscreenContext(
|
| - GpuChannelHost* host,
|
| - const WebGraphicsContext3D::Attributes& attributes,
|
| - bool lose_context_when_out_of_memory,
|
| - const GURL& active_url,
|
| - const SharedMemoryLimits& limits,
|
| - WebGraphicsContext3DCommandBufferImpl* share_context);
|
| + CreateOffscreenContext(GpuChannelHost* host,
|
| + const WebGraphicsContext3D::Attributes& attributes,
|
| + bool lose_context_when_out_of_memory,
|
| + const std::string& active_url,
|
| + const SharedMemoryLimits& limits,
|
| + WebGraphicsContext3DCommandBufferImpl* share_context);
|
|
|
| size_t GetMappedMemoryLimit() {
|
| return mem_limits_.mapped_memory_reclaim_limit;
|
| @@ -196,7 +194,7 @@ class WebGraphicsContext3DCommandBufferImpl
|
| // State needed by MaybeInitializeGL.
|
| scoped_refptr<GpuChannelHost> host_;
|
| int32_t surface_id_;
|
| - GURL active_url_;
|
| + std::string active_url_;
|
| CommandBufferContextType context_type_;
|
|
|
| gfx::GpuPreference gpu_preference_;
|
|
|