content/gpu/gpu_info_unittest_win.cc - Issue 6793054: Moved code that runs in both the browser and GPU process from content/gpu to content/common/gpu.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: content/gpu/gpu_info_unittest_win.cc

Issue 6793054: Moved code that runs in both the browser and GPU process from content/gpu to content/common/gpu. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: '' Created 9 years, 8 months 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

« no previous file with comments | « content/gpu/gpu_info_collector_unittest.cc ('k') | content/gpu/gpu_main.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2011 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 #include "base/memory/scoped_ptr.h"	5 #include "base/memory/scoped_ptr.h"

6 #include "content/common/gpu_info.h"	6 #include "content/common/gpu/gpu_info.h"

7 #include "content/gpu/gpu_idirect3d9_mock_win.h"	7 #include "content/gpu/gpu_idirect3d9_mock_win.h"

8 #include "content/gpu/gpu_info_collector.h"	8 #include "content/gpu/gpu_info_collector.h"

9 #include "testing/gmock/include/gmock/gmock.h"	9 #include "testing/gmock/include/gmock/gmock.h"

10 #include "testing/gtest/include/gtest/gtest.h"	10 #include "testing/gtest/include/gtest/gtest.h"

11	11

12 using ::testing::_;	12 using ::testing::_;

13 using ::testing::Return;	13 using ::testing::Return;

14 using ::testing::SetArgumentPointee;	14 using ::testing::SetArgumentPointee;

15	15

16 class GPUInfoTest : public testing::Test {	16 class GPUInfoTest : public testing::Test {

(...skipping 31 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
48 GPUInfo gpu_info;	48 GPUInfo gpu_info;

49 ASSERT_TRUE(gpu_info_collector::CollectGraphicsInfoD3D(&d3d_, &gpu_info));	49 ASSERT_TRUE(gpu_info_collector::CollectGraphicsInfoD3D(&d3d_, &gpu_info));

50 EXPECT_EQ(gpu_info.pixel_shader_version, "3.0");	50 EXPECT_EQ(gpu_info.pixel_shader_version, "3.0");

51 }	51 }

52	52

53 TEST_F(GPUInfoTest, VertexShaderVersionD3D) {	53 TEST_F(GPUInfoTest, VertexShaderVersionD3D) {

54 GPUInfo gpu_info;	54 GPUInfo gpu_info;

55 ASSERT_TRUE(gpu_info_collector::CollectGraphicsInfoD3D(&d3d_, &gpu_info));	55 ASSERT_TRUE(gpu_info_collector::CollectGraphicsInfoD3D(&d3d_, &gpu_info));

56 EXPECT_EQ(gpu_info.vertex_shader_version, "3.0");	56 EXPECT_EQ(gpu_info.vertex_shader_version, "3.0");

57 }	57 }

OLD	NEW