Support for ozone graphics in content.

BUG=178543

Review URL: https://chromiumcodereview.appspot.com/14985005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@202749 0039d316-1c4b-4281-b951-d872f2087c98

content/common/gpu/image_transport_surface_x11.cc → content/common/gpu/image_transport_surface_linux.cc

-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 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.
 

content/content_common.gypi

@@ -235,9 +235,9 @@
     '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',
-    'common/gpu/image_transport_surface_x11.cc',
     'common/gpu/media/h264_bit_reader.cc',
     'common/gpu/media/h264_bit_reader.h',
     'common/gpu/media/h264_parser.cc',

gpu/config/gpu_info_collector_ozone.cc

+// Copyright 2013 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 "gpu/config/gpu_info_collector.h"
+
+#include "base/logging.h"
+
+namespace gpu {
+
+bool CollectContextGraphicsInfo(GPUInfo* gpu_info) {
+  return CollectBasicGraphicsInfo(gpu_info);
+}
+
+GpuIDResult CollectGpuID(uint32* vendor_id, uint32* device_id) {
+  DCHECK(vendor_id && device_id);
+  *vendor_id = 0;
+  *device_id = 0;
+  return kGpuIDNotSupported;
+}
+
+bool CollectBasicGraphicsInfo(GPUInfo* gpu_info) {
+  gpu_info->can_lose_context = false;
+  return true;
+}
+
+bool CollectDriverInfoGL(GPUInfo* gpu_info) {
+  NOTIMPLEMENTED();
+  return false;
+}
+
+void MergeGPUInfo(GPUInfo* basic_gpu_info,
+                  const GPUInfo& context_gpu_info) {
+  MergeGPUInfoGL(basic_gpu_info, context_gpu_info);
+}
+
+}  // namespace gpu_info_collector

gpu/gpu_config.gypi

@@ -29,6 +29,7 @@
     'config/gpu_info.h',
     'config/gpu_info_collector_android.cc',
     'config/gpu_info_collector_mac.mm',
+    'config/gpu_info_collector_ozone.cc',
     'config/gpu_info_collector_win.cc',
     'config/gpu_info_collector_x11.cc',
     'config/gpu_info_collector.cc',