diff options
| author |  yangsu@google.com <yangsu@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-08-12 15:18:25 +0000 |
|---|---|---|
| committer | yangsu@google.com <yangsu@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-08-12 15:18:25 +0000 |
| commit | 9b77fbd38bf5b7f0aca1cf32cf84515ab51f0c26 (patch) | |
| tree | 1821f722a590ea1fd84e9b02cb67bbbc089917b3 | |
| parent | f3523fbc40bc871f7bb301a41aa572113fdfd852 (diff) | |
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
| -rw-r--r-- | experimental/Debugger/DebuggerCommandsView.cpp | 1 | ||||
| -rw-r--r-- | experimental/Debugger/DebuggerStateView.cpp | 1 | ||||
| -rw-r--r-- | experimental/Debugger/SkDebugDumper.cpp | 3 | ||||
| -rw-r--r-- | gyp/SampleApp.gyp | 4 |
4 files changed, 2 insertions, 7 deletions
diff --git a/experimental/Debugger/DebuggerCommandsView.cpp b/experimental/Debugger/DebuggerCommandsView.cpp index 112c447909..7c16a6da89 100644 --- a/experimental/Debugger/DebuggerCommandsView.cpp +++ b/experimental/Debugger/DebuggerCommandsView.cpp @@ -141,5 +141,4 @@ void DebuggerCommandsView::onDraw(SkCanvas* canvas) { 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 2953e8f921..dd65c5581a 100644 --- a/experimental/Debugger/DebuggerStateView.cpp +++ b/experimental/Debugger/DebuggerStateView.cpp @@ -48,5 +48,4 @@ void DebuggerStateView::onDraw(SkCanvas* canvas) { 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 d353cfdc41..2f63462dc3 100644 --- a/experimental/Debugger/SkDebugDumper.cpp +++ b/experimental/Debugger/SkDebugDumper.cpp @@ -64,10 +64,11 @@ static SkString dumpMatrix(SkDumpCanvas* canvas) { 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 026fc43464..4d061e6729 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', |