commit bd3e3202ad5111a8a259e976594d7e6864e3b6d2
author yangsu@google.com <yangsu@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Jul 13 22:05:00 2011 +0000
committer yangsu@google.com <yangsu@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Jul 13 22:05:00 2011 +0000
tree 7473888b1828ccd87ddf5e2515ca58aaac7498bd
parent 0b96a84ca1c5168363ac8ce7a500bf5850870ad2

Updated SkUIView to use the current code, added a default gl interface for ios
http://codereview.appspot.com/4717043/


git-svn-id: http://skia.googlecode.com/svn/trunk@1855 2bbb7eff-a529-9590-31e7-b0007b416f81

gpu/include/SkUIView.h

diff --git a/gpu/include/SkUIView.h b/gpu/include/SkUIView.h
index 5e12e00..c862744 100644
--- a/gpu/include/SkUIView.h
+++ b/gpu/include/SkUIView.h
@@ -12,7 +12,6 @@
 
 @interface SkUIView : UIView <UIAccelerometerDelegate> {
     BOOL fRedrawRequestPending;
-    SkOSWindow* fWind;
     SkMatrix    fMatrix, fLocalMatrix;
     bool        fNeedGestureEnded;
 
@@ -38,8 +37,6 @@
         GLint           fHeight;
     } fGL;
     
-    UILabel* fTitleLabel;
-
     enum Backend {
         kGL_Backend,
         kRaster_Backend,
@@ -48,14 +45,20 @@
     // these are visible to DetailViewController
     Backend fBackend;
     bool    fComplexClip;
+    
+    UINavigationItem* fTitle;
+    SkOSWindow* fWind;
 }
 
 @property (nonatomic, assign) SkOSWindow *fWind;
-@property (nonatomic, retain) UILabel* fTitleLabel;
+@property (nonatomic, retain) UINavigationItem* fTitle;
 @property (nonatomic, assign) Backend fBackend;
 @property (nonatomic, assign) bool fComplexClip;
 @property (nonatomic, assign, setter=setWarpState) bool fUseWarp;
 
+- (void)initGestures;
+- (void)flushLocalMatrix;
+
 - (void)setSkTitle:(const char*)title;
 - (void)postInvalWithRect:(const SkIRect*)rectOrNil;
 - (BOOL)onHandleEvent:(const SkEvent&)event;