summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorfmalita <fmalita@chromium.org>2015-01-10 11:30:25 -0800
committerCommit bot <commit-bot@chromium.org>2015-01-10 19:31:20 +0000
commit56280c0b843f01f15ceba3cb952eb937b9cff198 (patch)
tree79d3603101360a971e1ce5bf39747460f57f9bb7 /build
parentfab341f7b6f9c7bbc739c34554c666921de87833 (diff)
downloadchromium_src-56280c0b843f01f15ceba3cb952eb937b9cff198.zip
chromium_src-56280c0b843f01f15ceba3cb952eb937b9cff198.tar.gz
chromium_src-56280c0b843f01f15ceba3cb952eb937b9cff198.tar.bz2
Revert "Remove impl-side-painting from about:flags"
This reverts commit c138f5dd7e317f141edf0e2f87a74c487174c172. Broke 2000+ layout tests (enabled content_shell impl-side painting globally?). BUG=169282 TBR=danakj@chromium.org NOTRY=true Review URL: https://codereview.chromium.org/846813002 Cr-Commit-Position: refs/heads/master@{#310990}
Diffstat (limited to 'build')
-rw-r--r--build/ios/grit_whitelist.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/build/ios/grit_whitelist.txt b/build/ios/grit_whitelist.txt
index 7fc4e1d..f8cbd8f 100644
--- a/build/ios/grit_whitelist.txt
+++ b/build/ios/grit_whitelist.txt
@@ -567,6 +567,8 @@ IDS_FLAGS_FORCE_HIGH_DPI_DESCRIPTION
IDS_FLAGS_FORCE_HIGH_DPI_NAME
IDS_FLAGS_IGNORE_GPU_BLACKLIST_DESCRIPTION
IDS_FLAGS_IGNORE_GPU_BLACKLIST_NAME
+IDS_FLAGS_IMPL_SIDE_PAINTING_DESCRIPTION
+IDS_FLAGS_IMPL_SIDE_PAINTING_NAME
IDS_FLAGS_LONG_TITLE
IDS_FLAGS_NACL_DEBUG_MASK_DESCRIPTION
IDS_FLAGS_NACL_DEBUG_MASK_NAME