From d6176b0dcacb124539e0cfd051e6d93a9782f020 Mon Sep 17 00:00:00 2001 From: "rmistry@google.com" Date: Thu, 23 Aug 2012 18:14:13 +0000 Subject: Result of running tools/sanitize_source_files.py (which was added in https://codereview.appspot.com/6465078/) This CL is part II of IV (I broke down the 1280 files into 4 CLs). Review URL: https://codereview.appspot.com/6474054 git-svn-id: http://skia.googlecode.com/svn/trunk@5263 2bbb7eff-a529-9590-31e7-b0007b416f81 --- experimental/Debugger/DebuggerContentView.cpp | 66 +++++++++++++-------------- 1 file changed, 33 insertions(+), 33 deletions(-) (limited to 'experimental/Debugger/DebuggerContentView.cpp') diff --git a/experimental/Debugger/DebuggerContentView.cpp b/experimental/Debugger/DebuggerContentView.cpp index 27fc8c6a2a..02ea404c0b 100644 --- a/experimental/Debugger/DebuggerContentView.cpp +++ b/experimental/Debugger/DebuggerContentView.cpp @@ -11,44 +11,44 @@ public: fCommandsResizing = false; fStateVisible = true; fStateResizing = false; - + fCommands = new DebuggerCommandsView; fCommands->setVisibleP(fCommandsVisible); this->attachChildToFront(fCommands)->unref(); - + fState = new DebuggerStateView; fState->setVisibleP(fStateVisible); this->attachChildToFront(fState)->unref(); - + fAtomsToRead = 0; fDisplayClip = false; - - fDumper = new SkDebugDumper(this->getSinkID(), fCommands->getSinkID(), + + fDumper = new SkDebugDumper(this->getSinkID(), fCommands->getSinkID(), fState->getSinkID()); - + fDumper->unload(); fAtomBounds.reset(); fFrameBounds.reset(); - + SkDumpCanvas* dumpCanvas = new SkDumpCanvas(fDumper); SkGPipeReader* dumpReader = new SkGPipeReader(dumpCanvas); - + if (size > 0) { int offset = 0; int frameBound = 0; size_t bytesRead; while (static_cast(offset) < size) { - SkGPipeReader::Status s = dumpReader->playback(data + offset, - size - offset, - &bytesRead, + SkGPipeReader::Status s = dumpReader->playback(data + offset, + size - offset, + &bytesRead, true); SkASSERT(SkGPipeReader::kError_Status != s); offset += bytesRead; - + if (SkGPipeReader::kDone_Status == s) { - fDumper->dump(dumpCanvas, SkDumpCanvas::kNULL_Verb, + fDumper->dump(dumpCanvas, SkDumpCanvas::kNULL_Verb, "End of Frame", NULL); delete dumpReader; delete dumpCanvas; @@ -60,34 +60,34 @@ public: fFrameBounds.append(1, &frameBound); } } - + delete dumpReader; delete dumpCanvas; - + fDumper->load(); } - + ~DebuggerView() { fAtomBounds.reset(); fFrameBounds.reset(); delete fDumper; } - + virtual void requestMenu(SkOSMenu* menu) { menu->setTitle("Debugger"); menu->appendSwitch("Show Commands", "Commands", this->getSinkID(), fCommandsVisible); menu->appendSwitch("Show State", "State", this->getSinkID(), fStateVisible); menu->appendSwitch("Display Clip", "Clip", this->getSinkID(), fDisplayClip); } - - + + void goToAtom(int atom) { if (atom != fAtomsToRead) { fAtomsToRead = atom; this->inval(NULL); } } - + protected: virtual bool onQuery(SkEvent* evt) { if (SampleCode::TitleQ(*evt)) { @@ -99,7 +99,7 @@ protected: } return this->INHERITED::onQuery(evt); } - + virtual bool onEvent(const SkEvent& evt) { if (SkOSMenu::FindSwitchState(evt, "Commands", &fCommandsVisible) || SkOSMenu::FindSwitchState(evt, "State", &fStateVisible)) { @@ -117,13 +117,13 @@ protected: } return this->INHERITED::onEvent(evt); } - + virtual void onDrawContent(SkCanvas* canvas) { if (fData.count() <= 0) return; SkAutoCanvasRestore acr(canvas, true); canvas->translate(fStateOffset, 0); - + int lastFrameBound = fFrameBounds[fAtomsToRead]; int toBeRead = fAtomBounds[fAtomsToRead] - lastFrameBound; int firstChunk = (fAtomsToRead > 0) ? fAtomBounds[fAtomsToRead - 1] - lastFrameBound: 0; @@ -132,7 +132,7 @@ protected: SkGPipeReader* dumpReader = new SkGPipeReader(dumpCanvas); SkGPipeReader* reader = new SkGPipeReader(canvas); fDumper->disable(); - + int offset = 0; size_t bytesRead; SkGPipeReader::Status s; @@ -163,7 +163,7 @@ protected: delete reader; delete dumpReader; delete dumpCanvas; - + if (fDisplayClip) { SkPaint p; p.setColor(0x440000AA); @@ -173,11 +173,11 @@ protected: } } } - + virtual SkView::Click* onFindClickHandler(SkScalar x, SkScalar y) { return new Click(this); } - + virtual bool onClick(SkView::Click* click) { SkPoint prev = click->fPrev; SkPoint curr = click->fCurr; @@ -195,7 +195,7 @@ protected: fAtomsToRead = fCommands->selectHighlight( SkScalarFloorToInt(curr.fY)); } - else + else handled = false; break; case SkView::Click::kMoved_State: @@ -220,7 +220,7 @@ protected: default: break; } - + fStateOffset = fCommands->width(); fState->setSize(this->width() - fStateOffset, fState->height()); fState->setLoc(fStateOffset, this->height() - fState->height()); @@ -228,7 +228,7 @@ protected: this->inval(NULL); return handled; } - + virtual void onSizeChange() { this->INHERITED::onSizeChange(); fCommands->setSize(CMD_WIDTH, this->height()); @@ -236,7 +236,7 @@ protected: fState->setSize(this->width() - CMD_WIDTH, SkFloatToScalar(INFO_HEIGHT)); fState->setLoc(CMD_WIDTH, this->height() - SkFloatToScalar(INFO_HEIGHT)); } - + private: DebuggerCommandsView* fCommands; DebuggerStateView* fState; @@ -251,7 +251,7 @@ private: SkTDArray fFrameBounds; SkTDArray fData; SkDebugDumper* fDumper; - + typedef SampleView INHERITED; }; @@ -264,5 +264,5 @@ SkView* create_debugger(const char* data, size_t size) { bool is_debugger(SkView* view) { SkEvent isDebugger(gIsDebuggerQuery); - return view->doQuery(&isDebugger); + return view->doQuery(&isDebugger); } -- cgit v1.2.3