cc: Use gfx:: Geometry types for positions, bounds, and related things.

cc/render_surface_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 "config.h"
 
 #include "cc/render_surface_impl.h"
 
 #include "base/logging.h"
 #include "base/stringprintf.h"
 #include "cc/damage_tracker.h"
 #include "cc/debug_border_draw_quad.h"
 #include "cc/delegated_renderer_layer_impl.h"
 #include "cc/layer_impl.h"
 #include "cc/math_util.h"
 #include "cc/quad_sink.h"
 #include "cc/render_pass.h"
 #include "cc/render_pass_draw_quad.h"
 #include "cc/render_pass_sink.h"
 #include "cc/shared_quad_state.h"
+#include "ui/gfx/rect_conversions.h"
 #include <public/WebTransformationMatrix.h>
 
 using WebKit::WebTransformationMatrix;
 
 namespace cc {
 
 static const int debugSurfaceBorderWidth = 2;
 static const int debugSurfaceBorderAlpha = 100;
 static const int debugSurfaceBorderColorRed = 0;
 static const int debugSurfaceBorderColorGreen = 0;
@@ skipping 13 matching lines @@
     , m_targetRenderSurfaceLayerIndexHistory(0)
     , m_currentLayerIndexHistory(0)
 {
     m_damageTracker = DamageTracker::create();
 }
 
 RenderSurfaceImpl::~RenderSurfaceImpl()
 {
 }
 
-FloatRect RenderSurfaceImpl::drawableContentRect() const
+gfx::RectF RenderSurfaceImpl::drawableContentRect() const
 {
-    FloatRect drawableContentRect = MathUtil::mapClippedRect(m_drawTransform, m_contentRect);
+    gfx::RectF drawableContentRect = MathUtil::mapClippedRect(m_drawTransform, m_contentRect);
     if (m_owningLayer->hasReplica())
-        drawableContentRect.unite(MathUtil::mapClippedRect(m_replicaDrawTransform, m_contentRect));
+        drawableContentRect.Union(MathUtil::mapClippedRect(m_replicaDrawTransform, m_contentRect));
 
     return drawableContentRect;
 }
 
 std::string RenderSurfaceImpl::name() const
 {
     return base::StringPrintf("RenderSurfaceImpl(id=%i,owner=%s)", m_owningLayer->id(), m_owningLayer->debugName().data());
 }
 
 static std::string indentString(int indent)
@@ skipping 26 matching lines @@
         m_damageTracker->currentDamageRect().x(), m_damageTracker->currentDamageRect().y(),
         m_damageTracker->currentDamageRect().width(), m_damageTracker->currentDamageRect().height());
 }
 
 int RenderSurfaceImpl::owningLayerId() const
 {
     return m_owningLayer ? m_owningLayer->id() : 0;
 }
 
 
-void RenderSurfaceImpl::setClipRect(const IntRect& clipRect)
+void RenderSurfaceImpl::setClipRect(const gfx::Rect& clipRect)
 {
     if (m_clipRect == clipRect)
         return;
 
     m_surfacePropertyChanged = true;
     m_clipRect = clipRect;
 }
 
 bool RenderSurfaceImpl::contentsChanged() const
 {
-    return !m_damageTracker->currentDamageRect().isEmpty();
+    return !m_damageTracker->currentDamageRect().IsEmpty();
 }
 
-void RenderSurfaceImpl::setContentRect(const IntRect& contentRect)
+void RenderSurfaceImpl::setContentRect(const gfx::Rect& contentRect)
 {
     if (m_contentRect == contentRect)
         return;
 
     m_surfacePropertyChanged = true;
     m_contentRect = contentRect;
 }
 
 bool RenderSurfaceImpl::surfacePropertyChanged() const
 {
@@ skipping 20 matching lines @@
     DelegatedRendererLayerImpl* delegatedRendererLayer = static_cast<DelegatedRendererLayerImpl*>(layer);
     m_contributingDelegatedRenderPassLayerList.push_back(delegatedRendererLayer);
 }
 
 void RenderSurfaceImpl::clearLayerLists()
 {
     m_layerList.clear();
     m_contributingDelegatedRenderPassLayerList.clear();
 }
 
