X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fui%2Fnative_theme%2Fnative_theme_aura.h;h=82a6ec9b8e0f9e47af3e2f1c61368561d62dcb6e;hb=4a1a0bdd01eef90b0826a0e761d3379d3715c10f;hp=b63556c02849b88f61e7499e6e4e887c674346bd;hpb=b1be5ca53587d23e7aeb77b26861fdc0a181ffd8;p=platform%2Fframework%2Fweb%2Fcrosswalk.git diff --git a/src/ui/native_theme/native_theme_aura.h b/src/ui/native_theme/native_theme_aura.h index b63556c..82a6ec9 100644 --- a/src/ui/native_theme/native_theme_aura.h +++ b/src/ui/native_theme/native_theme_aura.h @@ -63,9 +63,9 @@ class NATIVE_THEME_EXPORT NativeThemeAura : public FallbackTheme { // necessary. If no image is provided for the specified state the normal state // images are used. gfx::NineImagePainter* GetOrCreatePainter( - const int image_ids[kMaxState][9], + const int image_ids[kNumStates][9], State state, - scoped_ptr painters[kMaxState]) const; + scoped_ptr painters[kNumStates]) const; // Paints |painter| into the canvas using |rect|. void PaintPainter(gfx::NineImagePainter* painter, @@ -75,10 +75,10 @@ class NATIVE_THEME_EXPORT NativeThemeAura : public FallbackTheme { mutable scoped_ptr scrollbar_track_painter_; mutable scoped_ptr - scrollbar_thumb_painters_[kMaxState]; + scrollbar_thumb_painters_[kNumStates]; mutable scoped_ptr - scrollbar_arrow_button_painters_[kMaxState]; + scrollbar_arrow_button_painters_[kNumStates]; private: struct DualPainter { @@ -88,9 +88,9 @@ class NATIVE_THEME_EXPORT NativeThemeAura : public FallbackTheme { // value associated with each state, so that a DualPainter for overlay // scrollbar thumb would only need state as input to paint correctly. DualPainter(scoped_ptr fill_painter, - const uint8 fill_alphas[kMaxState], + const uint8 fill_alphas[kNumStates], scoped_ptr stroke_painter, - const uint8 stroke_alphas[kMaxState]); + const uint8 stroke_alphas[kNumStates]); ~DualPainter(); scoped_ptr fill_painter; @@ -102,9 +102,9 @@ class NATIVE_THEME_EXPORT NativeThemeAura : public FallbackTheme { // Returns DualPainter from specific fill and stroke, creating if necessary. scoped_ptr CreateDualPainter( const int fill_image_ids[9], - const uint8 fill_alphas[kMaxState], + const uint8 fill_alphas[kNumStates], const int stroke_image_ids[9], - const uint8 stroke_alphas[kMaxState]) const; + const uint8 stroke_alphas[kNumStates]) const; // Paints |dualPainter| into the canvas using |rect| and specific alpha. void PaintDualPainter(DualPainter* dual_painter,