Reland "Merge GrOpList and GrRTOpList and rename to GrOpsTask."
This reverts commit f21bf9e50bb175eb151e90a01d7f8351da0802f8.
Reason for revert: relanding with infra fix
Original change's description:
> Revert "Merge GrOpList and GrRTOpList and rename to GrOpsTask."
>
> This reverts commit 2a5954140b49d18e5161a30a4ae2c7ac28bc1993.
>
> Reason for revert: breaking everything
>
> Original change's description:
> > Merge GrOpList and GrRTOpList and rename to GrOpsTask.
> >
> > Change-Id: I8f4f2218a30fd0541a8f79f7bb9850f9500cd243
> > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/236343
> > Commit-Queue: Greg Daniel <egdaniel@google.com>
> > Reviewed-by: Brian Salomon <bsalomon@google.com>
>
> TBR=egdaniel@google.com,bsalomon@google.com,robertphillips@google.com
>
> Change-Id: I27840ea0343e8e6b388556afb7bd2e76386d611d
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/236349
> Reviewed-by: Greg Daniel <egdaniel@google.com>
> Commit-Queue: Greg Daniel <egdaniel@google.com>
TBR=egdaniel@google.com,bsalomon@google.com,robertphillips@google.com
Change-Id: Ibd3a06e4a91dbb1f225dcc8d17d0db3967b6f85f
No-Presubmit: true
No-Tree-Checks: true
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/236350
Commit-Queue: Greg Daniel <egdaniel@google.com>
Reviewed-by: Greg Daniel <egdaniel@google.com>
diff --git a/tools/mdbviz/mainwindow.cpp b/tools/mdbviz/mainwindow.cpp
index 5f5746b..e36f81a 100644
--- a/tools/mdbviz/mainwindow.cpp
+++ b/tools/mdbviz/mainwindow.cpp
@@ -27,8 +27,8 @@
}
}
-void MainWindow::setupOpListWidget() {
- fOpListWidget->clear();
+void MainWindow::setupOpsTaskWidget() {
+ fOpsTaskWidget->clear();
QTreeWidgetItem* item = nullptr;
SkTDArray<QTreeWidgetItem*> parents;
@@ -45,7 +45,7 @@
}
if (parents.isEmpty()) {
- fOpListWidget->addTopLevelItem(item);
+ fOpsTaskWidget->addTopLevelItem(item);
} else {
parents.top()->addChild(item);
}
@@ -55,8 +55,8 @@
}
}
- fOpListWidget->setCurrentItem(item);
- fOpListWidget->expandToDepth(100);
+ fOpsTaskWidget->setCurrentItem(item);
+ fOpsTaskWidget->expandToDepth(100);
}
void MainWindow::presentCurrentRenderState() {
@@ -87,7 +87,7 @@
return;
}
- this->setupOpListWidget();
+ this->setupOpsTaskWidget();
this->presentCurrentRenderState();
#ifndef QT_NO_CURSOR
@@ -147,25 +147,25 @@
// Op List Window
{
- QDockWidget* opListDock = new QDockWidget("Ops", this);
- opListDock->setAllowedAreas(Qt::LeftDockWidgetArea);
+ QDockWidget* opsTaskDock = new QDockWidget("Ops", this);
+ opsTaskDock->setAllowedAreas(Qt::LeftDockWidgetArea);
- fOpListWidget = new QTreeWidget(opListDock);
+ fOpsTaskWidget = new QTreeWidget(opsTaskDock);
QTreeWidgetItem* headerItem = new QTreeWidgetItem;
headerItem->setText(0, "Index");
headerItem->setText(1, "Op Name");
- fOpListWidget->setHeaderItem(headerItem);
+ fOpsTaskWidget->setHeaderItem(headerItem);
- fOpListWidget->header()->setSectionResizeMode(0, QHeaderView::ResizeToContents);
- fOpListWidget->header()->setSectionResizeMode(1, QHeaderView::ResizeToContents);
+ fOpsTaskWidget->header()->setSectionResizeMode(0, QHeaderView::ResizeToContents);
+ fOpsTaskWidget->header()->setSectionResizeMode(1, QHeaderView::ResizeToContents);
- opListDock->setWidget(fOpListWidget);
- this->addDockWidget(Qt::LeftDockWidgetArea, opListDock);
+ opsTaskDock->setWidget(fOpsTaskWidget);
+ this->addDockWidget(Qt::LeftDockWidgetArea, opsTaskDock);
- fViewMenu->addAction(opListDock->toggleViewAction());
+ fViewMenu->addAction(opsTaskDock->toggleViewAction());
- connect(fOpListWidget, SIGNAL(currentItemChanged(QTreeWidgetItem*,QTreeWidgetItem*)),
+ connect(fOpsTaskWidget, SIGNAL(currentItemChanged(QTreeWidgetItem*,QTreeWidgetItem*)),
this, SLOT(onCurrentItemChanged(QTreeWidgetItem*, QTreeWidgetItem*)));
}