commit a84d6606f5f53b8e1a42d55676e4f1ea47be5575
author reed <reed@google.com> Fri Jun 24 18:14:07 2016 -0700
committer Commit bot <commit-bot@chromium.org> Fri Jun 24 18:14:07 2016 -0700
tree ee13ed80beac1f415ddd4374a3b9cf008d8ca18c
parent f8c2be3fbccc4be0ccfce25327200e07fc99fd1f

remove experimental treat-skcolor-as-srgb flag

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2097003003

Review-Url: https://codereview.chromium.org/2097003003

samplecode/SampleApp.cpp

diff --git a/samplecode/SampleApp.cpp b/samplecode/SampleApp.cpp
index b80ea44..a1e42e3 100644
--- a/samplecode/SampleApp.cpp
+++ b/samplecode/SampleApp.cpp
@@ -834,8 +834,6 @@
     itemID = fAppMenu->appendList("ColorType", "ColorType", sinkID, 0,
                                   gConfig[0].fName, gConfig[1].fName, gConfig[2].fName, nullptr);
     fAppMenu->assignKeyEquivalentToItem(itemID, 'C');
-    itemID = fAppMenu->appendSwitch("sRGB SkColor", "sRGB SkColor", sinkID, gTreatSkColorAsSRGB);
-    fAppMenu->assignKeyEquivalentToItem(itemID, 'S');
 
     itemID = fAppMenu->appendList("Device Type", "Device Type", sinkID, 0,
                                   "Raster",
@@ -1549,8 +1547,7 @@
         SkOSMenu::FindListIndex(evt, "Hinting", &fHintingState) ||
         SkOSMenu::FindSwitchState(evt, "Clip", &fUseClip) ||
         SkOSMenu::FindSwitchState(evt, "Zoomer", &fShowZoomer) ||
-        SkOSMenu::FindSwitchState(evt, "Magnify", &fMagnify) ||
-        SkOSMenu::FindSwitchState(evt, "sRGB SkColor", &gTreatSkColorAsSRGB))
+        SkOSMenu::FindSwitchState(evt, "Magnify", &fMagnify))
     {
         this->inval(nullptr);
         this->updateTitle();
@@ -2060,10 +2057,6 @@
         title.appendf(" %d bpc", fDevManager->getColorBits());
     }
 
-    if (gTreatSkColorAsSRGB) {
-        title.append(" sRGB");
-    }
-
     this->setTitle(title.c_str());
 }