diff options
| -rw-r--r-- | cc/bitmap_skpicture_canvas_layer_texture_updater.cc | 10 | ||||
| -rw-r--r-- | cc/canvas_layer_texture_updater.cc | 6 | ||||
| -rw-r--r-- | cc/scrollbar_animation_controller.cc | 10 |
3 files changed, 13 insertions, 13 deletions
diff --git a/cc/bitmap_skpicture_canvas_layer_texture_updater.cc b/cc/bitmap_skpicture_canvas_layer_texture_updater.cc index 3887746..1ff99ee 100644 --- a/cc/bitmap_skpicture_canvas_layer_texture_updater.cc +++ b/cc/bitmap_skpicture_canvas_layer_texture_updater.cc @@ -8,11 +8,11 @@ #include "CCRenderingStats.h" #include "CCTextureUpdateQueue.h" +#include "base/time.h" #include "cc/layer_painter.h" #include "cc/platform_color.h" #include "third_party/skia/include/core/SkCanvas.h" #include "third_party/skia/include/core/SkDevice.h" -#include <wtf/CurrentTime.h> namespace cc { @@ -29,9 +29,9 @@ void BitmapSkPictureCanvasLayerTextureUpdater::Texture::update(CCTextureUpdateQu m_bitmap.setIsOpaque(m_textureUpdater->layerIsOpaque()); SkDevice device(m_bitmap); SkCanvas canvas(&device); - double paintBeginTime = monotonicallyIncreasingTime(); + base::TimeTicks paintBeginTime = base::TimeTicks::Now(); textureUpdater()->paintContentsRect(&canvas, sourceRect, stats); - stats.totalPaintTimeInSeconds += monotonicallyIncreasingTime() - paintBeginTime; + stats.totalPaintTimeInSeconds += (base::TimeTicks::Now() - paintBeginTime).InSecondsF(); ResourceUpdate upload = ResourceUpdate::Create( texture(), &m_bitmap, sourceRect, sourceRect, destOffset); @@ -72,9 +72,9 @@ void BitmapSkPictureCanvasLayerTextureUpdater::paintContentsRect(SkCanvas* canva // Translate the origin of contentRect to that of sourceRect. canvas->translate(contentRect().x() - sourceRect.x(), contentRect().y() - sourceRect.y()); - double rasterizeBeginTime = monotonicallyIncreasingTime(); + base::TimeTicks rasterizeBeginTime = base::TimeTicks::Now(); drawPicture(canvas); - stats.totalRasterizeTimeInSeconds += monotonicallyIncreasingTime() - rasterizeBeginTime; + stats.totalRasterizeTimeInSeconds += (base::TimeTicks::Now() - rasterizeBeginTime).InSecondsF(); } } // namespace cc diff --git a/cc/canvas_layer_texture_updater.cc b/cc/canvas_layer_texture_updater.cc index 6af93d9..0a658dc 100644 --- a/cc/canvas_layer_texture_updater.cc +++ b/cc/canvas_layer_texture_updater.cc @@ -10,11 +10,11 @@ #include "FloatRect.h" #include "SkiaUtils.h" #include "base/debug/trace_event.h" +#include "base/time.h" #include "cc/layer_painter.h" #include "third_party/skia/include/core/SkCanvas.h" #include "third_party/skia/include/core/SkPaint.h" #include "third_party/skia/include/core/SkRect.h" -#include <wtf/CurrentTime.h> namespace cc { @@ -51,9 +51,9 @@ void CanvasLayerTextureUpdater::paintContents(SkCanvas* canvas, const IntRect& c canvas->clipRect(layerSkRect); FloatRect opaqueLayerRect; - double paintBeginTime = monotonicallyIncreasingTime(); + base::TimeTicks paintBeginTime = base::TimeTicks::Now(); m_painter->paint(canvas, layerRect, opaqueLayerRect); - stats.totalPaintTimeInSeconds += monotonicallyIncreasingTime() - paintBeginTime; + stats.totalPaintTimeInSeconds += (base::TimeTicks::Now() - paintBeginTime).InSecondsF(); canvas->restore(); FloatRect opaqueContentRect = opaqueLayerRect; diff --git a/cc/scrollbar_animation_controller.cc b/cc/scrollbar_animation_controller.cc index 534ec3c..f52099f 100644 --- a/cc/scrollbar_animation_controller.cc +++ b/cc/scrollbar_animation_controller.cc @@ -7,7 +7,7 @@ #include "CCScrollbarAnimationController.h" #include "CCScrollbarLayerImpl.h" -#include <wtf/CurrentTime.h> +#include "base/time.h" #if OS(ANDROID) #include "CCScrollbarAnimationControllerLinearFade.h" @@ -47,22 +47,22 @@ bool CCScrollbarAnimationController::animate(double) void CCScrollbarAnimationController::didPinchGestureBegin() { - didPinchGestureBeginAtTime(monotonicallyIncreasingTime()); + didPinchGestureBeginAtTime((base::TimeTicks::Now() - base::TimeTicks()).InSecondsF()); } void CCScrollbarAnimationController::didPinchGestureUpdate() { - didPinchGestureUpdateAtTime(monotonicallyIncreasingTime()); + didPinchGestureUpdateAtTime((base::TimeTicks::Now() - base::TimeTicks()).InSecondsF()); } void CCScrollbarAnimationController::didPinchGestureEnd() { - didPinchGestureEndAtTime(monotonicallyIncreasingTime()); + didPinchGestureEndAtTime((base::TimeTicks::Now() - base::TimeTicks()).InSecondsF()); } void CCScrollbarAnimationController::updateScrollOffset(CCLayerImpl* scrollLayer) { - updateScrollOffsetAtTime(scrollLayer, monotonicallyIncreasingTime()); + updateScrollOffsetAtTime(scrollLayer, (base::TimeTicks::Now() - base::TimeTicks()).InSecondsF()); } IntSize CCScrollbarAnimationController::getScrollLayerBounds(const CCLayerImpl* scrollLayer) |