Revert "Pull chromium at 2c3ffb2355a27c32f45e508ef861416b820c823b"

cc/output/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 "cc/output/software_renderer.h"
 
 #include "base/trace_event/trace_event.h"
 #include "cc/base/math_util.h"
 #include "cc/output/compositor_frame.h"
 #include "cc/output/compositor_frame_ack.h"
@@ skipping 205 matching lines @@
 #endif
   }
 }
 
 void SoftwareRenderer::SetDrawViewport(
     const gfx::Rect& window_space_viewport) {}
 
 bool SoftwareRenderer::IsSoftwareResource(
     ResourceProvider::ResourceId resource_id) const {
   switch (resource_provider_->GetResourceType(resource_id)) {
-    case ResourceProvider::RESOURCE_TYPE_GL_TEXTURE:
+    case ResourceProvider::GLTexture:
       return false;
-    case ResourceProvider::RESOURCE_TYPE_BITMAP:
+    case ResourceProvider::Bitmap:
       return true;
-    case ResourceProvider::RESOURCE_TYPE_INVALID:
+    case ResourceProvider::InvalidType:
       break;
   }
 
   LOG(FATAL) << "Invalid resource type.";
   return false;
 }
 
 void SoftwareRenderer::DoDrawQuad(DrawingFrame* frame, const DrawQuad* quad) {
   TRACE_EVENT0("cc", "SoftwareRenderer::DoDrawQuad");
   gfx::Transform quad_rect_matrix;
@@ skipping 371 matching lines @@
 }
 
 void SoftwareRenderer::DidChangeVisibility() {
   if (visible())
     EnsureBackbuffer();
   else
     DiscardBackbuffer();
 }
 
 }  // namespace cc