Revert 2289. GLSL version detection not robust enough. May think we don't have GLSL 1.50 support based on OpenGL version. We have to look at the available extensions, not just GL version.

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

1 files changed, 0 insertions, 38 deletions

diff --git a/include/core/SkTArray.h b/include/core/SkTArray.h
index 3e2a00687b..975aeed639 100644
--- a/include/core/SkTArray.h
+++ b/include/core/SkTArray.h
@@ -246,16 +246,6 @@ public:
     }
 
     /**
-     * Version of above that uses a copy constructor to initialize the new item
-     */
-    T& push_back(const T& t) {
-        checkRealloc(1);
-        new ((char*)fMemArray+sizeof(T)*fCount) T(t);
-        ++fCount;
-        return fItemArray[fCount-1];
-    }
-
-    /**
      * Allocates n more default T values, and returns the address of the start
      * of that new range. Note: this address is only valid until the next API
      * call made on the array that might add or remove elements.
@@ -271,34 +261,6 @@ public:
     }
 
     /**
-     * Version of above that uses a copy constructor to initialize all n items
-     * to the same T.
-     */
-    T* push_back_n(int n, const T& t) {
-        SkASSERT(n >= 0);
-        checkRealloc(n);
-        for (int i = 0; i < n; ++i) {
-            new (fItemArray + fCount + i) T(t);
-        }
-        fCount += n;
-        return fItemArray + fCount - n;
-    }
-
-    /**
-     * Version of above that uses a copy constructor to initialize the n items
-     * to separate T values.
-     */
-    T* push_back_n(int n, const T t[]) {
-        SkASSERT(n >= 0);
-        checkRealloc(n);
-        for (int i = 0; i < n; ++i) {
-            new (fItemArray + fCount + i) T(t[i]);
-        }
-        fCount += n;
-        return fItemArray + fCount - n;
-    }
-
-    /**
      * Removes the last element. Not safe to call when count() == 0.
      */
     void pop_back() {