| Index: gpu/config/gpu_test_expectations_parser.cc
|
| diff --git a/gpu/config/gpu_test_expectations_parser.cc b/gpu/config/gpu_test_expectations_parser.cc
|
| index ca4031d92c3167f6da29c897d405bbe42183fe72..4a86940fa5f17bf16df1dff5a5f52862946219ec 100644
|
| --- a/gpu/config/gpu_test_expectations_parser.cc
|
| +++ b/gpu/config/gpu_test_expectations_parser.cc
|
| @@ -31,6 +31,7 @@ enum Token {
|
| kConfigWinVista,
|
| kConfigWin7,
|
| kConfigWin8,
|
| + kConfigWin10,
|
| kConfigWin,
|
| kConfigMacLeopard,
|
| kConfigMacSnowLeopard,
|
| @@ -78,6 +79,7 @@ const TokenInfo kTokenData[] = {
|
| { "vista", GPUTestConfig::kOsWinVista },
|
| { "win7", GPUTestConfig::kOsWin7 },
|
| { "win8", GPUTestConfig::kOsWin8 },
|
| + { "win10", GPUTestConfig::kOsWin10 },
|
| { "win", GPUTestConfig::kOsWin },
|
| { "leopard", GPUTestConfig::kOsMacLeopard },
|
| { "snowleopard", GPUTestConfig::kOsMacSnowLeopard },
|
| @@ -231,6 +233,7 @@ bool GPUTestExpectationsParser::ParseConfig(
|
| case kConfigWinVista:
|
| case kConfigWin7:
|
| case kConfigWin8:
|
| + case kConfigWin10:
|
| case kConfigWin:
|
| case kConfigMacLeopard:
|
| case kConfigMacSnowLeopard:
|
| @@ -283,6 +286,7 @@ bool GPUTestExpectationsParser::ParseLine(
|
| case kConfigWinVista:
|
| case kConfigWin7:
|
| case kConfigWin8:
|
| + case kConfigWin10:
|
| case kConfigWin:
|
| case kConfigMacLeopard:
|
| case kConfigMacSnowLeopard:
|
| @@ -398,6 +402,7 @@ bool GPUTestExpectationsParser::UpdateTestConfig(
|
| case kConfigWinVista:
|
| case kConfigWin7:
|
| case kConfigWin8:
|
| + case kConfigWin10:
|
| case kConfigWin:
|
| case kConfigMacLeopard:
|
| case kConfigMacSnowLeopard:
|
|
|