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

cc/tiled_layer_impl.cc

 // 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"
 
 #include "CCTiledLayerImpl.h"
 
 #include "base/basictypes.h"
 #include "base/stringprintf.h"
+#include "third_party/khronos/GLES2/gl2.h"
 #include "CCAppendQuadsData.h"
 #include "CCCheckerboardDrawQuad.h"
 #include "CCDebugBorderDrawQuad.h"
 #include "CCLayerTilingData.h"
 #include "CCMathUtil.h"
 #include "CCQuadSink.h"
 #include "CCSolidColorDrawQuad.h"
 #include "CCTileDrawQuad.h"
 #include "FloatQuad.h"
-#include "GraphicsContext3D.h"
 #include "SkColor.h"
 
 using namespace std;
 using WebKit::WebTransformationMatrix;
 
 namespace cc {
 
 static const int debugTileBorderWidth = 1;
 static const int debugTileBorderAlpha = 100;
 static const int debugTileBorderColorRed = 80;
@@ skipping 156 matching lines @@
             bool clipped = false;
             FloatQuad visibleContentInTargetQuad = CCMathUtil::mapQuad(drawTransform(), FloatQuad(visibleContentRect()), clipped);
             bool isAxisAlignedInTarget = !clipped && visibleContentInTargetQuad.isRectilinear();
             bool useAA = m_tiler->hasBorderTexels() && !isAxisAlignedInTarget;
 
             bool leftEdgeAA = !i && useAA;
             bool topEdgeAA = !j && useAA;
             bool rightEdgeAA = i == m_tiler->numTilesX() - 1 && useAA;
             bool bottomEdgeAA = j == m_tiler->numTilesY() - 1 && useAA;
 
-            const GC3Dint textureFilter = m_tiler->hasBorderTexels() ? GraphicsContext3D::LINEAR : GraphicsContext3D::NEAREST;
+            const GLint textureFilter = m_tiler->hasBorderTexels() ? GL_LINEAR : GL_NEAREST;
             quadSink.append(CCTileDrawQuad::create(sharedQuadState, tileRect, tileOpaqueRect, tile->resourceId(), textureOffset, textureSize, textureFilter, contentsSwizzled(), leftEdgeAA, topEdgeAA, rightEdgeAA, bottomEdgeAA).PassAs<CCDrawQuad>(), appendQuadsData);
         }
     }
 }
 
 void CCTiledLayerImpl::setTilingData(const CCLayerTilingData& tiler)
 {
     if (m_tiler)
         m_tiler->reset();
     else
@@ skipping 32 matching lines @@
 {
     m_tiler->reset();
 }
 
 const char* CCTiledLayerImpl::layerTypeAsString() const
 {
     return "ContentLayer";
 }
 
 } // namespace cc