Revert of Add gpu implementation of OverdrawXfermode (patchset #6 id:100001 of https://codereview.chromium.org/1607253002/ )

Reason for revert:
Overdraw Xfer mode using new fangled glsl features

Original issue's description:
> Add gpu implementation of OverdrawXfermode
> GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1607253002
>
> Committed: https://skia.googlesource.com/skia/+/8bc3cf88bbf5e5d5724356f076931bb70a6117ba

TBR=egdaniel@google.com
# Not skipping CQ checks because original CL landed more than 1 days ago.

Review URL: https://codereview.chromium.org/1626443002

2 files changed, 4 insertions, 10 deletions

diff --git a/debugger/QT/SkDebuggerGUI.cpp b/debugger/QT/SkDebuggerGUI.cpp
index 0c369f6113..0d009b3ffa 100644
--- a/debugger/QT/SkDebuggerGUI.cpp
+++ b/debugger/QT/SkDebuggerGUI.cpp
@@ -202,6 +202,7 @@ void SkDebuggerGUI::actionPlay() {
 void SkDebuggerGUI::actionRasterSettingsChanged() {
     fCanvasWidget.setWidgetVisibility(SkCanvasWidget::kRaster_8888_WidgetType,
                                       !fSettingsWidget.isRasterEnabled());
+    fDebugger.setOverdrawViz(fSettingsWidget.isOverdrawVizEnabled());
     this->updateImage();
 }
 
@@ -209,7 +210,6 @@ void SkDebuggerGUI::actionVisualizationsChanged() {
     fDebugger.setMegaViz(fSettingsWidget.isMegaVizEnabled());
     fDebugger.setPathOps(fSettingsWidget.isPathOpsEnabled());
     fDebugger.highlightCurrentCommand(fSettingsWidget.isVisibilityFilterEnabled());
-    fDebugger.setOverdrawViz(fSettingsWidget.isOverdrawVizEnabled());
     this->updateImage();
 }
 
diff --git a/debugger/QT/SkSettingsWidget.cpp b/debugger/QT/SkSettingsWidget.cpp
index 4665217bd8..59b7920383 100644
--- a/debugger/QT/SkSettingsWidget.cpp
+++ b/debugger/QT/SkSettingsWidget.cpp
@@ -21,36 +21,30 @@ SkSettingsWidget::SkSettingsWidget() : QFrame()
 
     // Visualizations toggles.
     fVisualizationsGroup.setTitle("Visualizations");
-
     fVisibilityFilterCheckBox.setText("Visibility Filter");
     fVisualizationsLayout.addWidget(&fVisibilityFilterCheckBox);
-
     fMegaVizCheckBox.setText("Mega Viz");
     fVisualizationsLayout.addWidget(&fMegaVizCheckBox);
-
     fPathOpsCheckBox.setText("PathOps ");
     fVisualizationsLayout.addWidget(&fPathOpsCheckBox);
-
-    fOverdrawVizCheckBox.setText("Overdraw Viz");
-    fVisualizationsLayout.addWidget(&fOverdrawVizCheckBox);
-
     fVisualizationsGroup.setLayout(&fVisualizationsLayout);
-
     connect(&fVisibilityFilterCheckBox, SIGNAL(toggled(bool)), this,
             SIGNAL(visualizationsChanged()));
     connect(&fMegaVizCheckBox, SIGNAL(toggled(bool)), this, SIGNAL(visualizationsChanged()));
     connect(&fPathOpsCheckBox, SIGNAL(toggled(bool)), this, SIGNAL(visualizationsChanged()));
-    connect(&fOverdrawVizCheckBox, SIGNAL(toggled(bool)), this, SIGNAL(visualizationsChanged()));
 
     fVerticalLayout.addRow(&fVisualizationsGroup);
 
     // Raster toggles.
     fRasterGroup.setTitle("Raster");
     fRasterGroup.setCheckable(true);
+    fOverdrawVizCheckBox.setText("Overdraw Viz");
+    fRasterLayout.addWidget(&fOverdrawVizCheckBox);
     fRasterGroup.setLayout(&fRasterLayout);
     fVerticalLayout.addRow(&fRasterGroup);
 
     connect(&fRasterGroup, SIGNAL(toggled(bool)), this, SIGNAL(rasterSettingsChanged()));
+    connect(&fOverdrawVizCheckBox, SIGNAL(toggled(bool)), this, SIGNAL(rasterSettingsChanged()));
 
 #if SK_SUPPORT_GPU
     fGLGroup.setTitle("OpenGL");