merge with changes for GPU backend
git-svn-id: http://skia.googlecode.com/svn/trunk@637 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/include/views/SkOSWindow_Mac.h b/include/views/SkOSWindow_Mac.h
index 98e76b0..3a26d5a 100644
--- a/include/views/SkOSWindow_Mac.h
+++ b/include/views/SkOSWindow_Mac.h
@@ -33,7 +33,12 @@
static OSStatus EventHandler(EventHandlerCallRef inHandler,
EventRef inEvent, void* userData);
- void doPaint(void* ctx);
+ void doPaint(void* ctx);
+
+
+ bool attachGL(const SkBitmap* offscreen);
+ void detachGL();
+ void presentGL();
protected:
// overrides from SkEventSink
@@ -43,10 +48,12 @@
// overrides from SkView
virtual void onAddMenu(const SkOSMenu*);
virtual void onSetTitle(const char[]);
+
private:
void* fHWND;
void* fHVIEW;
+ void* fAGLCtx;
typedef SkWindow INHERITED;
};