aboutsummaryrefslogtreecommitdiff
path: root/samplecode/SampleApp.cpp
diff options
context:
space:
mode:
authorreed <reed@google.com>2016-06-24 18:14:07 -0700
committerCommit bot <commit-bot@chromium.org>2016-06-24 18:14:07 -0700
commita84d6606f5f53b8e1a42d55676e4f1ea47be5575 (patch)
treeee13ed80beac1f415ddd4374a3b9cf008d8ca18c /samplecode/SampleApp.cpp
parentf8c2be3fbccc4be0ccfce25327200e07fc99fd1f (diff)
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
Diffstat (limited to 'samplecode/SampleApp.cpp')
-rw-r--r--samplecode/SampleApp.cpp9
1 files changed, 1 insertions, 8 deletions
diff --git a/samplecode/SampleApp.cpp b/samplecode/SampleApp.cpp
index b80ea44d30..a1e42e3aac 100644
--- a/samplecode/SampleApp.cpp
+++ b/samplecode/SampleApp.cpp
@@ -834,8 +834,6 @@ SampleWindow::SampleWindow(void* hwnd, int argc, char** argv, DeviceManager* dev
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 @@ bool SampleWindow::onEvent(const SkEvent& evt) {
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 @@ void SampleWindow::updateTitle() {
title.appendf(" %d bpc", fDevManager->getColorBits());
}
- if (gTreatSkColorAsSRGB) {
- title.append(" sRGB");
- }
-
this->setTitle(title.c_str());
}