commit f121b0525485fb18e96c4b9dbc57594c430e42f4
author yangsu@google.com <yangsu@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon Aug 08 16:02:51 2011 +0000
committer yangsu@google.com <yangsu@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon Aug 08 16:02:51 2011 +0000
tree 7924e443ad1798365235a103483c8fae1e2abbc8
parent db03eaa37111a63835ab7f61cb550971e609a621

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

gyp/SampleApp.gyp

diff --git a/gyp/SampleApp.gyp b/gyp/SampleApp.gyp
index 6079112..23e81ba 100644
--- a/gyp/SampleApp.gyp
+++ b/gyp/SampleApp.gyp
@@ -119,10 +119,6 @@
         # Dependencies for the pipe code in SampleApp
         '../src/pipe/SkGPipeRead.cpp',
         '../src/pipe/SkGPipeWrite.cpp',
-        
-        # Network Pipe Dependencies
-        '../experimental/Networking/SkSockets.cpp',
-        '../experimental/Networking/SkSockets.h',
       ],
       'sources!': [
         '../samplecode/SampleSkLayer.cpp', #relies on SkMatrix44 which doesn't compile

samplecode/SampleApp.cpp

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);