diff options
| -rw-r--r-- | gyp/debugger.gyp | 25 | ||||
| -rw-r--r-- | gyp/tests.gyp | 2 | ||||
| -rw-r--r-- | tests/DebugCanvasTest.cpp | 30 |
3 files changed, 6 insertions, 51 deletions
diff --git a/gyp/debugger.gyp b/gyp/debugger.gyp index f15d435b3f..3a972c277f 100644 --- a/gyp/debugger.gyp +++ b/gyp/debugger.gyp @@ -87,9 +87,14 @@ ], 'sources': [ '../debugger/SkDebugger.cpp', + '../src/utils/debugger/SkDebugCanvas.h', + '../src/utils/debugger/SkDebugCanvas.cpp', + '../src/utils/debugger/SkDrawCommand.h', + '../src/utils/debugger/SkDrawCommand.cpp', + '../src/utils/debugger/SkObjectParser.h', + '../src/utils/debugger/SkObjectParser.cpp', ], 'dependencies': [ - 'debugger_lib', 'skia_lib.gyp:skia_lib', 'bench.gyp:bench_timer', 'tools.gyp:picture_renderer', @@ -149,24 +154,6 @@ }], ], }, - { - 'target_name': 'debugger_lib', - 'type': 'static_library', - 'include_dirs' : [ - '../src/core', - ], - 'dependencies': [ - 'skia_lib.gyp:skia_lib', - ], - 'sources': [ - '../src/utils/debugger/SkDebugCanvas.h', - '../src/utils/debugger/SkDebugCanvas.cpp', - '../src/utils/debugger/SkDrawCommand.h', - '../src/utils/debugger/SkDrawCommand.cpp', - '../src/utils/debugger/SkObjectParser.h', - '../src/utils/debugger/SkObjectParser.cpp', - ] - }, ], 'conditions': [ [ 'skia_os != "nacl"', { diff --git a/gyp/tests.gyp b/gyp/tests.gyp index ece65eb49e..227f644537 100644 --- a/gyp/tests.gyp +++ b/gyp/tests.gyp @@ -44,7 +44,6 @@ '../tests/ColorFilterTest.cpp', '../tests/ColorTest.cpp', '../tests/DataRefTest.cpp', - '../tests/DebugCanvasTest.cpp', '../tests/DeferredCanvasTest.cpp', '../tests/DequeTest.cpp', '../tests/DeviceLooperTest.cpp', @@ -146,7 +145,6 @@ 'experimental.gyp:experimental', 'pdf.gyp:pdf', 'tools.gyp:picture_utils', - 'debugger.gyp:debugger_lib', ], 'conditions': [ [ 'skia_gpu == 1', { diff --git a/tests/DebugCanvasTest.cpp b/tests/DebugCanvasTest.cpp deleted file mode 100644 index ecc7c75f18..0000000000 --- a/tests/DebugCanvasTest.cpp +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright 2013 Google Inc. - * - * Use of this source code is governed by a BSD-style license that can be - * found in the LICENSE file. - */ - -#include "Test.h" -#include "debugger/SkDebugCanvas.h" - -static void test_debugRect(skiatest::Reporter* reporter) { - SkDebugCanvas canvas(100, 100); - canvas.drawRect(SkRect::MakeWH(100, 100), SkPaint()); - - const SkTDArray<SkDrawCommand*> cmds = canvas.getDrawCommands(); - REPORTER_ASSERT(reporter, cmds.count() > 0); - - const SkTDArray<SkString*>& result = *cmds[0]->Info(); - REPORTER_ASSERT(reporter, result.count() > 0); - - SkString expected("SkRect: (0, 0, 100, 100)"); - REPORTER_ASSERT(reporter, expected == *result[0]); -} - -static void TestDebugCanvas(skiatest::Reporter* reporter) { - test_debugRect(reporter); -} - -#include "TestClassDef.h" -DEFINE_TESTCLASS("DebugCanvas", TestDebugCanvasClass, TestDebugCanvas) |