diff options
| -rw-r--r-- | content/common/gpu/image_transport_surface_android.cc | 15 | ||||
| -rw-r--r-- | content/content_common.gypi | 1 | ||||
| -rw-r--r-- | content/content_gpu.gypi | 3 | ||||
| -rw-r--r-- | content/gpu/gpu_info_collector_android.cc | 30 |
4 files changed, 48 insertions, 1 deletions
diff --git a/content/common/gpu/image_transport_surface_android.cc b/content/common/gpu/image_transport_surface_android.cc new file mode 100644 index 0000000..c9e29b6 --- /dev/null +++ b/content/common/gpu/image_transport_surface_android.cc @@ -0,0 +1,15 @@ +// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "base/logging.h" +#include "content/common/gpu/image_transport_surface.h" + +// static +scoped_refptr<gfx::GLSurface> ImageTransportSurface::CreateSurface( + GpuChannelManager* manager, + GpuCommandBufferStub* stub, + gfx::PluginWindowHandle handle) { + NOTIMPLEMENTED(); + return NULL; +} diff --git a/content/content_common.gypi b/content/content_common.gypi index 5452982..318649c 100644 --- a/content/content_common.gypi +++ b/content/content_common.gypi @@ -172,6 +172,7 @@ 'common/gpu/gpu_watchdog.h', 'common/gpu/image_transport_surface.h', 'common/gpu/image_transport_surface.cc', + 'common/gpu/image_transport_surface_android.cc', 'common/gpu/image_transport_surface_linux.cc', 'common/gpu/image_transport_surface_mac.cc', 'common/gpu/image_transport_surface_win.cc', diff --git a/content/content_gpu.gypi b/content/content_gpu.gypi index 9714ae4..6afa7e2 100644 --- a/content/content_gpu.gypi +++ b/content/content_gpu.gypi @@ -1,4 +1,4 @@ -# Copyright (c) 2011 The Chromium Authors. All rights reserved. +# Copyright (c) 2012 The Chromium Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -10,6 +10,7 @@ ], 'sources': [ 'gpu/gpu_dx_diagnostics_win.cc', + 'gpu/gpu_info_collector_android.cc', 'gpu/gpu_info_collector_linux.cc', 'gpu/gpu_info_collector_mac.mm', 'gpu/gpu_info_collector_win.cc', diff --git a/content/gpu/gpu_info_collector_android.cc b/content/gpu/gpu_info_collector_android.cc new file mode 100644 index 0000000..f6c7f65 --- /dev/null +++ b/content/gpu/gpu_info_collector_android.cc @@ -0,0 +1,30 @@ +// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "content/gpu/gpu_info_collector.h" + +#include "base/logging.h" + +namespace gpu_info_collector { + +bool CollectGraphicsInfo(content::GPUInfo* gpu_info) { + // can_lose_context must be false to enable accelerated Canvas2D + gpu_info->can_lose_context = false; + gpu_info->finalized = true; + return CollectGraphicsInfoGL(gpu_info); +} + +bool CollectPreliminaryGraphicsInfo(content::GPUInfo* gpu_info) { + return true; +} + +bool CollectVideoCardInfo(content::GPUInfo* gpu_info) { + return true; +} + +bool CollectDriverInfoGL(content::GPUInfo* gpu_info) { + return true; +} + +} // namespace gpu_info_collector |