diff options
author | rmistry@google.com <rmistry@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-08-23 18:09:54 +0000 |
---|---|---|
committer | rmistry@google.com <rmistry@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-08-23 18:09:54 +0000 |
commit | fbfcd5602128ec010c82cb733c9cdc0a3254f9f3 (patch) | |
tree | d8b4815d15946c32ee9d254e932411e93be942bb /include/views/animated | |
parent | 2abed834789bb64c7da740df4c47efc142b7311a (diff) |
Result of running tools/sanitize_source_files.py (which was added in https://codereview.appspot.com/6465078/)
This CL is part I of IV (I broke down the 1280 files into 4 CLs).
Review URL: https://codereview.appspot.com/6485054
git-svn-id: http://skia.googlecode.com/svn/trunk@5262 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'include/views/animated')
-rw-r--r-- | include/views/animated/SkImageView.h | 8 | ||||
-rw-r--r-- | include/views/animated/SkProgressBarView.h | 12 | ||||
-rw-r--r-- | include/views/animated/SkScrollBarView.h | 8 | ||||
-rw-r--r-- | include/views/animated/SkWidgetViews.h | 22 |
4 files changed, 25 insertions, 25 deletions
diff --git a/include/views/animated/SkImageView.h b/include/views/animated/SkImageView.h index e17914151b..a21da0be51 100644 --- a/include/views/animated/SkImageView.h +++ b/include/views/animated/SkImageView.h @@ -25,7 +25,7 @@ public: void getUri(SkString*) const; void setUri(const char []); void setUri(const SkString&); - + enum ScaleType { kMatrix_ScaleType, @@ -36,7 +36,7 @@ public: }; ScaleType getScaleType() const { return (ScaleType)fScaleType; } void setScaleType(ScaleType); - + bool getImageMatrix(SkMatrix*) const; void setImageMatrix(const SkMatrix*); @@ -45,7 +45,7 @@ protected: virtual bool onEvent(const SkEvent&); virtual void onDraw(SkCanvas*); virtual void onInflate(const SkDOM&, const SkDOMNode*); - + private: SkString fUri; SkMatrix* fMatrix; // null or copy of caller's matrix ,,,,, @@ -56,7 +56,7 @@ private: uint8_t fScaleType; SkBool8 fDataIsAnim; // as opposed to bitmap SkBool8 fUriIsValid; - + void onUriChange(); bool getDataBounds(SkRect* bounds); bool freeData(); diff --git a/include/views/animated/SkProgressBarView.h b/include/views/animated/SkProgressBarView.h index 0e39d1e0b6..7e670a9ad5 100644 --- a/include/views/animated/SkProgressBarView.h +++ b/include/views/animated/SkProgressBarView.h @@ -18,29 +18,29 @@ class SkProgressBarView : public SkWidgetView { public: SkProgressBarView(); //SkProgressBarView(int max); - + //inflate: "sk-progress" - + void reset(); //reset progress to zero void setProgress(int progress); void changeProgress(int diff); void setMax(int max); - + int getProgress() const { return fProgress; } int getMax() const { return fMax; } - + protected: //overrides virtual void onInflate(const SkDOM& dom, const SkDOM::Node* node); virtual void onSizeChange(); virtual void onDraw(SkCanvas* canvas); virtual bool onEvent(const SkEvent& evt); - + private: SkAnimator fAnim; int fProgress; int fMax; - + typedef SkWidgetView INHERITED; }; diff --git a/include/views/animated/SkScrollBarView.h b/include/views/animated/SkScrollBarView.h index 110d0e12f0..1270e14136 100644 --- a/include/views/animated/SkScrollBarView.h +++ b/include/views/animated/SkScrollBarView.h @@ -22,10 +22,10 @@ public: unsigned getShown() const { return fShownLength; } unsigned getTotal() const { return fTotalLength; } - void setStart(unsigned start); + void setStart(unsigned start); void setShown(unsigned shown); void setTotal(unsigned total); - + protected: //overrides virtual void onInflate(const SkDOM& dom, const SkDOM::Node* node); @@ -36,9 +36,9 @@ protected: private: SkAnimator fAnim; unsigned fTotalLength, fStartPoint, fShownLength; - + void adjust(); - + typedef SkWidgetView INHERITED; }; #endif diff --git a/include/views/animated/SkWidgetViews.h b/include/views/animated/SkWidgetViews.h index 93adeef6b0..40346600c3 100644 --- a/include/views/animated/SkWidgetViews.h +++ b/include/views/animated/SkWidgetViews.h @@ -21,7 +21,7 @@ enum SkWidgetEnum { kProgress_WidgetEnum, //!< <sk-progress> kScroll_WidgetEnum, //!< <sk-scroll> kText_WidgetEnum, //!< <sk-text> - + kWidgetEnumCount }; @@ -32,7 +32,7 @@ enum SkinEnum { kProgress_SkinEnum, kScroll_SkinEnum, kStaticText_SkinEnum, - + kSkinEnumCount }; @@ -73,7 +73,7 @@ public: /** Returns true if the widget can post its event to its listeners. */ bool postWidgetEvent(); - + /** Returns the sinkID of the widgetview that posted the event, or 0 */ static SkEventSinkID GetWidgetEventSinkID(const SkEvent&); @@ -93,11 +93,11 @@ protected: // overrides virtual void onInflate(const SkDOM& dom, const SkDOM::Node*); - + private: SkString fLabel; SkEvent fEvent; - + typedef SkView INHERITED; }; @@ -106,7 +106,7 @@ private: class SkButtonView : public SkWidgetView { public: // inflate: "sk-button" - + protected: // overrides virtual bool onEvent(const SkEvent&); @@ -121,7 +121,7 @@ public: SkCheckButtonView(); // inflate: "sk-checkbutton" - + enum CheckState { kOff_CheckState, //!< inflate: check-state="off" kOn_CheckState, //!< inflate: check-state="on" @@ -144,10 +144,10 @@ protected: // overrides virtual void onInflate(const SkDOM& dom, const SkDOM::Node*); virtual bool onPrepareWidgetEvent(SkEvent* evt); - + private: uint8_t fCheckState; - + typedef SkWidgetView INHERITED; }; @@ -214,7 +214,7 @@ public: bool hasScrollBar() const { return fScrollBar != NULL; } void setHasScrollBar(bool); - + /** Return the number of visible rows */ int getVisibleRowCount() const { return fVisibleRowCount; } @@ -300,7 +300,7 @@ public: virtual void getRecord(int rowIndex, int fieldIndex, SkString* data); virtual bool prepareWidgetEvent(SkEvent*, int rowIndex); - + static SkListSource* Factory(const char name[]); private: typedef SkRefCnt INHERITED; |