Revert of Always apply UniformMatrix4fvStreamTextureMatrixCHROMIUM matrix argument.

cc/output/gl_renderer.cc

 // Copyright 2010 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/gl_renderer.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ skipping 2299 matching lines @@
   SetUseProgram(program->program());
 
   ToGLMatrix(&gl_matrix[0], quad->matrix);
 
   ResourceProvider::ScopedReadLockGL lock(resource_provider_,
                                           quad->resource_id());
 
   DCHECK_EQ(GL_TEXTURE0, GetActiveTextureUnit(gl_));
   gl_->BindTexture(GL_TEXTURE_EXTERNAL_OES, lock.texture_id());
 
+  // TODO(liberato): stream_texture_android should stop sending |gl_matrix| to
+  // the video frame provider with this change (and to us), but it should
+  // start reporting the current matrix via
+  // GLStreamTextureImage::GetTextureMatrix.  Until then, though, this will use
+  // the matrix that we provide to it, unless the GLStreamTextureImage
+  // overrides it.  This lets it also work with AVDACodecImage, which provides
+  // the correct custom matrix and supplies a default one to us.
   gl_->UniformMatrix4fvStreamTextureMatrixCHROMIUM(
       program->vertex_shader().tex_matrix_location(), false, gl_matrix);
 
   gl_->Uniform1i(program->fragment_shader().sampler_location(), 0);
 
   SetShaderOpacity(quad->shared_quad_state->opacity,
                    program->fragment_shader().alpha_location());
   if (!clip_region) {
     DrawQuadGeometry(frame, quad->shared_quad_state->quad_to_target_transform,
                      gfx::RectF(quad->rect),
@@ skipping 1349 matching lines @@
       texture_id = pending_overlay_resources_.back()->texture_id();
     }
 
     context_support_->ScheduleOverlayPlane(
         overlay.plane_z_order, overlay.transform, texture_id,
         ToNearestRect(overlay.display_rect), overlay.uv_rect);
   }
 }
 
 }  // namespace cc