AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "Added the following 3 features to sample app."

Browse Source 
Review URL: https://codereview.appspot.com/6906054

git-svn-id: http://skia.googlecode.com/svn/trunk@6719 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
djsollen@google.com 2012-12-07 22:10:39 +00:00
parent bcedc22012
commit f97593c899
3 changed files with 13 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
samplecode/SampleApp.cpp
View File

@ -1051,10 +1051,6 @@ void SampleWindow::draw(SkCanvas* canvas) {
this->updateMatrix();
}
if (fMeasureFPS) {
fMeasureFPS_Time = 0;
}
if (fNClip) {
this->INHERITED::draw(canvas);
SkBitmap orig = capture_bitmap(canvas);
@ -1115,11 +1111,6 @@ void SampleWindow::draw(SkCanvas* canvas) {
magnify(canvas);
}
if (fMeasureFPS && fMeasureFPS_Time) {
this->updateTitle();
this->postInvalDelay();
}
// do this last
fDevManager->publishCanvas(fDeviceType, canvas, this);
}
@ -1405,8 +1396,10 @@ void SampleWindow::afterChildren(SkCanvas* orig) {
}
// Do this after presentGL and other finishing, rather than in afterChild
if (fMeasureFPS && fMeasureFPS_StartTime) {
fMeasureFPS_Time += SkTime::GetMSecs() - fMeasureFPS_StartTime;
if (fMeasureFPS && fMeasureFPS_Time) {
fMeasureFPS_Time = SkTime::GetMSecs() - fMeasureFPS_Time;
this->updateTitle();
this->postInvalDelay();
}
// if ((fScrollTestX | fScrollTestY) != 0)
@ -1478,8 +1471,9 @@ void SampleWindow::beforeChild(SkView* child, SkCanvas* canvas) {
this->installDrawFilter(canvas);
if (fMeasureFPS) {
fMeasureFPS_Time = 0; // 0 means the child is not aware of repeat-draw
if (SampleView::SetRepeatDraw(child, FPS_REPEAT_COUNT)) {
fMeasureFPS_StartTime = SkTime::GetMSecs();
fMeasureFPS_Time = SkTime::GetMSecs();
}
} else {
(void)SampleView::SetRepeatDraw(child, 1);
@ -1784,13 +1778,6 @@ bool SampleWindow::onHandleChar(SkUnichar uni) {
}
switch (uni) {
case 'b':
{
postEventToSink(SkNEW_ARGS(SkEvent, ("PictFileView::toggleBBox")), curr_view(this));
this->updateTitle();
this->inval(NULL);
break;
}
case 'B':
// gIgnoreFastBlurRect = !gIgnoreFastBlurRect;
this->inval(NULL);

1
samplecode/SampleApp.h
View File

@ -168,7 +168,6 @@ private:
bool fRequestGrabImage;
bool fMeasureFPS;
SkMSec fMeasureFPS_Time;
SkMSec fMeasureFPS_StartTime;
bool fMagnify;
SkISize fTileCount;

45
samplecode/SamplePictFile.cpp
View File

@ -13,7 +13,6 @@
#include "SkGradientShader.h"
#include "SkGraphics.h"
#include "SkImageDecoder.h"
#include "SkOSFile.h"
#include "SkPath.h"
#include "SkPicture.h"
#include "SkRandom.h"
@ -32,10 +31,8 @@
class PictFileView : public SampleView {
SkString fFilename;
SkPicture* fPicture;
SkPicture* fBBoxPicture;
bool fUseBBox;
static SkPicture* LoadPicture(const char path[], bool useBBox) {
static SkPicture* LoadPicture(const char path[]) {
SkPicture* pic = NULL;
SkBitmap bm;
@ -63,30 +60,16 @@ class PictFileView : public SampleView {
p2.serialize(&writer);
}
}
if (useBBox) {
SkPicture* bboxPicture = SkNEW(SkPicture);
pic->draw(bboxPicture->beginRecording(pic->width(), pic->height(),
SkPicture::kOptimizeForClippedPlayback_RecordingFlag));
bboxPicture->endRecording();
SkDELETE(pic);
return bboxPicture;
} else {
return pic;
}
return pic;
}
public:
PictFileView(const char name[] = NULL) : fFilename(name) {
fPicture = NULL;
fBBoxPicture = NULL;
fUseBBox = false;
}
virtual ~PictFileView() {
SkSafeUnref(fPicture);
SkSafeUnref(fBBoxPicture);
}
protected:
@ -94,33 +77,19 @@ protected:
virtual bool onQuery(SkEvent* evt) {
if (SampleCode::TitleQ(*evt)) {
SkString name("P:");
char* basename = strrchr(fFilename.c_str(), SkPATH_SEPARATOR);
name.append(basename ? basename+1: fFilename.c_str());
if (fUseBBox) {
name.append(" <bbox>");
}
name.append(fFilename);
SampleCode::TitleR(evt, name.c_str());
return true;
}
return this->INHERITED::onQuery(evt);
}
virtual bool onEvent(const SkEvent& evt) {
if (evt.isType("PictFileView::toggleBBox")) {
fUseBBox = !fUseBBox;
return true;
}
return this->INHERITED::onEvent(evt);
}
virtual void onDrawContent(SkCanvas* canvas) {
SkPicture** picture = fUseBBox ? &fBBoxPicture : &fPicture;
if (!*picture) {
*picture = LoadPicture(fFilename.c_str(), fUseBBox);
if (!fPicture) {
fPicture = LoadPicture(fFilename.c_str());
}
if (*picture) {
canvas->drawPicture(**picture);
if (fPicture) {
canvas->drawPicture(*fPicture);
}
}