| Index: cc/heads_up_display_layer_impl.cc
|
| diff --git a/cc/heads_up_display_layer_impl.cc b/cc/heads_up_display_layer_impl.cc
|
| index 3d560288a9c2274d58015a98b56e2355024a69ef..137fa508c8fea955d9ad555c3a412e5adae220e4 100644
|
| --- a/cc/heads_up_display_layer_impl.cc
|
| +++ b/cc/heads_up_display_layer_impl.cc
|
| @@ -78,9 +78,9 @@ void HeadsUpDisplayLayerImpl::appendQuads(QuadSink& quadSink, AppendQuadsData& a
|
|
|
| SharedQuadState* sharedQuadState = quadSink.useSharedQuadState(createSharedQuadState());
|
|
|
| - IntRect quadRect(IntPoint(), bounds());
|
| + gfx::Rect quadRect(gfx::Point(), bounds());
|
| bool premultipliedAlpha = true;
|
| - FloatRect uvRect(0, 0, 1, 1);
|
| + gfx::RectF uvRect(0, 0, 1, 1);
|
| bool flipped = false;
|
| quadSink.append(TextureDrawQuad::create(sharedQuadState, quadRect, m_hudTexture->id(), premultipliedAlpha, uvRect, flipped).PassAs<DrawQuad>(), appendQuadsData);
|
| }
|
| @@ -232,7 +232,7 @@ void HeadsUpDisplayLayerImpl::drawFPSCounterText(SkCanvas* canvas, FrameRateCoun
|
|
|
| // Draw FPS text.
|
| if (m_fontAtlas.get())
|
| - m_fontAtlas->drawText(canvas, createPaint(), base::StringPrintf("FPS: %4.1f +/- %3.1f", averageFPS, stdDeviation), gfx::Point(10, height / 3), IntSize(width, height));
|
| + m_fontAtlas->drawText(canvas, createPaint(), base::StringPrintf("FPS: %4.1f +/- %3.1f", averageFPS, stdDeviation), gfx::Point(10, height / 3), gfx::Size(width, height));
|
| }
|
|
|
| void HeadsUpDisplayLayerImpl::drawDebugRects(SkCanvas* canvas, DebugRectHistory* debugRectHistory)
|
| @@ -276,7 +276,7 @@ void HeadsUpDisplayLayerImpl::drawDebugRects(SkCanvas* canvas, DebugRectHistory*
|
| break;
|
| }
|
|
|
| - const FloatRect& rect = debugRects[i].rect;
|
| + const gfx::RectF& rect = debugRects[i].rect;
|
| SkRect skRect = SkRect::MakeXYWH(rect.x(), rect.y(), rect.width(), rect.height());
|
| SkPaint paint = createPaint();
|
| paint.setColor(fillColor);
|
|
|