diff options
author | robertphillips <robertphillips@google.com> | 2016-01-27 05:00:04 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-01-27 05:00:04 -0800 |
commit | f42fca4027ed4f235ef927786813a5ed0e6652b9 (patch) | |
tree | 8d9bf99cc3bbb33651c4412d80ebab1381531c58 /debugger | |
parent | 5ba2b9612ae4bc3a244bf45f1ec55c3a5a41e181 (diff) |
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
Review URL: https://codereview.chromium.org/1607253002
Diffstat (limited to 'debugger')
-rw-r--r-- | debugger/QT/SkDebuggerGUI.cpp | 2 | ||||
-rw-r--r-- | debugger/QT/SkSettingsWidget.cpp | 12 |
2 files changed, 10 insertions, 4 deletions
diff --git a/debugger/QT/SkDebuggerGUI.cpp b/debugger/QT/SkDebuggerGUI.cpp index 0d009b3ffa..0c369f6113 100644 --- a/debugger/QT/SkDebuggerGUI.cpp +++ b/debugger/QT/SkDebuggerGUI.cpp @@ -202,7 +202,6 @@ void SkDebuggerGUI::actionPlay() { void SkDebuggerGUI::actionRasterSettingsChanged() { fCanvasWidget.setWidgetVisibility(SkCanvasWidget::kRaster_8888_WidgetType, !fSettingsWidget.isRasterEnabled()); - fDebugger.setOverdrawViz(fSettingsWidget.isOverdrawVizEnabled()); this->updateImage(); } @@ -210,6 +209,7 @@ 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 59b7920383..4665217bd8 100644 --- a/debugger/QT/SkSettingsWidget.cpp +++ b/debugger/QT/SkSettingsWidget.cpp @@ -21,30 +21,36 @@ 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"); |