Patch from https://codereview.chromium.org/11111005/ without actual file deletes

cc/software_renderer.cc

 // Copyright 2012 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"
 
 #include "CCRendererSoftware.h"
 
 #include "CCDebugBorderDrawQuad.h"
 #include "CCSolidColorDrawQuad.h"
@@ skipping 50 matching lines @@
 
 CCRendererSoftware::CCRendererSoftware(CCRendererClient* client, CCResourceProvider* resourceProvider, WebCompositorSoftwareOutputDevice* outputDevice)
     : CCDirectRenderer(client, resourceProvider)
     , m_visible(true)
     , m_outputDevice(outputDevice)
     , m_skCurrentCanvas(0)
 {
     m_resourceProvider->setDefaultResourceType(CCResourceProvider::Bitmap);
 
     m_capabilities.maxTextureSize = INT_MAX;
-    m_capabilities.bestTextureFormat = GraphicsContext3D::RGBA;
+    m_capabilities.bestTextureFormat = GL_RGBA;
     m_capabilities.contextHasCachedFrontBuffer = true;
     m_capabilities.usingSetVisibility = true;
 
     viewportChanged();
 }
 
 CCRendererSoftware::~CCRendererSoftware()
 {
 }
 
@@ skipping 188 matching lines @@
 }
 
 void CCRendererSoftware::setVisible(bool visible)
 {
     if (m_visible == visible)
         return;
     m_visible = visible;
 }
 
 }