cc: Turn DrawQuad into a struct-like class with public data members.

cc/layer_tree_host_impl.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/layer_tree_host_impl.h"
 
 #include <algorithm>
 
 #include "base/basictypes.h"
 #include "base/debug/trace_event.h"
@@ skipping 435 matching lines @@
             if (layerHasAnimatingTransform)
                 drawFrame = false;
         }
 
         occlusionTracker.leaveLayer(it);
     }
 
 #ifndef NDEBUG
     for (size_t i = 0; i < frame.renderPasses.size(); ++i) {
         for (size_t j = 0; j < frame.renderPasses[i]->quadList().size(); ++j) {
-            DCHECK(frame.renderPasses[i]->quadList()[j]->shared_quad_state());
-            DCHECK_GE(frame.renderPasses[i]->quadList()[j]->shared_quad_state()->id, 0);
+            DCHECK(frame.renderPasses[i]->quadList()[j]->shared_quad_state);
+            DCHECK_GE(frame.renderPasses[i]->quadList()[j]->shared_quad_state->id, 0);
         }
         DCHECK(frame.renderPassesById.contains(frame.renderPasses[i]->id()));
     }
 #endif
 
     if (!m_hasTransparentBackground) {
         frame.renderPasses.back()->setHasTransparentBackground(false);
         frame.renderPasses.back()->appendQuadsToFillScreen(m_rootLayerImpl.get(), m_backgroundColor, occlusionTracker);
     }
 
@@ skipping 72 matching lines @@
         return;
 
     const RenderPass* removedPass = *toRemove;
     frame.renderPasses.erase(toRemove);
 
     // Now follow up for all RenderPass quads and remove their RenderPasses recursively.
     const QuadList& quadList = removedPass->quadList();
     QuadList::constBackToFrontIterator quadListIterator = quadList.backToFrontBegin();
     for (; quadListIterator != quadList.backToFrontEnd(); ++quadListIterator) {
         DrawQuad* currentQuad = (*quadListIterator);
-        if (currentQuad->material() != DrawQuad::RENDER_PASS)
+        if (currentQuad->material != DrawQuad::RENDER_PASS)
             continue;
 
         RenderPass::Id nextRemoveRenderPassId = RenderPassDrawQuad::materialCast(currentQuad)->renderPassId();
         removeRenderPassesRecursive(nextRemoveRenderPassId, frame);
     }
 }
 
 bool LayerTreeHostImpl::CullRenderPassesWithCachedTextures::shouldRemoveRenderPass(const RenderPassDrawQuad& quad, const FrameData&) const
 {
     return quad.contentsChangedSinceLastFrame().IsEmpty() && m_renderer.haveCachedResourcesForRenderPassId(quad.renderPassId());
 }
 
 bool LayerTreeHostImpl::CullRenderPassesWithNoQuads::shouldRemoveRenderPass(const RenderPassDrawQuad& quad, const FrameData& frame) const
 {
     const RenderPass* renderPass = findRenderPassById(quad.renderPassId(), frame);
     const RenderPassList& renderPasses = frame.renderPasses;
     RenderPassList::const_iterator foundPass = std::find(renderPasses.begin(), renderPasses.end(), renderPass);
 
     bool renderPassAlreadyRemoved = foundPass == renderPasses.end();
     if (renderPassAlreadyRemoved)
         return false;
 
     // If any quad or RenderPass draws into this RenderPass, then keep it.
     const QuadList& quadList = (*foundPass)->quadList();
     for (QuadList::constBackToFrontIterator quadListIterator = quadList.backToFrontBegin(); quadListIterator != quadList.backToFrontEnd(); ++quadListIterator) {
         DrawQuad* currentQuad = *quadListIterator;
 
-        if (currentQuad->material() != DrawQuad::RENDER_PASS)
+        if (currentQuad->material != DrawQuad::RENDER_PASS)
             return false;
 
         const RenderPass* contributingPass = findRenderPassById(RenderPassDrawQuad::materialCast(currentQuad)->renderPassId(), frame);
         RenderPassList::const_iterator foundContributingPass = std::find(renderPasses.begin(), renderPasses.end(), contributingPass);
         if (foundContributingPass != renderPasses.end())
             return false;
     }
     return true;
 }
 
 // Defined for linking tests.
 template CC_EXPORT void LayerTreeHostImpl::removeRenderPasses<LayerTreeHostImpl::CullRenderPassesWithCachedTextures>(CullRenderPassesWithCachedTextures, FrameData&);
 template CC_EXPORT void LayerTreeHostImpl::removeRenderPasses<LayerTreeHostImpl::CullRenderPassesWithNoQuads>(CullRenderPassesWithNoQuads, FrameData&);
 
 // static
 template<typename RenderPassCuller>
 void LayerTreeHostImpl::removeRenderPasses(RenderPassCuller culler, FrameData& frame)
 {
     for (size_t it = culler.renderPassListBegin(frame.renderPasses); it != culler.renderPassListEnd(frame.renderPasses); it = culler.renderPassListNext(it)) {
         const RenderPass* currentPass = frame.renderPasses[it];
         const QuadList& quadList = currentPass->quadList();
         QuadList::constBackToFrontIterator quadListIterator = quadList.backToFrontBegin();
 
         for (; quadListIterator != quadList.backToFrontEnd(); ++quadListIterator) {
             DrawQuad* currentQuad = *quadListIterator;
 
-            if (currentQuad->material() != DrawQuad::RENDER_PASS)
+            if (currentQuad->material != DrawQuad::RENDER_PASS)
                 continue;
 
             RenderPassDrawQuad* renderPassQuad = static_cast<RenderPassDrawQuad*>(currentQuad);
             if (!culler.shouldRemoveRenderPass(*renderPassQuad, frame))
                 continue;
 
             // We are changing the vector in the middle of iteration. Because we
             // delete render passes that draw into the current pass, we are
             // guaranteed that any data from the iterator to the end will not
             // change. So, capture the iterator position from the end of the
@@ skipping 878 matching lines @@
     ScrollbarAnimationController* scrollbarController = layer->scrollbarAnimationController();
     double monotonicTime = (time - base::TimeTicks()).InSecondsF();
     if (scrollbarController && scrollbarController->animate(monotonicTime))
         m_client->setNeedsRedrawOnImplThread();
 
     for (size_t i = 0; i < layer->children().size(); ++i)
         animateScrollbarsRecursive(layer->children()[i], time);
 }
 
 }  // namespace cc