diff options
| author | djsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-01-17 13:20:01 +0000 |
|---|---|---|
| committer | djsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-01-17 13:20:01 +0000 |
| commit | 388974f1dd4d7f1a202aac8a007dc2a4eaf051cb (patch) | |
| tree | a7fbf1c2c7515a32e94fedb43b4f3c9aa45d8263 /samplecode/SampleApp.cpp | |
| parent | 8e3ff8cf0bd4d4cb725c175ba001e1d00e4bfe27 (diff) | |
Remove unused debugger code from SampleApp.
Review URL: https://codereview.appspot.com/7133049
git-svn-id: http://skia.googlecode.com/svn/trunk@7244 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'samplecode/SampleApp.cpp')
| -rw-r--r-- | samplecode/SampleApp.cpp | 55 |
1 files changed, 1 insertions, 54 deletions
diff --git a/samplecode/SampleApp.cpp b/samplecode/SampleApp.cpp index b2789bce22..b59df61e86 100644 --- a/samplecode/SampleApp.cpp +++ b/samplecode/SampleApp.cpp @@ -64,14 +64,6 @@ public: SkTCPServer gServer; #endif -#define DEBUGGERx -#ifdef DEBUGGER -extern SkView* create_debugger(const char* data, size_t size); -extern bool is_debugger(SkView* view); -SkTDArray<char> gTempDataStore; -#endif - - #define USE_ARROWS_FOR_ZOOM true #if SK_ANGLE @@ -811,7 +803,6 @@ SampleWindow::SampleWindow(void* hwnd, int argc, char** argv, DeviceManager* dev fZoomScale = SK_Scalar1; fMagnify = false; - fDebugger = false; fSaveToPdf = false; fPdfCanvas = NULL; @@ -847,10 +838,6 @@ SampleWindow::SampleWindow(void* hwnd, int argc, char** argv, DeviceManager* dev itemID = fAppMenu->appendTriState("Tiling", "Tiling", sinkID, fTilingState); fAppMenu->assignKeyEquivalentToItem(itemID, 't'); -#ifdef DEBUGGER - itemID = fAppMenu->appendSwitch("Debugger", "Debugger", sinkID, fDebugger); - fAppMenu->assignKeyEquivalentToItem(itemID, 'q'); -#endif itemID = fAppMenu->appendSwitch("Slide Show", "Slide Show" , sinkID, false); fAppMenu->assignKeyEquivalentToItem(itemID, 'a'); itemID = fAppMenu->appendSwitch("Clip", "Clip" , sinkID, fUseClip); @@ -1421,25 +1408,6 @@ void SampleWindow::afterChildren(SkCanvas* orig) { bm.scrollRect(&r, dx, dy, &inval); paint_rgn(bm, r, inval); } -#ifdef DEBUGGER - SkView* curr = curr_view(this); - if (fDebugger && !is_debugger(curr) && !is_transition(curr) && !is_overview(curr)) { - //Stop Pipe when fDebugger is active - if (fPipeState != SkOSMenu::kOffState) { - fPipeState = SkOSMenu::kOffState; - (void)SampleView::SetUsePipe(curr, fPipeState); - fAppMenu->getItemByID(fUsePipeMenuItemID)->setTriState(fPipeState); - this->onUpdateMenu(fAppMenu); - } - - //Reset any transformations - fGesture.stop(); - fGesture.reset(); - - this->loadView(create_debugger(gTempDataStore.begin(), - gTempDataStore.count())); - } -#endif } void SampleWindow::beforeChild(SkView* child, SkCanvas* canvas) { @@ -1686,18 +1654,6 @@ bool SampleWindow::onEvent(const SkEvent& evt) { this->saveToPdf(); return true; } -#ifdef DEBUGGER - if (SkOSMenu::FindSwitchState(evt, "Debugger", &fDebugger)) { - if (fDebugger) { - fPipeState = SkOSMenu::kOnState; - (void)SampleView::SetUsePipe(curr_view(this), fPipeState); - } else { - this->loadView((*fSamples[fCurrIndex])()); - } - this->inval(NULL); - return true; - } -#endif return this->INHERITED::onEvent(evt); } @@ -2041,12 +1997,7 @@ void SampleWindow::loadView(SkView* view) { //repopulate the slide menu when a view is loaded fSlideMenu->reset(); -#ifdef DEBUGGER - if (!is_debugger(view) && !is_overview(view) && !is_transition(view) && fDebugger) { - //Force Pipe to be on if using debugger - fPipeState = SkOSMenu::kOnState; - } -#endif + (void)SampleView::SetUsePipe(view, fPipeState); if (SampleView::IsSampleView(view)) ((SampleView*)view)->requestMenu(fSlideMenu); @@ -2316,10 +2267,6 @@ SimplePC::~SimplePC() { gServer.writePacket(fBlock, fTotalWritten); } #endif -#ifdef DEBUGGER - gTempDataStore.reset(); - gTempDataStore.append(fTotalWritten, (const char*)fBlock); -#endif } sk_free(fBlock); } |
