| Index: chrome/test/gpu/gpu_feature_browsertest.cc
|
| diff --git a/chrome/test/gpu/gpu_feature_browsertest.cc b/chrome/test/gpu/gpu_feature_browsertest.cc
|
| index 2192831a7cadced9805915a229ad4d1c29f5aa34..ac0b590eee5d930d4f955c72543064f860a40a76 100644
|
| --- a/chrome/test/gpu/gpu_feature_browsertest.cc
|
| +++ b/chrome/test/gpu/gpu_feature_browsertest.cc
|
| @@ -293,6 +293,10 @@ IN_PROC_BROWSER_TEST_F(WebGLTest, WebGLDisabled) {
|
| RunEventTest(url, kWebGLCreationEvent, false);
|
| }
|
|
|
| +#if defined(GOOGLE_CHROME_BUILD) && defined(OS_MACOSX)
|
| +// http://crbug.com/314745
|
| +#define MultisamplingAllowed DISABLED_MultisamplingAllowed
|
| +#endif
|
| IN_PROC_BROWSER_TEST_F(GpuFeatureTest, MultisamplingAllowed) {
|
| EXPECT_FALSE(GpuDataManager::GetInstance()->IsFeatureBlacklisted(
|
| gpu::GPU_FEATURE_TYPE_MULTISAMPLING));
|
|
|