commit e295313f019d36be5303673dd0c58c751e516fdb
author bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu Oct 13 13:33:08 2011 +0000
committer bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu Oct 13 13:33:08 2011 +0000
tree 6b897489326972a4231112894a1a7c6b23e7edcb
parent 1ba7137fc0dcace0c1be1367fe977202c63746ba

move utils/SkEGLContext to gpu/SkGLContext, some gpu.gyp cleanup, set eol style LF on all gpu files

Review URL: http://codereview.appspot.com/5242056/



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

tests/Test.cpp

diff --git a/tests/Test.cpp b/tests/Test.cpp
index e8a16f4..55d884d 100644
--- a/tests/Test.cpp
+++ b/tests/Test.cpp
@@ -8,7 +8,7 @@
 #include "Test.h"
 
 #include "GrContext.h"
-#include "SkEGLContext.h"
+#include "SkGLContext.h"
 #include "SkTLazy.h"
 
 using namespace skiatest;
@@ -79,12 +79,12 @@
 
 GrContext* GpuTest::GetContext() {
     // preserve this order, we want gGrContext destroyed after gEGLContext
-    static SkTLazy<SkEGLContext> gEGLContext;
+    static SkTLazy<SkGLContext> gGLContext;
     static SkAutoTUnref<GrContext> gGrContext;
 
     if (NULL == gGrContext.get()) {
-        gEGLContext.init();
-        if (gEGLContext.get()->init(800, 600)) {
+        gGLContext.init();
+        if (gGLContext.get()->init(800, 600)) {
             gGrContext.reset(GrContext::Create(kOpenGL_Shaders_GrEngine, NULL));
         }
     }