From f4e60796cf7b76ce3c313e3b507751fda3b340e3 Mon Sep 17 00:00:00 2001 From: sandersd Date: Thu, 15 Jan 2015 12:30:52 -0800 Subject: [PATCH] Revert of Revert of Remove accelerated hardware decode blacklist entry for Mac OS X. (patchset #1 id:1 of https://codereview.chromium.org/853563003/) Reason for revert: Test failure corrected by: https://crrev.com/81a119ffed1edbb462b51ed5b25a421bb9a03298 Cr-Commit-Position: refs/heads/master@{#311726} Original issue's description: > Revert of Remove accelerated hardware decode blacklist entry for Mac OS X. (patchset #2 id:20001 of https://codereview.chromium.org/849143002/) > > Reason for revert: > This seems related to the regression here: > https://build.chromium.org/p/chromium.gpu/builders/Mac%20Release%20%28Intel%29/builds/45738 > > Original issue's description: > > Remove accelerated hardware decode blacklist entry for Mac OS X. > > > > Now that VTVideoDecodeAccelerator exists, this entry is not necessary. > > > > BUG=133828 > > > > Committed: https://crrev.com/c0e69446b02848fce2e311662a43b8e782304ae3 > > Cr-Commit-Position: refs/heads/master@{#311622} > > TBR=scherkus@chromium.org,sievers@chromium.org,sandersd@chromium.org > NOTREECHECKS=true > NOTRY=true > BUG=133828 > > Committed: https://crrev.com/17202a5a52388cf6e0807a243364f6c995eb82a1 > Cr-Commit-Position: refs/heads/master@{#311659} TBR=scherkus@chromium.org,sievers@chromium.org,ricow@google.com NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=133828 Review URL: https://codereview.chromium.org/857433002 Cr-Commit-Position: refs/heads/master@{#311727} --- chrome/browser/about_flags.cc | 2 +- gpu/config/software_rendering_list_json.cc | 26 ++++++-------------------- 2 files changed, 7 insertions(+), 21 deletions(-) diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc index 05d55c879492..6a15037a89c3 100644 --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc @@ -916,7 +916,7 @@ const Experiment kExperiments[] = { { "disable-accelerated-video-decode", IDS_FLAGS_DISABLE_ACCELERATED_VIDEO_DECODE_NAME, IDS_FLAGS_DISABLE_ACCELERATED_VIDEO_DECODE_DESCRIPTION, - kOsWin | kOsCrOS, + kOsMac | kOsWin | kOsCrOS, SINGLE_VALUE_TYPE(switches::kDisableAcceleratedVideoDecode), }, #if defined(USE_ASH) diff --git a/gpu/config/software_rendering_list_json.cc b/gpu/config/software_rendering_list_json.cc index e1a8cb35c6ae..b82205644e4b 100644 --- a/gpu/config/software_rendering_list_json.cc +++ b/gpu/config/software_rendering_list_json.cc @@ -18,7 +18,7 @@ const char kSoftwareRenderingListJson[] = LONG_STRING_CONST( { "name": "software rendering list", // Please update the version number whenever you change this file. - "version": "9.15", + "version": "9.16", "entries": [ { "id": 1, @@ -508,25 +508,11 @@ const char kSoftwareRenderingListJson[] = LONG_STRING_CONST( }, { "id": 48, - "description": "Accelerated video decode is unavailable on Mac and Linux", - "cr_bugs": [137247, 133828], - "exceptions": [ - { - "os": { - "type": "chromeos" - } - }, - { - "os": { - "type": "win" - } - }, - { - "os": { - "type": "android" - } - } - ], + "description": "Accelerated video decode is unavailable on Linux", + "cr_bugs": [137247], + "os": { + "type": "linux" + }, "features": [ "accelerated_video_decode" ] -- 2.11.4.GIT