GrContextFactory can now expose the GLContext it is using.

Review URL: https://codereview.appspot.com/6461081

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

diff --git a/gyp/tests.gyp b/gyp/tests.gyp
index b128a54..efb41f8 100644 (file)
--- a/gyp/tests.gyp
+++ b/gyp/tests.gyp
@@ -47,6 +47,7 @@
         '../tests/GeometryTest.cpp',
         '../tests/GLInterfaceValidation.cpp',
         '../tests/GLProgramsTest.cpp',
+        '../tests/GrContextFactoryTest.cpp',
         '../tests/GradientTest.cpp',
         '../tests/GrMemoryPoolTest.cpp',
         '../tests/InfRectTest.cpp',

diff --git a/include/gpu/GrContextFactory.h b/include/gpu/GrContextFactory.h
index 9f14f3b..409c7fa 100644 (file)
--- a/include/gpu/GrContextFactory.h
+++ b/include/gpu/GrContextFactory.h
@@ -109,6 +109,19 @@ public:
         ctx.fType = type;
         return ctx.fGrContext;
     }
+
+    // Returns the GLContext of the given type. If it has not been created yet,
+    // NULL is returned instead.
+    SkGLContext* getGLContext(GLContextType type) {
+        for (int i = 0; i < fContexts.count(); ++i) {
+            if (fContexts[i].fType == type) {
+                return fContexts[i].fGLContext;
+            }
+        }
+
+        return NULL;
+    }
+
 private:
     struct GPUContext {
         GLContextType             fType;

diff --git a/tests/GrContextFactoryTest.cpp b/tests/GrContextFactoryTest.cpp
new file mode 100644 (file)
index 0000000..80f1418
--- /dev/null
+++ b/tests/GrContextFactoryTest.cpp
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2011 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "Test.h"
+
+// This is a GPU-backend specific test
+#if SK_SUPPORT_GPU
+#include "GrContextFactory.h"
+
+static void test_context_factory(skiatest::Reporter* reporter) {
+    GrContextFactory contextFactory;
+
+    // Before we ask for a context, we expect the GL context to not be there.
+    REPORTER_ASSERT(reporter,
+                    NULL == contextFactory.getGLContext(GrContextFactory::kNative_GLContextType));
+
+    // After we ask for a context, we expect that the GL context to be there.
+    contextFactory.get(GrContextFactory::kNative_GLContextType);
+    REPORTER_ASSERT(reporter,
+                    contextFactory.getGLContext(GrContextFactory::kNative_GLContextType) != NULL);
+
+    // If we did not ask for a context with the particular GL context, we would
+    // expect the particular GL context to not be there.
+    REPORTER_ASSERT(reporter,
+                    NULL == contextFactory.getGLContext(GrContextFactory::kNull_GLContextType));
+}
+
+
+#include "TestClassDef.h"
+DEFINE_TESTCLASS("GrContextFactory", GrContextFactoryClass, test_context_factory);
+
+#endif