compositor: Fix texture flipping for SW mirroring with surfaceless

content/browser/compositor/buffer_queue.cc

 // Copyright 2014 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 "content/browser/compositor/buffer_queue.h"
 
 #include "content/browser/compositor/image_transport_factory.h"
 #include "content/browser/gpu/browser_gpu_memory_buffer_manager.h"
 #include "content/common/gpu/client/context_provider_command_buffer.h"
 #include "content/common/gpu/client/gl_helper.h"
@@ skipping 57 matching lines @@
       texture,
       source_texture,
       SkRegion(SkIRect::MakeXYWH(new_damage.x(),
                                  new_damage.y(),
                                  new_damage.width(),
                                  new_damage.height())),
       SkRegion(SkIRect::MakeXYWH(old_damage.x(),
                                  old_damage.y(),
                                  old_damage.width(),
                                  old_damage.height())));
+  // CopySubBufferDamage binds its own framebuffer, restore ours.

[danakj, 2015/01/12 18:27:30]

Should this be a separate CL?

[achaulk, 2015/01/12 18:47:35]

It could be, but SW mirroring with partial swap is broken without it since the
mirroring process will attempt to copy out of the temporary framebuffer

[danakj, 2015/01/12 19:00:07]

It doesn't seem related to flipping tho? So It would be nice to do this in
another CL with tests for it.

+  context_provider_->ContextGL()->BindFramebuffer(GL_FRAMEBUFFER, fbo_);
 }
 
 void BufferQueue::UpdateBufferDamage(const gfx::Rect& damage) {
   for (size_t i = 0; i < available_surfaces_.size(); i++)
     available_surfaces_[i].damage.Union(damage);
   for (std::deque<AllocatedSurface>::iterator it =
            in_flight_surfaces_.begin();
        it != in_flight_surfaces_.end();
        ++it)
     it->damage.Union(damage);
@@ skipping 91 matching lines @@
     gl->DeleteTextures(1, &texture);
     return AllocatedSurface();
   }
   allocated_count_++;
   gl->BindTexture(GL_TEXTURE_2D, texture);
   gl->BindTexImage2DCHROMIUM(GL_TEXTURE_2D, id);
   return AllocatedSurface(texture, id, gfx::Rect(size_));
 }
 
 }  // namespace content