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
diff --git a/samplecode/SampleApp.cpp b/samplecode/SampleApp.cpp
index b2789bc..b59df61 100644
--- a/samplecode/SampleApp.cpp
+++ b/samplecode/SampleApp.cpp
@@ -64,14 +64,6 @@
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 @@
fZoomScale = SK_Scalar1;
fMagnify = false;
- fDebugger = false;
fSaveToPdf = false;
fPdfCanvas = NULL;
@@ -847,10 +838,6 @@
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 @@
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 @@
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 @@
//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 @@
gServer.writePacket(fBlock, fTotalWritten);
}
#endif
-#ifdef DEBUGGER
- gTempDataStore.reset();
- gTempDataStore.append(fTotalWritten, (const char*)fBlock);
-#endif
}
sk_free(fBlock);
}