Revert 191400 "cc: Add ‘chromium_code’: 1 to cc.gyp and cc_t..."

trunk/src/cc/trees/layer_tree_host_impl_unittest.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 "cc/trees/layer_tree_host_impl.h"
 
 #include <cmath>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 1561 matching lines @@
   gfx::Transform expected_scale;
   expected_scale.Scale(page_scale, page_scale);
   EXPECT_EQ(expected_scale,
             host_impl_->active_tree()->root_layer()->impl_transform());
 }
 
 TEST_F(LayerTreeHostImplTest, PageScaleDeltaAppliedToRootScrollLayerOnly) {
   gfx::Size surface_size(10, 10);
   float default_page_scale = 1.f;
   gfx::Transform default_page_scale_matrix;
-  default_page_scale_matrix.Scale(default_page_scale, default_page_scale);
 
   float new_page_scale = 2.f;
   gfx::Transform new_page_scale_matrix;
   new_page_scale_matrix.Scale(new_page_scale, new_page_scale);
 
   // Create a normal scrollable root layer and another scrollable child layer.
   SetupScrollAndContentsLayers(surface_size);
   LayerImpl* root = host_impl_->active_tree()->root_layer();
   LayerImpl* child = root->children()[0];
 
@@ skipping 1378 matching lines @@
     return WebKit::WebString();
   }
 
   unsigned num_textures() const { return num_textures_; }
 
  private:
   base::hash_map<WebKit::WebGLId, bool> textures_;
   unsigned num_textures_;
 };
 
+static unsigned CreateResourceId(ResourceProvider* resource_provider) {
+  return resource_provider->CreateResource(
+      gfx::Size(20, 12),
+      resource_provider->best_texture_format(),
+      ResourceProvider::TextureUsageAny);
+}
+
+static unsigned CreateTextureId(ResourceProvider* resource_provider) {
+  return ResourceProvider::ScopedReadLockGL(
+      resource_provider, CreateResourceId(resource_provider)).texture_id();
+}
+
 TEST_F(LayerTreeHostImplTest, LayersFreeTextures) {
   scoped_ptr<TestWebGraphicsContext3D> context =
       TestWebGraphicsContext3D::Create();
   TestWebGraphicsContext3D* context3d = context.get();
   scoped_ptr<OutputSurface> output_surface = FakeOutputSurface::Create3d(
       context.PassAs<WebKit::WebGraphicsContext3D>()).PassAs<OutputSurface>();
   host_impl_->InitializeRenderer(output_surface.Pass());
 
   scoped_ptr<LayerImpl> root_layer =
       LayerImpl::Create(host_impl_->active_tree(), 1);
@@ skipping 1986 matching lines @@
     EXPECT_EQ(gfx::RectF(0.f, 0.f, 1.f, 1.f).ToString(),
               render_pass_quad->mask_uv_rect.ToString());
 
     host_impl_->DrawLayers(&frame, base::TimeTicks::Now());
     host_impl_->DidDrawAllLayers(frame);
   }
 }
 
 }  // namespace
 }  // namespace cc