Use std::string instead of WTF::String / TextStream

cc/ProgramBinding.cpp

 // Copyright 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 
 #if USE(ACCELERATED_COMPOSITING)
 
 #include "ProgramBinding.h"
 
 #include "CCRendererGL.h" // For the GLC() macro.
 #include "GeometryBinding.h"
 #include "GraphicsContext3D.h"
 #include "TraceEvent.h"
 #include <public/WebGraphicsContext3D.h>
-#include <wtf/text/CString.h>
 
 using WebKit::WebGraphicsContext3D;
 
 namespace WebCore {
 
 ProgramBindingBase::ProgramBindingBase()
     : m_program(0)
     , m_vertexShaderId(0)
     , m_fragmentShaderId(0)
     , m_initialized(false)
 {
 }
 
 ProgramBindingBase::~ProgramBindingBase()
 {
     // If you hit these asserts, you initialized but forgot to call cleanup().
     ASSERT(!m_program);
     ASSERT(!m_vertexShaderId);
     ASSERT(!m_fragmentShaderId);
     ASSERT(!m_initialized);
 }
 
 static bool contextLost(WebGraphicsContext3D* context)
 {
     return (context->getGraphicsResetStatusARB() != GraphicsContext3D::NO_ERROR);
 }
 
 
-void ProgramBindingBase::init(WebGraphicsContext3D* context, const String& vertexShader, const String& fragmentShader)
+void ProgramBindingBase::init(WebGraphicsContext3D* context, const std::string& vertexShader, const std::string& fragmentShader)
 {
     TRACE_EVENT0("cc", "ProgramBindingBase::init");
     m_vertexShaderId = loadShader(context, GraphicsContext3D::VERTEX_SHADER, vertexShader);
     if (!m_vertexShaderId) {
         if (!contextLost(context))
             LOG_ERROR("Failed to create vertex shader");
         return;
     }
 
     m_fragmentShaderId = loadShader(context, GraphicsContext3D::FRAGMENT_SHADER, fragmentShader);
@@ skipping 31 matching lines @@
     if (!m_program)
         return;
 
     ASSERT(context);
     GLC(context, context->deleteProgram(m_program));
     m_program = 0;
 
     cleanupShaders(context);
 }
 
-unsigned ProgramBindingBase::loadShader(WebGraphicsContext3D* context, unsigned type, const String& shaderSource)
+unsigned ProgramBindingBase::loadShader(WebGraphicsContext3D* context, unsigned type, const std::string& shaderSource)
 {
     unsigned shader = context->createShader(type);
     if (!shader)
         return 0;
-    String sourceString(shaderSource);
-    GLC(context, context->shaderSource(shader, sourceString.utf8().data()));
+    GLC(context, context->shaderSource(shader, shaderSource.data()));
     GLC(context, context->compileShader(shader));
 #ifndef NDEBUG
     int compiled = 0;
     GLC(context, context->getShaderiv(shader, GraphicsContext3D::COMPILE_STATUS, &compiled));
     if (!compiled) {
         GLC(context, context->deleteShader(shader));
         return 0;
     }
 #endif
     return shader;
@@ skipping 26 matching lines @@
     }
     if (m_fragmentShaderId) {
         GLC(context, context->deleteShader(m_fragmentShaderId));
         m_fragmentShaderId = 0;
     }
 }
 
 } // namespace WebCore
 
 #endif // USE(ACCELERATED_COMPOSITING)