Allow debugger to be compiled without Ganesh
https://codereview.appspot.com/7311084/
git-svn-id: http://skia.googlecode.com/svn/trunk@7710 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/debugger/QT/SkCanvasWidget.cpp b/debugger/QT/SkCanvasWidget.cpp
index 63a0e05..0350b3d 100644
--- a/debugger/QT/SkCanvasWidget.cpp
+++ b/debugger/QT/SkCanvasWidget.cpp
@@ -13,7 +13,9 @@
SkDebugger* debugger) : QWidget(parent)
, fHorizontalLayout(this)
, fRasterWidget(debugger)
+#if SK_SUPPORT_GPU
, fGLWidget(debugger)
+#endif
{
fDebugger = debugger;
@@ -22,16 +24,22 @@
fHorizontalLayout.setContentsMargins(0,0,0,0);
fRasterWidget.setSizePolicy(QSizePolicy::Expanding,
QSizePolicy::Expanding);
+#if SK_SUPPORT_GPU
fGLWidget.setSizePolicy(QSizePolicy::Expanding,
QSizePolicy::Expanding);
+#endif
fHorizontalLayout.addWidget(&fRasterWidget);
+#if SK_SUPPORT_GPU
fHorizontalLayout.addWidget(&fGLWidget);
+#endif
fPreviousPoint.set(0,0);
fUserMatrix.reset();
+#if SK_SUPPORT_GPU
setWidgetVisibility(kGPU_WidgetType, true);
+#endif
connect(&fRasterWidget, SIGNAL(drawComplete()),
this->parentWidget(), SLOT(drawComplete()));
}
@@ -41,7 +49,9 @@
void SkCanvasWidget::drawTo(int index) {
fDebugger->setIndex(index);
fRasterWidget.draw();
+#if SK_SUPPORT_GPU
fGLWidget.draw();
+#endif
emit commandChanged(fDebugger->index());
}
@@ -111,9 +121,12 @@
void SkCanvasWidget::setWidgetVisibility(WidgetType type, bool isHidden) {
if (type == kRaster_8888_WidgetType) {
fRasterWidget.setHidden(isHidden);
- } else if (type == kGPU_WidgetType) {
+ }
+#if SK_SUPPORT_GPU
+ else if (type == kGPU_WidgetType) {
fGLWidget.setHidden(isHidden);
}
+#endif
}
void SkCanvasWidget::zoom(float scale, int px, int py) {
diff --git a/debugger/QT/SkCanvasWidget.h b/debugger/QT/SkCanvasWidget.h
index f6bc618..0dcb470 100644
--- a/debugger/QT/SkCanvasWidget.h
+++ b/debugger/QT/SkCanvasWidget.h
@@ -27,7 +27,9 @@
enum WidgetType {
kRaster_8888_WidgetType = 1 << 0,
+#if SK_SUPPORT_GPU
kGPU_WidgetType = 1 << 1,
+#endif
};
void drawTo(int index);
@@ -58,7 +60,9 @@
private:
QHBoxLayout fHorizontalLayout;
SkRasterWidget fRasterWidget;
+#if SK_SUPPORT_GPU
SkGLWidget fGLWidget;
+#endif
SkDebugger* fDebugger;
SkIPoint fPreviousPoint;
SkMatrix fUserMatrix;
diff --git a/debugger/QT/SkDebuggerGUI.cpp b/debugger/QT/SkDebuggerGUI.cpp
index a823c19..fba7a1e 100644
--- a/debugger/QT/SkDebuggerGUI.cpp
+++ b/debugger/QT/SkDebuggerGUI.cpp
@@ -87,7 +87,9 @@
connect(&fActionClearDeletes, SIGNAL(triggered()), this, SLOT(actionClearDeletes()));
connect(&fActionClose, SIGNAL(triggered()), this, SLOT(actionClose()));
connect(fSettingsWidget.getVisibilityButton(), SIGNAL(toggled(bool)), this, SLOT(actionCommandFilter()));
+#if SK_SUPPORT_GPU
connect(fSettingsWidget.getGLCheckBox(), SIGNAL(toggled(bool)), this, SLOT(actionGLWidget(bool)));
+#endif
connect(fSettingsWidget.getRasterCheckBox(), SIGNAL(toggled(bool)), this, SLOT(actionRasterWidget(bool)));
connect(fSettingsWidget.getOverdrawVizCheckBox(), SIGNAL(toggled(bool)), this, SLOT(actionOverdrawVizWidget(bool)));
connect(&fActionPause, SIGNAL(toggled(bool)), this, SLOT(pauseDrawing(bool)));
@@ -487,9 +489,11 @@
}
}
+#if SK_SUPPORT_GPU
void SkDebuggerGUI::actionGLWidget(bool isToggled) {
fCanvasWidget.setWidgetVisibility(SkCanvasWidget::kGPU_WidgetType, !isToggled);
}
+#endif
void SkDebuggerGUI::actionInspector() {
if (fInspectorWidget.isHidden()) {
diff --git a/debugger/QT/SkDebuggerGUI.h b/debugger/QT/SkDebuggerGUI.h
index 4130e96..bb3d6ce 100644
--- a/debugger/QT/SkDebuggerGUI.h
+++ b/debugger/QT/SkDebuggerGUI.h
@@ -112,10 +112,12 @@
*/
void actionDelete();
+#if SK_SUPPORT_GPU
/**
Toggles the visibility of the GL canvas widget.
*/
void actionGLWidget(bool isToggled);
+#endif
/**
Toggles the visibility of the inspector widget.
diff --git a/debugger/QT/SkGLWidget.cpp b/debugger/QT/SkGLWidget.cpp
index 6343a8b..3dc6059 100644
--- a/debugger/QT/SkGLWidget.cpp
+++ b/debugger/QT/SkGLWidget.cpp
@@ -9,6 +9,8 @@
#include "SkGLWidget.h"
+#if SK_SUPPORT_GPU
+
SkGLWidget::SkGLWidget(SkDebugger* debugger) : QGLWidget() {
this->setStyleSheet("QWidget {background-color: white; border: 1px solid #cccccc;}");
fDebugger = debugger;
@@ -74,3 +76,5 @@
return desc;
}
+
+#endif
diff --git a/debugger/QT/SkGLWidget.h b/debugger/QT/SkGLWidget.h
index 2a60c9a..ccbb1ee 100644
--- a/debugger/QT/SkGLWidget.h
+++ b/debugger/QT/SkGLWidget.h
@@ -10,12 +10,13 @@
#ifndef SKGLWIDGET_H_
#define SKGLWIDGET_H_
+#if SK_SUPPORT_GPU
+
#include <QtOpenGL/QGLWidget>
#include "SkDebugCanvas.h"
#include "SkDebugger.h"
#include "SkDevice.h"
#include "SkGpuDevice.h"
-
#include "GrContext.h"
#include "gl/GrGLInterface.h"
#include "gl/GrGLUtil.h"
@@ -51,4 +52,6 @@
GrBackendRenderTargetDesc getDesc(int w, int h);
};
+#endif /* SK_SUPPORT_GPU */
+
#endif /* SKGLWIDGET_H_ */
diff --git a/debugger/QT/SkRasterWidget.h b/debugger/QT/SkRasterWidget.h
index a0355c1..769aa51 100644
--- a/debugger/QT/SkRasterWidget.h
+++ b/debugger/QT/SkRasterWidget.h
@@ -9,7 +9,10 @@
#ifndef SKRASTERWIDGET_H_
#define SKRASTERWIDGET_H_
+#if SK_SUPPORT_GPU
#include "SkGpuDevice.h"
+#endif
+
#include "SkDevice.h"
#include "SkDebugger.h"
diff --git a/debugger/QT/SkSettingsWidget.cpp b/debugger/QT/SkSettingsWidget.cpp
index 09196fb..88078ea 100644
--- a/debugger/QT/SkSettingsWidget.cpp
+++ b/debugger/QT/SkSettingsWidget.cpp
@@ -63,9 +63,11 @@
fOverdrawVizLabel.setMinimumWidth(178);
fOverdrawVizLabel.setMaximumWidth(178);
+#if SK_SUPPORT_GPU
fGLLabel.setText("OpenGL: ");
fGLLabel.setMinimumWidth(178);
fGLLabel.setMaximumWidth(178);
+#endif
fRasterLayout.addWidget(&fRasterLabel);
fRasterLayout.addWidget(&fRasterCheckBox);
@@ -73,14 +75,18 @@
fOverdrawVizLayout.addWidget(&fOverdrawVizLabel);
fOverdrawVizLayout.addWidget(&fOverdrawVizCheckBox);
+#if SK_SUPPORT_GPU
fGLLayout.addWidget(&fGLLabel);
fGLLayout.addWidget(&fGLCheckBox);
+#endif
fCanvasLayout.setSpacing(6);
fCanvasLayout.setContentsMargins(11,11,11,11);
fCanvasLayout.addLayout(&fRasterLayout);
fCanvasLayout.addLayout(&fOverdrawVizLayout);
+#if SK_SUPPORT_GPU
fCanvasLayout.addLayout(&fGLLayout);
+#endif
// Command Toggle
fCommandToggle.setText("Command Scrolling Preferences");
diff --git a/debugger/QT/SkSettingsWidget.h b/debugger/QT/SkSettingsWidget.h
index 73cd6e1..1a16ed2 100644
--- a/debugger/QT/SkSettingsWidget.h
+++ b/debugger/QT/SkSettingsWidget.h
@@ -39,9 +39,11 @@
QRadioButton* getVisibilityButton();
+#if SK_SUPPORT_GPU
QCheckBox* getGLCheckBox() {
return &fGLCheckBox;
}
+#endif
QCheckBox* getRasterCheckBox() {
return &fRasterCheckBox;
@@ -95,9 +97,11 @@
QLabel fOverdrawVizLabel;
QCheckBox fOverdrawVizCheckBox;
+#if SK_SUPPORT_GPU
QHBoxLayout fGLLayout;
QLabel fGLLabel;
QCheckBox fGLCheckBox;
+#endif
QFrame fZoomFrame;
QHBoxLayout fZoomLayout;