Added Debugger to Sample App, off by default

Removed CocoaDebugger from experimental
Slight changes to SkOSMenu
Bug fixes for NetPipeReader and DrawingBoard


git-svn-id: http://skia.googlecode.com/svn/trunk@2102 2bbb7eff-a529-9590-31e7-b0007b416f81

3 files changed, 86 insertions, 153 deletions

diff --git a/gyp/CocoaDebuggerApp.gyp b/gyp/CocoaDebuggerApp.gyp
deleted file mode 100644
index e53dfbb106..0000000000
--- a/gyp/CocoaDebuggerApp.gyp
+++ /dev/null
@@ -1,79 +0,0 @@
-{
-  'includes': [
-    'common.gypi',
-  ],
-  'targets': [
-    {
-      'target_name': 'CocoaDebuggerApp',
-      'type': 'executable',
-      'mac_bundle' : 1,
-      
-      'include_dirs' : [
-        '../include/pipe',
-        '../experimental/CocoaDebugger',
-        '../experimental/SimpleCocoaApp',
-      ],
-      'sources': [
-        '../experimental/CocoaDebugger/SkCommandListView.cpp',
-        '../experimental/CocoaDebugger/SkContentView.cpp',
-        '../experimental/CocoaDebugger/SkDebugDumper.cpp',
-        '../experimental/CocoaDebugger/SkDumpCanvasM.cpp',
-        '../experimental/CocoaDebugger/SkInfoPanelView.cpp',
-        '../src/pipe/SkGPipeRead.cpp',
-      ],
-      'dependencies': [
-        'core.gyp:core',
-        'effects.gyp:effects',
-        'opts.gyp:opts',
-        'utils.gyp:utils',
-        'views.gyp:views',
-        'xml.gyp:xml',
-      ],
-      'conditions' : [
-        # Only supports Mac currently
-        ['skia_os == "mac"', {
-          'sources': [
-            '../experimental/CocoaDebugger/CocoaDebugger-Info.plist',
-            '../experimental/CocoaDebugger/CocoaDebugger_Prefix.pch',
-            '../experimental/CocoaDebugger/CocoaDebuggerAppDelegate.mm',
-            '../experimental/CocoaDebugger/main.m',
-            '../experimental/CocoaDebugger/SkDebugger.mm',
-            '../experimental/CocoaDebugger/SkMenuController.mm',
-            '../experimental/SimpleCocoaApp/SkNSView.mm',
-            '../experimental/SimpleCocoaApp/SkNSWindow.mm',
-            '../include/utils/mac/SkCGUtils.h',
-            '../src/utils/mac/SkCreateCGImageRef.cpp',
-          ],
-          'link_settings': {
-            'libraries': [
-            '$(SDKROOT)/System/Library/Frameworks/Cocoa.framework',
-            '$(SDKROOT)/System/Library/Frameworks/AppKit.framework',
-            '$(SDKROOT)/System/Library/Frameworks/Foundation.framework',
-            '$(SDKROOT)/System/Library/Frameworks/OpenGL.framework',
-            ],
-            'libraries!': [
-            # Currently skia mac apps rely on Carbon and AGL for UI. Future
-            # apps should use Cocoa instead and dependencies on Carbon and AGL
-            # should eventually be removed
-            '$(SDKROOT)/System/Library/Frameworks/Carbon.framework',
-            '$(SDKROOT)/System/Library/Frameworks/AGL.framework',
-            ],
-          },
-          'xcode_settings' : {
-            'INFOPLIST_FILE' : '../experimental/CocoaDebugger/CocoaDebugger-Info.plist',
-          },
-          'mac_bundle_resources' : [
-            '../experimental/CocoaDebugger/English.lproj/InfoPlist.strings',
-            '../experimental/CocoaDebugger/English.lproj/MainMenu.xib',
-          ],
-        }],
-      ],
-    },
-  ],
-}
-
-# Local Variables:
-# tab-width:2
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=2 shiftwidth=2:
diff --git a/gyp/CocoaSampleApp.gyp b/gyp/CocoaSampleApp.gyp
index 8dccce53f7..27846e1811 100644
--- a/gyp/CocoaSampleApp.gyp
+++ b/gyp/CocoaSampleApp.gyp
@@ -14,104 +14,104 @@
       ],
       'sources': [
         # gm files needed for SampleGM.cpp
-        '../gm/bitmapfilters.cpp',
-        '../gm/blurs.cpp',
-        '../gm/complexclip.cpp',
-        '../gm/filltypes.cpp',
-        '../gm/gm.h',
-        '../gm/gradients.cpp',
-        '../gm/nocolorbleed.cpp',
-        '../gm/points.cpp',
-        '../gm/poly2poly.cpp',
-        '../gm/shadertext.cpp',
-        '../gm/shadows.cpp',
-        '../gm/shapes.cpp',
-        '../gm/tilemodes.cpp',
-        '../gm/xfermodes.cpp',
+        #'../gm/bitmapfilters.cpp',
+        #'../gm/blurs.cpp',
+        #'../gm/complexclip.cpp',
+        #'../gm/filltypes.cpp',
+        #'../gm/gm.h',
+        #'../gm/gradients.cpp',
+        #'../gm/nocolorbleed.cpp',
+        #'../gm/points.cpp',
+        #'../gm/poly2poly.cpp',
+        #'../gm/shadertext.cpp',
+        #'../gm/shadows.cpp',
+        #'../gm/shapes.cpp',
+        #'../gm/tilemodes.cpp',
+        #'../gm/xfermodes.cpp',
 
-        '../samplecode/ClockFaceView.cpp',
+        #'../samplecode/ClockFaceView.cpp',
         '../samplecode/OverView.cpp',
-        '../samplecode/Sample2PtRadial.cpp',
-        '../samplecode/SampleAll.cpp',
-        '../samplecode/SampleAnimator.cpp',
+        #'../samplecode/Sample2PtRadial.cpp',
+        #'../samplecode/SampleAll.cpp',
+        #'../samplecode/SampleAnimator.cpp',
         '../samplecode/SampleApp.cpp',
         '../samplecode/SampleArc.cpp',
         '../samplecode/SampleAvoid.cpp',
-        '../samplecode/SampleBigBlur.cpp',
-        '../samplecode/SampleBigGradient.cpp',
-        '../samplecode/SampleBitmapRect.cpp',
+        #'../samplecode/SampleBigBlur.cpp',
+        #'../samplecode/SampleBigGradient.cpp',
+        #'../samplecode/SampleBitmapRect.cpp',
         '../samplecode/SampleBlur.cpp',
-        '../samplecode/SampleCamera.cpp',
-        '../samplecode/SampleCircle.cpp',
+        #'../samplecode/SampleCamera.cpp',
+        #'../samplecode/SampleCircle.cpp',
         '../samplecode/SampleCode.h',
-        '../samplecode/SampleColorFilter.cpp',
+        #'../samplecode/SampleColorFilter.cpp',
         '../samplecode/SampleComplexClip.cpp',
-        '../samplecode/SampleConcavePaths.cpp',
+        #'../samplecode/SampleConcavePaths.cpp',
         '../samplecode/SampleCull.cpp',
-        '../samplecode/SampleDecode.cpp',
+        #'../samplecode/SampleDecode.cpp',
         '../samplecode/SampleDegenerateTwoPtRadials.cpp',
-        '../samplecode/SampleDither.cpp',
-        '../samplecode/SampleDitherBitmap.cpp',
-        '../samplecode/SampleDrawBitmap.cpp',
-        '../samplecode/SampleDrawLooper.cpp',
-        '../samplecode/SampleEffects.cpp',
-        '../samplecode/SampleEmboss.cpp',
-        '../samplecode/SampleEncode.cpp',
-        '../samplecode/SampleExtractAlpha.cpp',
+        #'../samplecode/SampleDither.cpp',
+        #'../samplecode/SampleDitherBitmap.cpp',
+        #'../samplecode/SampleDrawBitmap.cpp',
+        #'../samplecode/SampleDrawLooper.cpp',
+        #'../samplecode/SampleEffects.cpp',
+        #'../samplecode/SampleEmboss.cpp',
+        #'../samplecode/SampleEncode.cpp',
+        #'../samplecode/SampleExtractAlpha.cpp',
         '../samplecode/SampleFillType.cpp',
-        '../samplecode/SampleFilter.cpp',
-        '../samplecode/SampleFilter2.cpp',
-        '../samplecode/SampleFontCache.cpp',
-        '../samplecode/SampleFontScalerTest.cpp',
-        '../samplecode/SampleFuzz.cpp',
-        '../samplecode/SampleGM.cpp',
-        '../samplecode/SampleGradients.cpp',
-        '../samplecode/SampleHairline.cpp',
-        '../samplecode/SampleImage.cpp',
-        '../samplecode/SampleImageDir.cpp',
-        '../samplecode/SampleLayerMask.cpp',
-        '../samplecode/SampleLayers.cpp',
+        #'../samplecode/SampleFilter.cpp',
+        #'../samplecode/SampleFilter2.cpp',
+        #'../samplecode/SampleFontCache.cpp',
+        #'../samplecode/SampleFontScalerTest.cpp',
+        #'../samplecode/SampleFuzz.cpp',
+        #'../samplecode/SampleGM.cpp',
+        #'../samplecode/SampleGradients.cpp',
+        #'../samplecode/SampleHairline.cpp',
+        #'../samplecode/SampleImage.cpp',
+        #'../samplecode/SampleImageDir.cpp',
+        #'../samplecode/SampleLayerMask.cpp',
+        #'../samplecode/SampleLayers.cpp',
         '../samplecode/SampleLCD.cpp',
         '../samplecode/SampleLineClipper.cpp',
-        '../samplecode/SampleLines.cpp',
-        '../samplecode/SampleMeasure.cpp',
-        '../samplecode/SampleMipMap.cpp',
-        '../samplecode/SampleMovie.cpp',
-        '../samplecode/SampleNinePatch.cpp',
-        '../samplecode/SampleOvalTest.cpp',
-        '../samplecode/SampleOverflow.cpp',
-        '../samplecode/SamplePageFlip.cpp',
-        '../samplecode/SamplePatch.cpp',
+        #'../samplecode/SampleLines.cpp',
+        #'../samplecode/SampleMeasure.cpp',
+        #'../samplecode/SampleMipMap.cpp',
+        #'../samplecode/SampleMovie.cpp',
+        #'../samplecode/SampleNinePatch.cpp',
+        #'../samplecode/SampleOvalTest.cpp',
+        #'../samplecode/SampleOverflow.cpp',
+        #'../samplecode/SamplePageFlip.cpp',
+        #'../samplecode/SamplePatch.cpp',
         '../samplecode/SamplePath.cpp',
         '../samplecode/SamplePathClip.cpp',
         '../samplecode/SamplePathEffects.cpp',
         '../samplecode/SamplePicture.cpp',
         '../samplecode/SamplePoints.cpp',
         '../samplecode/SamplePolyToPoly.cpp',
-        '../samplecode/SampleAARects.cpp',
+        ##'../samplecode/SampleAARects.cpp',
         '../samplecode/SampleRegion.cpp',
-        '../samplecode/SampleRepeatTile.cpp',
-        '../samplecode/SampleShaders.cpp',
-        '../samplecode/SampleShaderText.cpp',
-        '../samplecode/SampleShapes.cpp',
-        '../samplecode/SampleSkLayer.cpp',
+        #'../samplecode/SampleRepeatTile.cpp',
+        #'../samplecode/SampleShaders.cpp',
+        #'../samplecode/SampleShaderText.cpp',
+        #'../samplecode/SampleShapes.cpp',
+        #'../samplecode/SampleSkLayer.cpp',
         '../samplecode/SampleSlides.cpp',
-        '../samplecode/SampleStrokePath.cpp',
-        '../samplecode/SampleStrokeText.cpp',
-        '../samplecode/SampleTests.cpp',
-        '../samplecode/SampleText.cpp',
-        '../samplecode/SampleTextAlpha.cpp',
+        #'../samplecode/SampleStrokePath.cpp',
+        #'../samplecode/SampleStrokeText.cpp',
+        #'../samplecode/SampleTests.cpp',
+        #'../samplecode/SampleText.cpp',
+        #'../samplecode/SampleTextAlpha.cpp',
         '../samplecode/SampleTextBox.cpp',
         '../samplecode/SampleTextEffects.cpp',
         '../samplecode/SampleTextOnPath.cpp',
-        '../samplecode/SampleTextureDomain.cpp',
-        '../samplecode/SampleTiling.cpp',
-        '../samplecode/SampleTinyBitmap.cpp',
+        #'../samplecode/SampleTextureDomain.cpp',
+        #'../samplecode/SampleTiling.cpp',
+        #'../samplecode/SampleTinyBitmap.cpp',
         '../samplecode/SampleTriangles.cpp',
         '../samplecode/SampleTypeface.cpp',
         '../samplecode/SampleUnitMapper.cpp',
-        '../samplecode/SampleVertices.cpp',
-        '../samplecode/SampleXfermodes.cpp',
+        #'../samplecode/SampleVertices.cpp',
+        #'../samplecode/SampleXfermodes.cpp',
         '../samplecode/SampleXfermodesBlur.cpp',
         '../samplecode/TransitionView.cpp',
         
@@ -124,13 +124,21 @@
         '../experimental/DrawingBoard/SkColorPalette.cpp',
         '../experimental/DrawingBoard/SkNetPipeController.h',
         '../experimental/DrawingBoard/SkNetPipeController.cpp',
-        '../experimental/DrawingBoard/SampleDrawingClient.cpp',
+        #'../experimental/DrawingBoard/SampleDrawingClient.cpp',
         '../experimental/DrawingBoard/SampleDrawingServer.cpp',
     
         # Networking
         '../experimental/Networking/SampleNetPipeReader.cpp',
         '../experimental/Networking/SkSockets.cpp',
         '../experimental/Networking/SkSockets.h',
+        
+        # Debugger
+        '../experimental/Debugger/DebuggerViews.h',
+        '../experimental/Debugger/DebuggerContentView.cpp',
+        '../experimental/Debugger/DebuggerCommandsView.cpp',
+        '../experimental/Debugger/DebuggerStateView.cpp',
+        '../experimental/Debugger/SkDebugDumper.cpp',
+        '../experimental/Debugger/SkDebugDumper.h',
       ],
       'sources!': [
         '../samplecode/SampleSkLayer.cpp', #relies on SkMatrix44 which doesn't compile
diff --git a/gyp/SimpleCocoaApp.gyp b/gyp/SimpleCocoaApp.gyp
index ead9fe4f98..1725f12bb3 100644
--- a/gyp/SimpleCocoaApp.gyp
+++ b/gyp/SimpleCocoaApp.gyp
@@ -12,12 +12,16 @@
       ],
       'sources': [
         '../experimental/SimpleCocoaApp/main.m',
+        '../experimental/SimpleCocoaApp/SampleWindow.h',
         '../experimental/SimpleCocoaApp/SampleWindow.mm',
-        '../experimental/SimpleCocoaApp/SimpleCocoaApp-Info.plist',
-        '../experimental/SimpleCocoaApp/SimpleCocoaApp_Prefix.pch',
+        '../experimental/SimpleCocoaApp/SimpleCocoaAppDelegate.h',
         '../experimental/SimpleCocoaApp/SimpleCocoaAppDelegate.mm',
+        '../experimental/SimpleCocoaApp/SkNSView.h',
         '../experimental/SimpleCocoaApp/SkNSView.mm',
+        '../experimental/SimpleCocoaApp/SkNSWindow.h',
         '../experimental/SimpleCocoaApp/SkNSWindow.mm',
+        '../experimental/SimpleCocoaApp/SimpleCocoaApp-Info.plist',
+        '../experimental/SimpleCocoaApp/SimpleCocoaApp_Prefix.pch',
       ],
       'dependencies': [
         'core.gyp:core',