Removed networking dependencies from SampleApp, Pipe now off by default
git-svn-id: http://skia.googlecode.com/svn/trunk@2060 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/samplecode/SampleApp.cpp b/samplecode/SampleApp.cpp
index 6bc3375..15d1c28 100644
--- a/samplecode/SampleApp.cpp
+++ b/samplecode/SampleApp.cpp
@@ -29,7 +29,7 @@
#include "SkPDFDocument.h"
#include "SkStream.h"
-#define TEST_GPIPE
+#define TEST_GPIPEx
#ifdef TEST_GPIPE
#define PIPE_FILEx
@@ -37,7 +37,7 @@
#define FILE_PATH "/path/to/drawing.data"
#endif
-#define PIPE_NET
+#define PIPE_NETx
#ifdef PIPE_NET
#include "SkSockets.h"
SkTCPServer gServer;
@@ -1693,6 +1693,7 @@
#endif
void SampleView::draw(SkCanvas* canvas) {
+#ifdef TEST_GPIPE
if (fUsePipe) {
SkGPipeWriter writer;
SimplePC controller(canvas);
@@ -1702,9 +1703,11 @@
this->INHERITED::draw(canvas);
controller.setWriteToPipe(fUsePipe);
}
- else {
+ else
this->INHERITED::draw(canvas);
- }
+#else
+ this->INHERITED::draw(canvas);
+#endif
}
void SampleView::onDraw(SkCanvas* canvas) {
this->onDrawBackground(canvas);