Reverting r3555

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

1 files changed, 13 insertions, 25 deletions

diff --git a/include/views/SkOSWindow_Win.h b/include/views/SkOSWindow_Win.h
index 0592818ad0..c17807a2d9 100644
--- a/include/views/SkOSWindow_Win.h
+++ b/include/views/SkOSWindow_Win.h
@@ -26,19 +26,20 @@ public:
     void    updateSize();
 
     static bool PostEvent(SkEvent* evt, SkEventSinkID, SkMSec delay);
+    
+    bool attachGL();
+    void detachGL();
+    void presentGL();
 
-    enum SkBackEndTypes {
-        kNone_BackEndType,
-        kNativeGL_BackEndType,
 #if SK_ANGLE
-        kANGLE_BackEndType,
+    bool attachANGLE();
+    void detachANGLE();
+    void presentANGLE();
 #endif
-        kD3D9_BackEndType
-    };
 
-    bool attach(SkBackEndTypes attachType);
-    void detach();
-    void present();
+    bool attachD3D9();
+    void detachD3D9();
+    void presentD3D9();
 
     void* d3d9Device() { return fD3D9Device; }
 
@@ -72,26 +73,13 @@ private:
     angle::EGLSurface   fSurface;
 #endif
 
+    bool                fGLAttached;
+
     void*               fD3D9Device;
+    bool                fD3D9Attached;
 
     HMENU               fMBar;
 
-    SkBackEndTypes      fAttached;
-
-    bool attachGL();
-    void detachGL();
-    void presentGL();
-
-#if SK_ANGLE
-    bool attachANGLE();
-    void detachANGLE();
-    void presentANGLE();
-#endif
-
-    bool attachD3D9();
-    void detachD3D9();
-    void presentD3D9();
-
     typedef SkWindow INHERITED; 
 };