Debugger: remove dead feature (SkPicture offset display) & fix bug (unbalanced indents)

debugger/QT/SkDebuggerGUI.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkDebuggerGUI.h"
 #include "PictureRenderer.h"
 #include "SkPictureData.h"
@@ skipping 14 matching lines @@
 #endif
 
 
 SkDebuggerGUI::SkDebuggerGUI(QWidget *parent) :
         QMainWindow(parent)
     , fCentralSplitter(this)
     , fStatusBar(this)
     , fToolBar(this)
     , fActionOpen(this)
     , fActionBreakpoint(this)
-    , fActionToggleIndexStyle(this)
     , fActionProfile(this)
     , fActionCancel(this)
     , fActionClearBreakpoints(this)
     , fActionClearDeletes(this)
     , fActionClose(this)
     , fActionCreateBreakpoint(this)
     , fActionDelete(this)
     , fActionDirectory(this)
     , fActionGoToLine(this)
     , fActionInspector(this)
@@ skipping 26 matching lines @@
     connect(&fActionOpen, SIGNAL(triggered()), this, SLOT(openFile()));
     connect(&fActionDirectory, SIGNAL(triggered()), this, SLOT(toggleDirectory()));
     connect(&fDirectoryWidget, SIGNAL(currentItemChanged(QListWidgetItem*, QListWidgetItem*)), this, SLOT(loadFile(QListWidgetItem *)));
     connect(&fActionDelete, SIGNAL(triggered()), this, SLOT(actionDelete()));
     connect(&fListWidget, SIGNAL(itemDoubleClicked(QListWidgetItem*)), this, SLOT(toggleBreakpoint()));
     connect(&fActionRewind, SIGNAL(triggered()), this, SLOT(actionRewind()));
     connect(&fActionPlay, SIGNAL(triggered()), this, SLOT(actionPlay()));
     connect(&fActionStepBack, SIGNAL(triggered()), this, SLOT(actionStepBack()));
     connect(&fActionStepForward, SIGNAL(triggered()), this, SLOT(actionStepForward()));
     connect(&fActionBreakpoint, SIGNAL(triggered()), this, SLOT(actionBreakpoints()));
-    connect(&fActionToggleIndexStyle, SIGNAL(triggered()), this, SLOT(actionToggleIndexStyle()));
     connect(&fActionInspector, SIGNAL(triggered()), this, SLOT(actionInspector()));
     connect(&fActionSettings, SIGNAL(triggered()), this, SLOT(actionSettings()));
     connect(&fFilter, SIGNAL(activated(QString)), this, SLOT(toggleFilter(QString)));
     connect(&fActionProfile, SIGNAL(triggered()), this, SLOT(actionProfile()));
     connect(&fActionCancel, SIGNAL(triggered()), this, SLOT(actionCancel()));
     connect(&fActionClearBreakpoints, SIGNAL(triggered()), this, SLOT(actionClearBreakpoints()));
     connect(&fActionClearDeletes, SIGNAL(triggered()), this, SLOT(actionClearDeletes()));
     connect(&fActionClose, SIGNAL(triggered()), this, SLOT(actionClose()));
 #if SK_SUPPORT_GPU
     connect(&fSettingsWidget, SIGNAL(glSettingsChanged()), this, SLOT(actionGLSettingsChanged()));
@@ skipping 26 matching lines @@
 }
 
 void SkDebuggerGUI::actionBreakpoints() {
     bool breakpointsActivated = fActionBreakpoint.isChecked();
     for (int row = 0; row < fListWidget.count(); row++) {
         QListWidgetItem *item = fListWidget.item(row);
         item->setHidden(item->checkState() == Qt::Unchecked && breakpointsActivated);
     }
 }
 
