Removed QuadSink and MockQuadCuller

cc/test/mock_occlusion_tracker.h

 // 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.
 
 #ifndef CC_TEST_MOCK_OCCLUSION_TRACKER_H_
 #define CC_TEST_MOCK_OCCLUSION_TRACKER_H_
 
 #include "cc/trees/occlusion_tracker.h"
 
 namespace cc {
 
 template <typename LayerType>
-class MockOcclusionTracker : public OcclusionTracker<LayerType> {
+class CC_EXPORT MockOcclusionTracker : public OcclusionTracker<LayerType> {
   // This class is used for testing only. It fakes just enough information to
   // calculate unoccluded content rect and unoccluded contributing surface
   // content rect. It calls the helper function of occlusion tracker to avoid
   // DCHECKs since testing environment won't be set up properly to pass those.
  public:
   MockOcclusionTracker()
       : OcclusionTracker<LayerType>(gfx::Rect(0, 0, 1000, 1000)) {
     typename OcclusionTracker<LayerType>::StackObject stack_obj;
     OcclusionTracker<LayerType>::stack_.push_back(stack_obj);
     OcclusionTracker<LayerType>::stack_.push_back(stack_obj);
@@ skipping 11 matching lines @@
         occluded;
   }
 
   void set_occluded_target_rect_for_contributing_surface(
       const gfx::Rect& occluded) {
     OcclusionTracker<
         LayerType>::stack_[OcclusionTracker<LayerType>::stack_.size() - 2]
         .occlusion_from_inside_target = occluded;
   }
 
-  gfx::Rect UnoccludedContentRect(
+  virtual gfx::Rect UnoccludedContentRect(

[enne (OOO), 2014/05/30 21:37:43]

style nit: don't inline virtuals

Also, isn't this the same as the base version in OcclusionTracker at this point?
Can this be removed and unvirtualized?

[weiliangc, 2014/05/30 21:46:07]

In unittest the OcclusionTracker and LayerImpls aren't set up correctly so it
fails on the DCHECKs in OcclusionTracker.

I put all the actual calculation in a helper function. The normal
OcclusionTracker still DCHECKs, and MockOT just skips to calculation.

[enne (OOO), 2014/05/30 22:11:10]

Hmm, ok.  I'm always saddened by virtual-for-testing sorts of things from a
premature performance optimization standpoint.

How hard would it be to set up tests to not DCHECK?

       const LayerType* render_target,
       const gfx::Rect& content_rect,
       const gfx::Transform& draw_transform) const OVERRIDE {
     return this->UnoccludedContentRectHelper(

[enne (OOO), 2014/05/30 21:37:43]

style nit: unnecessary this-> (here and elsewhere and in other patches)

[weiliangc, 2014/05/30 22:04:57]

I think it is either this-> or OcclusionTracker<LayerType>::, because template
derived class is a pain.

[enne (OOO), 2014/05/30 22:05:58]

Templates /o\

         render_target, content_rect, draw_transform);
   }
 
-  gfx::Rect UnoccludedContributingSurfaceContentRect(
+  virtual gfx::Rect UnoccludedContributingSurfaceContentRect(
       const LayerType* layer,
       const gfx::Rect& content_rect,
       const gfx::Transform& draw_transform) const OVERRIDE {
     return this->UnoccludedContributingSurfaceContentRectHelper(
         layer, content_rect, draw_transform);
   }
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(MockOcclusionTracker);
 };
 
 }  // namespace cc
 
 #endif  // CC_TEST_MOCK_OCCLUSION_TRACKER_H_