-static inline IntRect computeClippedRectInTarget(const LayerImpl* owningLayer)
+static inline gfx::Rect computeClippedRectInTarget(const LayerImpl* owningLayer)
 {
     DCHECK(owningLayer->parent());
 
     const LayerImpl* renderTarget = owningLayer->parent()->renderTarget();
     const RenderSurfaceImpl* self = owningLayer->renderSurface();
 
-    IntRect clippedRectInTarget = self->clipRect();
+    gfx::Rect clippedRectInTarget = self->clipRect();
     if (owningLayer->backgroundFilters().hasFilterThatMovesPixels()) {
         // If the layer has background filters that move pixels, we cannot scissor as tightly.
         // FIXME: this should be able to be a tighter scissor, perhaps expanded by the filter outsets?
         clippedRectInTarget = renderTarget->renderSurface()->contentRect();
-    } else if (clippedRectInTarget.isEmpty()) {
+    } else if (clippedRectInTarget.IsEmpty()) {
         // For surfaces, empty clipRect means that the surface does not clip anything.
-        clippedRectInTarget = enclosingIntRect(intersection(renderTarget->renderSurface()->contentRect(), self->drawableContentRect()));
+        clippedRectInTarget = renderTarget->renderSurface()->contentRect();
+        clippedRectInTarget.Intersect(gfx::ToEnclosingRect(self->drawableContentRect()));
     } else
-        clippedRectInTarget.intersect(enclosingIntRect(self->drawableContentRect()));
+        clippedRectInTarget.Intersect(gfx::ToEnclosingRect(self->drawableContentRect()));
     return clippedRectInTarget;
 }
 
 RenderPass::Id RenderSurfaceImpl::renderPassId()
 {
     int layerId = m_owningLayer->id();
     int subId = 0;
     DCHECK(layerId > 0);
     return RenderPass::Id(layerId, subId);
 }
 
 void RenderSurfaceImpl::appendRenderPasses(RenderPassSink& passSink)
 {
     for (size_t i = 0; i < m_contributingDelegatedRenderPassLayerList.size(); ++i)
         m_contributingDelegatedRenderPassLayerList[i]->appendContributingRenderPasses(passSink);
 
     scoped_ptr<RenderPass> pass = RenderPass::create(renderPassId(), m_contentRect, m_screenSpaceTransform);
     pass->setDamageRect(m_damageTracker->currentDamageRect());
     pass->setFilters(m_owningLayer->filters());
     pass->setFilter(m_owningLayer->filter());
     pass->setBackgroundFilters(m_owningLayer->backgroundFilters());
     passSink.appendRenderPass(pass.Pass());
 }
 
 void RenderSurfaceImpl::appendQuads(QuadSink& quadSink, AppendQuadsData& appendQuadsData, bool forReplica, RenderPass::Id renderPassId)
 {
     DCHECK(!forReplica || m_owningLayer->hasReplica());
 
-    IntRect clippedRectInTarget = computeClippedRectInTarget(m_owningLayer);
+    gfx::Rect clippedRectInTarget = computeClippedRectInTarget(m_owningLayer);
     bool isOpaque = false;
     const WebTransformationMatrix& drawTransform = forReplica ? m_replicaDrawTransform : m_drawTransform;
     SharedQuadState* sharedQuadState = quadSink.useSharedQuadState(SharedQuadState::create(drawTransform, m_contentRect, clippedRectInTarget, m_drawOpacity, isOpaque).Pass());
 
     if (m_owningLayer->hasDebugBorders()) {
         int red = forReplica ? debugReplicaBorderColorRed : debugSurfaceBorderColorRed;
         int green = forReplica ?  debugReplicaBorderColorGreen : debugSurfaceBorderColorGreen;
         int blue = forReplica ? debugReplicaBorderColorBlue : debugSurfaceBorderColorBlue;
         SkColor color = SkColorSetARGB(debugSurfaceBorderAlpha, red, green, blue);
         quadSink.append(DebugBorderDrawQuad::create(sharedQuadState, contentRect(), color, debugSurfaceBorderWidth).PassAs<DrawQuad>(), appendQuadsData);
     }
 
     // FIXME: By using the same RenderSurfaceImpl for both the content and its reflection,
     // it's currently not possible to apply a separate mask to the reflection layer
     // or correctly handle opacity in reflections (opacity must be applied after drawing
     // both the layer and its reflection). The solution is to introduce yet another RenderSurfaceImpl
     // to draw the layer and its reflection in. For now we only apply a separate reflection
     // mask if the contents don't have a mask of their own.
     LayerImpl* maskLayer = m_owningLayer->maskLayer();
-    if (maskLayer && (!maskLayer->drawsContent() || maskLayer->bounds().isEmpty()))
+    if (maskLayer && (!maskLayer->drawsContent() || maskLayer->bounds().IsEmpty()))
         maskLayer = 0;
 
     if (!maskLayer && forReplica) {
         maskLayer = m_owningLayer->replicaLayer()->maskLayer();
-        if (maskLayer && (!maskLayer->drawsContent() || maskLayer->bounds().isEmpty()))
+        if (maskLayer && (!maskLayer->drawsContent() || maskLayer->bounds().IsEmpty()))
             maskLayer = 0;
     }
 
     float maskTexCoordScaleX = 1;
     float maskTexCoordScaleY = 1;
     float maskTexCoordOffsetX = 0;
     float maskTexCoordOffsetY = 0;
     if (maskLayer) {
         maskTexCoordScaleX = contentRect().width() / maskLayer->contentsScaleX() / maskLayer->bounds().width();
         maskTexCoordScaleY = contentRect().height() / maskLayer->contentsScaleY() / maskLayer->bounds().height();
         maskTexCoordOffsetX = static_cast<float>(contentRect().x()) / contentRect().width() * maskTexCoordScaleX;
         maskTexCoordOffsetY = static_cast<float>(contentRect().y()) / contentRect().height() * maskTexCoordScaleY;
     }
 
     ResourceProvider::ResourceId maskResourceId = maskLayer ? maskLayer->contentsResourceId() : 0;
-    IntRect contentsChangedSinceLastFrame = contentsChanged() ? m_contentRect : IntRect();
+    gfx::Rect contentsChangedSinceLastFrame = contentsChanged() ? m_contentRect : gfx::Rect();
 
     quadSink.append(RenderPassDrawQuad::create(sharedQuadState, contentRect(), renderPassId, forReplica, maskResourceId, contentsChangedSinceLastFrame,
                                                  maskTexCoordScaleX, maskTexCoordScaleY, maskTexCoordOffsetX, maskTexCoordOffsetY).PassAs<DrawQuad>(), appendQuadsData);
 }
 
 }