Patching Mac files missed in first delivery

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

4 files changed, 16 insertions, 16 deletions

diff --git a/src/views/ios/SkOSWindow_iOS.mm b/src/views/ios/SkOSWindow_iOS.mm
index be6f44d797..81ae37c60a 100755
--- a/src/views/ios/SkOSWindow_iOS.mm
+++ b/src/views/ios/SkOSWindow_iOS.mm
@@ -54,12 +54,12 @@ void SkOSWindow::onUpdateMenu(const SkOSMenu* menu) {
     [(SkUIView*)fHWND onUpdateMenu:menu];
 }
 
-bool SkOSWindow::attachGL() {
+bool SkOSWindow::attach(SkBackEndTypes /* attachType */) {
     bool success = true;
     return success;
 }
 
-void SkOSWindow::detachGL() {}
+void SkOSWindow::detach() {}
 
-void SkOSWindow::presentGL() {
+void SkOSWindow::present() {
 }
diff --git a/src/views/mac/SkNSView.h b/src/views/mac/SkNSView.h
index 6b8989a713..60727eb3e6 100644
--- a/src/views/mac/SkNSView.h
+++ b/src/views/mac/SkNSView.h
@@ -42,7 +42,7 @@ class SkEvent;
 - (void)postInvalWithRect:(const SkIRect*)rectOrNil;
 - (BOOL)onHandleEvent:(const SkEvent&)event;
 
-- (bool)attachGL;
-- (void)detachGL;
-- (void)presentGL;
+- (bool)attach:(SkOSWindow::SkBackEndTypes)attachType;
+- (void)detach;
+- (void)present;
 @end
diff --git a/src/views/mac/SkNSView.mm b/src/views/mac/SkNSView.mm
index b520dd5f7f..a6aa59cbef 100644
--- a/src/views/mac/SkNSView.mm
+++ b/src/views/mac/SkNSView.mm
@@ -265,7 +265,7 @@ CGLContextObj createGLContext() {
         [fGLContext setView:self];
     }
 }
-- (bool)attachGL {
+- (bool)attach:(SkOSWindow::SkBackEndTypes)attachType {
     if (nil == fGLContext) {
         fGLContext = [[NSOpenGLContext alloc] initWithCGLContextObj:createGLContext()];
         if (NULL == fGLContext) {
@@ -282,11 +282,11 @@ CGLContextObj createGLContext() {
     return true;
 }
 
-- (void)detachGL {
+- (void)detach {
     [fGLContext clearDrawable];
 }
 
-- (void)presentGL {
+- (void)present {
     [fGLContext flushBuffer];
 }
-@end
\ No newline at end of file
+@end
diff --git a/src/views/mac/SkOSWindow_Mac.mm b/src/views/mac/SkOSWindow_Mac.mm
index 7ac36d54a7..4aa4eb5ff8 100644
--- a/src/views/mac/SkOSWindow_Mac.mm
+++ b/src/views/mac/SkOSWindow_Mac.mm
@@ -63,16 +63,16 @@ void SkOSWindow::onUpdateMenu(const SkOSMenu* menu) {
     [(SkNSView*)fHWND onUpdateMenu:menu];
 }
 
-bool SkOSWindow::attachGL() {
-    return [(SkNSView*)fHWND attachGL];
+bool SkOSWindow::attach(SkBackEndTypes attachType) {
+    return [(SkNSView*)fHWND attach:attachType];
 }
 
-void SkOSWindow::detachGL() {
-    [(SkNSView*)fHWND detachGL];
+void SkOSWindow::detach() {
+    [(SkNSView*)fHWND detach];
 }
 
-void SkOSWindow::presentGL() {
-    [(SkNSView*)fHWND presentGL];
+void SkOSWindow::present() {
+    [(SkNSView*)fHWND present];
 }
 
 #endif