Removed networking dependencies from SampleApp that caused errors
Fixed error in Debugger
git-svn-id: http://skia.googlecode.com/svn/trunk@2106 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/experimental/Debugger/DebuggerCommandsView.cpp b/experimental/Debugger/DebuggerCommandsView.cpp
index 112c447..7c16a6d 100644
--- a/experimental/Debugger/DebuggerCommandsView.cpp
+++ b/experimental/Debugger/DebuggerCommandsView.cpp
@@ -141,5 +141,4 @@
r = SkRect::MakeXYWH(this->width() - SKDEBUGGER_RESIZEBARSIZE, 0,
SKDEBUGGER_RESIZEBARSIZE, this->height());
canvas->drawRect(r, p);
- this->INHERITED::onDraw(canvas);
}
\ No newline at end of file
diff --git a/experimental/Debugger/DebuggerStateView.cpp b/experimental/Debugger/DebuggerStateView.cpp
index 2953e8f..dd65c55 100644
--- a/experimental/Debugger/DebuggerStateView.cpp
+++ b/experimental/Debugger/DebuggerStateView.cpp
@@ -48,5 +48,4 @@
p.setColor(SKDEBUGGER_RESIZEBARCOLOR);
r = SkRect::MakeXYWH(0, 0, this->width(), SKDEBUGGER_RESIZEBARSIZE);
canvas->drawRect(r, p);
- this->INHERITED::onDraw(canvas);
}
\ No newline at end of file
diff --git a/experimental/Debugger/SkDebugDumper.cpp b/experimental/Debugger/SkDebugDumper.cpp
index d353cfd..2f63462 100644
--- a/experimental/Debugger/SkDebugDumper.cpp
+++ b/experimental/Debugger/SkDebugDumper.cpp
@@ -64,10 +64,11 @@
return str;
}
+
+static const int maxPts = 50;
static SkString dumpClip(SkDumpCanvas* canvas) {
SkString str;
SkPath p;
- int maxPts = 50;
if (canvas->getTotalClip().getBoundaryPath(&p)) {
SkPoint pts[maxPts];
int numPts = p.getPoints(pts, maxPts);
diff --git a/gyp/SampleApp.gyp b/gyp/SampleApp.gyp
index 026fc43..4d061e6 100644
--- a/gyp/SampleApp.gyp
+++ b/gyp/SampleApp.gyp
@@ -120,10 +120,6 @@
'../src/pipe/SkGPipeRead.cpp',
'../src/pipe/SkGPipeWrite.cpp',
- # Networking dependencies
- '../experimental/Networking/SkSockets.cpp',
- '../experimental/Networking/SkSockets.h',
-
# Debugger dependencies
'../experimental/Debugger/DebuggerViews.h',
'../experimental/Debugger/DebuggerContentView.cpp',