-void SkDebuggerGUI::actionToggleIndexStyle() {
-    bool indexStyleToggle = fActionToggleIndexStyle.isChecked();
-    SkListWidget* list = (SkListWidget*) fListWidget.itemDelegate();
-    list->setIndexStyle(indexStyleToggle ? SkListWidget::kOffset_IndexStyle
-                                         : SkListWidget::kIndex_IndexStyle);
-    fListWidget.update();
-}
-
 void SkDebuggerGUI::showDeletes() {
     bool deletesActivated = fActionShowDeletes.isChecked();
     for (int row = 0; row < fListWidget.count(); row++) {
         QListWidgetItem *item = fListWidget.item(row);
         item->setHidden(fDebugger.isCommandVisible(row) && deletesActivated);
     }
 }
 // This is a simplification of PictureBenchmark's run with the addition of
 // clearing of the times after the first pass (in resetTimes)
 void SkDebuggerGUI::run(const SkPicture* pict,
@@ skipping 329 matching lines @@
     fActionOpen.setText("Open");
 
     QIcon breakpoint;
     breakpoint.addFile(QString::fromUtf8(":/breakpoint.png"),
             QSize(), QIcon::Normal, QIcon::Off);
     fActionBreakpoint.setShortcut(QKeySequence(tr("Ctrl+B")));
     fActionBreakpoint.setIcon(breakpoint);
     fActionBreakpoint.setText("Breakpoints");
     fActionBreakpoint.setCheckable(true);
 
-    fActionToggleIndexStyle.setShortcut(QKeySequence(tr("Ctrl+T")));
-    fActionToggleIndexStyle.setText("Toggle Index Style");
-    fActionToggleIndexStyle.setCheckable(true);
-
     QIcon cancel;
     cancel.addFile(QString::fromUtf8(":/reload.png"), QSize(),
             QIcon::Normal, QIcon::Off);
     fActionCancel.setIcon(cancel);
     fActionCancel.setText("Clear Filter");
 
     fActionClearBreakpoints.setShortcut(QKeySequence(tr("Alt+B")));
     fActionClearBreakpoints.setText("Clear Breakpoints");
 
     fActionClearDeletes.setShortcut(QKeySequence(tr("Alt+X")));
@@ skipping 197 matching lines @@
     fMenuNavigate.addAction(&fActionRewind);
     fMenuNavigate.addAction(&fActionStepBack);
     fMenuNavigate.addAction(&fActionStepForward);
     fMenuNavigate.addAction(&fActionPlay);
     fMenuNavigate.addAction(&fActionPause);
     fMenuNavigate.addAction(&fActionGoToLine);
 
     fMenuView.setTitle("View");
     fMenuView.addAction(&fActionBreakpoint);
     fMenuView.addAction(&fActionShowDeletes);
-    fMenuView.addAction(&fActionToggleIndexStyle);
     fMenuView.addAction(&fActionZoomIn);
     fMenuView.addAction(&fActionZoomOut);
 
     fMenuWindows.setTitle("Window");
     fMenuWindows.addAction(&fActionInspector);
     fMenuWindows.addAction(&fActionSettings);
     fMenuWindows.addAction(&fActionDirectory);
 
     fActionGoToLine.setText("Go to Line...");
     fActionGoToLine.setDisabled(true);
@@ skipping 62 matching lines @@
     fActionSave.setDisabled(false);
     fActionSaveAs.setDisabled(false);
     fActionPause.setChecked(false);
     fDrawCommandGeometryWidget.setDrawCommandIndex(-1);
 
     fLoading = false;
     actionPlay();
 }
 
 void SkDebuggerGUI::setupListWidget() {
+
+    SkASSERT(!strcmp("Save",
+                     SkDrawCommand::GetCommandString(SkDrawCommand::kSave_OpType)));
+    SkASSERT(!strcmp("SaveLayer",
+                     SkDrawCommand::GetCommandString(SkDrawCommand::kSaveLayer_OpType)));
+    SkASSERT(!strcmp("Restore",
+                     SkDrawCommand::GetCommandString(SkDrawCommand::kRestore_OpType)));
+    SkASSERT(!strcmp("BeginCommentGroup",
+                     SkDrawCommand::GetCommandString(SkDrawCommand::kBeginCommentGroup_OpType)));
+    SkASSERT(!strcmp("EndCommentGroup",
+                     SkDrawCommand::GetCommandString(SkDrawCommand::kEndCommentGroup_OpType)));
+
+
     fListWidget.clear();
     int counter = 0;
     int indent = 0;
     for (int i = 0; i < fDebugger.getSize(); i++) {
         QListWidgetItem *item = new QListWidgetItem();
         SkDrawCommand* command = fDebugger.getDrawCommandAt(i);
         SkString commandString = command->toString();
         item->setData(Qt::DisplayRole, commandString.c_str());
         item->setData(Qt::UserRole + 1, counter++);
 
         if (0 == strcmp("Restore", commandString.c_str()) ||
             0 == strcmp("EndCommentGroup", commandString.c_str())) {
             indent -= 10;
         }
 
         item->setData(Qt::UserRole + 3, indent);
 
         if (0 == strcmp("Save", commandString.c_str()) ||
-            0 == strcmp("Save Layer", commandString.c_str()) ||
+            0 == strcmp("SaveLayer", commandString.c_str()) ||
             0 == strcmp("BeginCommentGroup", commandString.c_str())) {
             indent += 10;
         }
 
         item->setData(Qt::UserRole + 4, -1);
-        item->setData(Qt::UserRole + 5, (int) command->offset());
 
         fListWidget.addItem(item);
     }
 }
 
 void SkDebuggerGUI::setupOverviewText(const SkTDArray<double>* typeTimes,
                                       double totTime,
                                       int numRuns) {
     SkString overview;
     fDebugger.getOverviewText(typeTimes, totTime, &overview, numRuns);
@@ skipping 29 matching lines @@
         fCanvasWidget.drawTo(fPausedRow);
     } else {
         fCanvasWidget.drawTo(fListWidget.currentRow());
     }
 }
 
 void SkDebuggerGUI::updateHit(int newHit) {
     fCommandHitBox.setText(QString::number(newHit));
 }