Utils must not depend on Views.

http://codereview.appspot.com/5867051/


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

1 files changed, 0 insertions, 292 deletions

diff --git a/src/utils/mac/SkNSView.mm b/src/utils/mac/SkNSView.mm
deleted file mode 100644
index b520dd5f7f..0000000000
--- a/src/utils/mac/SkNSView.mm
+++ /dev/null
@@ -1,292 +0,0 @@
-
-/*
- * Copyright 2011 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#import "SkNSView.h"s
-#include "SkCanvas.h"
-#include "SkCGUtils.h"
-#include "SkEvent.h"
-
-//#define FORCE_REDRAW
-@implementation SkNSView
-@synthesize fWind, fTitle, fOptionsDelegate, fGLContext;
-
-- (id)initWithCoder:(NSCoder*)coder {
-    if ((self = [super initWithCoder:coder])) {
-        self = [self initWithDefaults];
-        [self setUpWindow];
-    }
-    return self;
-}
-
-- (id)initWithFrame:(NSRect)frameRect {
-    if (self = [super initWithFrame:frameRect]) {
-        self = [self initWithDefaults];
-        [self setUpWindow];
-    }
-    return self;
-}
-
-- (id)initWithDefaults {
-    fRedrawRequestPending = false;
-    fWind = NULL;
-    return self;
-}
-
-- (void)setUpWindow {
-    if (NULL != fWind) {
-        fWind->setVisibleP(true);
-        fWind->resize(self.frame.size.width, self.frame.size.height, 
-                      SkBitmap::kARGB_8888_Config);
-    }
-}
-
--(BOOL) isFlipped {
-    return YES;
-}
-
-- (BOOL)acceptsFirstResponder {
-    return YES;
-}
-
-- (void)resizeSkView:(NSSize)newSize {
-    if (NULL != fWind && (fWind->width() != newSize.width || fWind->height() != newSize.height)) {
-        fWind->resize(newSize.width, newSize.height);
-        glClear(GL_STENCIL_BUFFER_BIT);
-        [fGLContext update];
-    }
-}
-
-- (void) setFrameSize:(NSSize)newSize {
-    [super setFrameSize:newSize];
-    [self resizeSkView:newSize];
-}
-
-- (void)dealloc {
-    delete fWind;
-    self.fGLContext = nil;
-    self.fTitle = nil;
-    [super dealloc];
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-- (void)drawSkia {
-    fRedrawRequestPending = false;
-    if (NULL != fWind) {
-        SkCanvas canvas(fWind->getBitmap());
-        fWind->draw(&canvas);
-#ifdef FORCE_REDRAW
-        fWind->inval(NULL);
-#endif
-    }
-}
-
-- (void)setSkTitle:(const char *)title {
-    self.fTitle = [NSString stringWithUTF8String:title];
-    [[self window] setTitle:self.fTitle];
-}
-
-- (BOOL)onHandleEvent:(const SkEvent&)evt {
-    return false;
-}
-
-#include "SkOSMenu.h"
-- (void)onAddMenu:(const SkOSMenu*)menu {
-    [self.fOptionsDelegate view:self didAddMenu:menu];
-}
-
-- (void)onUpdateMenu:(const SkOSMenu*)menu {
-    [self.fOptionsDelegate view:self didUpdateMenu:menu];
-}
-
-- (void)postInvalWithRect:(const SkIRect*)r {
-    if (!fRedrawRequestPending) {
-        fRedrawRequestPending = true;
-        [self setNeedsDisplay:YES];
-        [self performSelector:@selector(drawSkia) withObject:nil afterDelay:0];
-    }
-}
-///////////////////////////////////////////////////////////////////////////////
-
-#include "SkKey.h"
-enum {
-	SK_MacReturnKey		= 36,
-	SK_MacDeleteKey		= 51,
-	SK_MacEndKey		= 119,
-	SK_MacLeftKey		= 123,
-	SK_MacRightKey		= 124,
-	SK_MacDownKey		= 125,
-	SK_MacUpKey			= 126,
-    SK_Mac0Key          = 0x52,
-    SK_Mac1Key          = 0x53,
-    SK_Mac2Key          = 0x54,
-    SK_Mac3Key          = 0x55,
-    SK_Mac4Key          = 0x56,
-    SK_Mac5Key          = 0x57,
-    SK_Mac6Key          = 0x58,
-    SK_Mac7Key          = 0x59,
-    SK_Mac8Key          = 0x5b,
-    SK_Mac9Key          = 0x5c
-};
-
-static SkKey raw2key(UInt32 raw)
-{
-	static const struct {
-		UInt32  fRaw;
-		SkKey   fKey;
-	} gKeys[] = {
-		{ SK_MacUpKey,		kUp_SkKey		},
-		{ SK_MacDownKey,	kDown_SkKey		},
-		{ SK_MacLeftKey,	kLeft_SkKey		},
-		{ SK_MacRightKey,   kRight_SkKey	},
-		{ SK_MacReturnKey,  kOK_SkKey		},
-		{ SK_MacDeleteKey,  kBack_SkKey		},
-		{ SK_MacEndKey,		kEnd_SkKey		},
-        { SK_Mac0Key,       k0_SkKey        },
-        { SK_Mac1Key,       k1_SkKey        },
-        { SK_Mac2Key,       k2_SkKey        },
-        { SK_Mac3Key,       k3_SkKey        },
-        { SK_Mac4Key,       k4_SkKey        },
-        { SK_Mac5Key,       k5_SkKey        },
-        { SK_Mac6Key,       k6_SkKey        },
-        { SK_Mac7Key,       k7_SkKey        },
-        { SK_Mac8Key,       k8_SkKey        },
-        { SK_Mac9Key,       k9_SkKey        }
-	};
-    
-	for (unsigned i = 0; i < SK_ARRAY_COUNT(gKeys); i++)
-		if (gKeys[i].fRaw == raw)
-			return gKeys[i].fKey;
-	return kNONE_SkKey;
-}
-
-- (void)keyDown:(NSEvent *)event {
-    if (NULL == fWind)
-        return;
-    
-    SkKey key = raw2key([event keyCode]);
-    if (kNONE_SkKey != key)
-        fWind->handleKey(key);
-    else{
-        unichar c = [[event characters] characterAtIndex:0];
-        fWind->handleChar((SkUnichar)c);
-    }
-}
-
-- (void)keyUp:(NSEvent *)event {
-    if (NULL == fWind)
-        return;
-    
-    SkKey key = raw2key([event keyCode]);
-    if (kNONE_SkKey != key)
-        fWind->handleKeyUp(key);
-    else{
-        unichar c = [[event characters] characterAtIndex:0];
-    }
-}
-
-- (void)mouseDown:(NSEvent *)event {
-    NSPoint p = [event locationInWindow];
-    if ([self mouse:p inRect:[self bounds]] && NULL != fWind) {
-        NSPoint loc = [self convertPoint:p fromView:nil];
-        fWind->handleClick(loc.x, loc.y, SkView::Click::kDown_State, self);
-    }
-}
-
-- (void)mouseDragged:(NSEvent *)event {
-    NSPoint p = [event locationInWindow];
-    if ([self mouse:p inRect:[self bounds]] && NULL != fWind) {
-        NSPoint loc = [self convertPoint:p fromView:nil];
-        fWind->handleClick(loc.x, loc.y, SkView::Click::kMoved_State, self);
-    }
-}
-
-- (void)mouseMoved:(NSEvent *)event {
-    NSPoint p = [event locationInWindow];
-    if ([self mouse:p inRect:[self bounds]] && NULL != fWind) {
-        NSPoint loc = [self convertPoint:p fromView:nil];
-        fWind->handleClick(loc.x, loc.y, SkView::Click::kMoved_State, self);
-    }
-}
-
-- (void)mouseUp:(NSEvent *)event {
-    NSPoint p = [event locationInWindow];
-    if ([self mouse:p inRect:[self bounds]] && NULL != fWind) {
-        NSPoint loc = [self convertPoint:p fromView:nil];
-        fWind->handleClick(loc.x, loc.y, SkView::Click::kUp_State, self);
-    }
-}
-
-///////////////////////////////////////////////////////////////////////////////
-#include <OpenGL/OpenGL.h>
-
-CGLContextObj createGLContext() {
-    GLint major, minor;
-    CGLGetVersion(&major, &minor);
-    
-    const CGLPixelFormatAttribute attributes[] = {
-        kCGLPFAStencilSize, (CGLPixelFormatAttribute)8,
-#if USE_MSAA
-        kCGLPFASampleBuffers, 1,
-        kCGLPFAMultisample,
-        kCGLPFASamples, 8,
-#endif
-        kCGLPFAAccelerated,
-        kCGLPFADoubleBuffer,
-        (CGLPixelFormatAttribute)0
-    };
-    
-    CGLPixelFormatObj format;
-    GLint npix;
-    CGLChoosePixelFormat(attributes, &format, &npix);
-    
-    CGLContextObj ctx;
-    CGLCreateContext(format, NULL, &ctx);
-    CGLDestroyPixelFormat(format);
-    
-    static const GLint interval = 1;
-    CGLSetParameter(ctx, kCGLCPSwapInterval, &interval);
-    CGLSetCurrentContext(ctx);
-    return ctx;
-}
-
-- (void)viewDidMoveToWindow {
-    [super viewDidMoveToWindow];
-    
-    //Attaching view to fGLContext requires that the view to be part of a window,
-    //and that the NSWindow instance must have a CoreGraphics counterpart (or 
-    //it must NOT be deferred or should have been on screen at least once)
-    if ([fGLContext view] != self && nil != self.window) {
-        [fGLContext setView:self];
-    }
-}
-- (bool)attachGL {
-    if (nil == fGLContext) {
-        fGLContext = [[NSOpenGLContext alloc] initWithCGLContextObj:createGLContext()];
-        if (NULL == fGLContext) {
-            return false;
-        }
-    }
-    
-    [fGLContext makeCurrentContext];
-    
-    glViewport(0, 0, self.bounds.size.width, self.bounds.size.width);
-    glClearColor(0, 0, 0, 0);
-    glClearStencil(0);
-    glClear(GL_COLOR_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
-    return true;
-}
-
-- (void)detachGL {
-    [fGLContext clearDrawable];
-}
-
-- (void)presentGL {
-    [fGLContext flushBuffer];
-}
-@end
\ No newline at end of file