WIP Handle AwContents needing multiple live functors.

android_webview/browser/browser_view_renderer_unittest.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 <map>
 #include <queue>
 #include <utility>
 
 #include "android_webview/browser/browser_view_renderer.h"
 #include "android_webview/browser/child_frame.h"
@@ skipping 105 matching lines @@
       return false;
 
     return !constraints1.is_layer ||
            constraints1.surface_rect_empty == constraints2.surface_rect_empty;
   }
 
   void OnParentDrawConstraintsUpdated() override {
     ParentCompositorDrawConstraints constraints =
         GetCompositorFrameConsumer()->GetParentDrawConstraintsOnUI();
     switch (on_draw_count_) {
+      case 0u:
+        EXPECT_TRUE(DrawConstraintsEquals(constraints, initial_constraints_));

[boliu, 2016/05/05 21:40:32]

iirc leaving this out was a deliberate choice, this test does not ensure what
the state of parent constraint is at the beginning

[Tobias Sargeant, 2016/05/06 12:41:09]

We can remove the EXPECT_TRUE, however this CL adds in an
OnParentDrawConstraintsUpdated as soon as the producer is connected to a
consumer, so we get this call now on frame 0, whereas we didn't before, so the
case 0u: needs to be here because otherwuse we hit the default: FAIL().

+        break;
       case 1u:
         EXPECT_TRUE(DrawConstraintsEquals(constraints, new_constraints_));
         break;
       case 3u:
         EXPECT_TRUE(DrawConstraintsEquals(constraints, initial_constraints_));
         EndTest();
         break;
       // There will be a following 4th onDraw. But the hardware renderer won't
       // post back the draw constraints in DrawGL because the constraints
       // don't change.
@@ skipping 191 matching lines @@
     std::unique_ptr<content::SynchronousCompositor::Frame> frame(
         new content::SynchronousCompositor::Frame);
     frame->output_surface_id = output_surface_id;
     frame->frame = ConstructFrame(resource_id);
     ++expected_return_count_[output_surface_id][resource_id];
     return frame;
   }
 
   void CheckResults() override {
     OutputSurfaceResourceCountMap resource_counts;
+    browser_view_renderer_->SetCurrentCompositorFrameConsumer(nullptr);
     render_thread_manager_.reset();
     // Make sure resources for the last frame are returned.
     EXPECT_EQ(expected_return_count_, GetReturnedResourceCounts());
     EndTest();
   }
 
  private:
   OutputSurfaceResourceCountMap expected_return_count_;
 };
 
 RENDERING_TEST_F(RenderThreadManagerDeletionTest);
 
 }  // namespace android_webview