Provide better encapsulation for Shader member variables

src/libGLESv2/Shader.cpp

 //
-// Copyright (c) 2002-2010 The ANGLE Project Authors. All rights reserved.
+// Copyright (c) 2002-2012 The ANGLE Project Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
@@ -506,9 +506,10 @@ int VertexShader::getSemanticIndex(const std::string &attributeName)
 
 void VertexShader::parseAttributes()
 {
-    if (mHlsl)
+    const char *hlsl = getHLSL();
+    if (hlsl)
     {
-        const char *input = strstr(mHlsl, "// Attributes") + 14;
+        const char *input = strstr(hlsl, "// Attributes") + 14;
 
         while(true)
         {

src/libGLESv2/Shader.h

 //
-// Copyright (c) 2002-2010 The ANGLE Project Authors. All rights reserved.
+// Copyright (c) 2002-2012 The ANGLE Project Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
@@ -74,8 +74,6 @@ class Shader
     static void releaseCompiler();
 
   protected:
-    DISALLOW_COPY_AND_ASSIGN(Shader);
-
     void parseVaryings();
 
     void compileToHLSL(void *compiler);
@@ -85,14 +83,6 @@ class Shader
     static GLenum parseType(const std::string &type);
     static bool compareVarying(const Varying &x, const Varying &y);
 
-    const GLuint mHandle;
-    unsigned int mRefCount;     // Number of program objects this shader is attached to
-    bool mDeleteStatus;         // Flag to indicate that the shader can be deleted when no longer in use
-
-    char *mSource;
-    char *mHlsl;
-    char *mInfoLog;
-
     VaryingList varyings;
 
     bool mUsesFragCoord;
@@ -100,10 +90,21 @@ class Shader
     bool mUsesPointSize;
     bool mUsesPointCoord;
 
-    ResourceManager *mResourceManager;
-
     static void *mFragmentCompiler;
     static void *mVertexCompiler;
+
+  private:
+    DISALLOW_COPY_AND_ASSIGN(Shader);
+
+    const GLuint mHandle;
+    unsigned int mRefCount;     // Number of program objects this shader is attached to
+    bool mDeleteStatus;         // Flag to indicate that the shader can be deleted when no longer in use
+
+    char *mSource;
+    char *mHlsl;
+    char *mInfoLog;
+
+    ResourceManager *mResourceManager;
 };
 
 struct Attribute