Commit 83430576 authored by Adithya Srinivasan's avatar Adithya Srinivasan Committed by Commit Bot

Use base::TimeTicks in OffScreenCanvas

Using a double timestamp is error prone and it's hard to tell which
units are being used.

Bug: 763980
Cq-Include-Trybots: luci.chromium.try:linux_layout_tests_slimming_paint_v2;master.tryserver.blink:linux_trusty_blink_rel
Change-Id: I2bb9e1fba0df15be9954cf055abed78016c39c9a
Reviewed-on: https://chromium-review.googlesource.com/1114180
Commit-Queue: Adithya Srinivasan <adithyas@chromium.org>
Reviewed-by: default avatarJeremy Roman <jbroman@chromium.org>
Cr-Commit-Position: refs/heads/master@{#570795}
parent 5ac08a72
...@@ -415,7 +415,7 @@ void HTMLCanvasElement::FinalizeFrame() { ...@@ -415,7 +415,7 @@ void HTMLCanvasElement::FinalizeFrame() {
if (LowLatencyEnabled() && !dirty_rect_.IsEmpty()) { if (LowLatencyEnabled() && !dirty_rect_.IsEmpty()) {
// Push a frame // Push a frame
double start_time = WTF::CurrentTimeTicksInSeconds(); base::TimeTicks start_time = WTF::CurrentTimeTicks();
scoped_refptr<StaticBitmapImage> image = scoped_refptr<StaticBitmapImage> image =
canvas2d_bridge_->NewImageSnapshot(kPreferAcceleration); canvas2d_bridge_->NewImageSnapshot(kPreferAcceleration);
FloatRect src_rect(0, 0, Size().Width(), Size().Height()); FloatRect src_rect(0, 0, Size().Width(), Size().Height());
......
...@@ -49,7 +49,7 @@ void OffscreenCanvas::Commit(scoped_refptr<StaticBitmapImage> bitmap_image, ...@@ -49,7 +49,7 @@ void OffscreenCanvas::Commit(scoped_refptr<StaticBitmapImage> bitmap_image,
if (!HasPlaceholderCanvas()) if (!HasPlaceholderCanvas())
return; return;
double commit_start_time = WTF::CurrentTimeTicksInSeconds(); base::TimeTicks commit_start_time = WTF::CurrentTimeTicks();
current_frame_damage_rect_.join(damage_rect); current_frame_damage_rect_.join(damage_rect);
GetOrCreateFrameDispatcher()->DispatchFrameSync( GetOrCreateFrameDispatcher()->DispatchFrameSync(
std::move(bitmap_image), commit_start_time, current_frame_damage_rect_); std::move(bitmap_image), commit_start_time, current_frame_damage_rect_);
...@@ -329,7 +329,7 @@ void OffscreenCanvas::PushFrame(scoped_refptr<StaticBitmapImage> image, ...@@ -329,7 +329,7 @@ void OffscreenCanvas::PushFrame(scoped_refptr<StaticBitmapImage> image,
current_frame_damage_rect_.join(damage_rect); current_frame_damage_rect_.join(damage_rect);
if (current_frame_damage_rect_.isEmpty()) if (current_frame_damage_rect_.isEmpty())
return; return;
double commit_start_time = WTF::CurrentTimeTicksInSeconds(); base::TimeTicks commit_start_time = WTF::CurrentTimeTicks();
GetOrCreateFrameDispatcher()->DispatchFrame( GetOrCreateFrameDispatcher()->DispatchFrame(
std::move(image), commit_start_time, current_frame_damage_rect_); std::move(image), commit_start_time, current_frame_damage_rect_);
current_frame_damage_rect_ = SkIRect::MakeEmpty(); current_frame_damage_rect_ = SkIRect::MakeEmpty();
......
...@@ -128,7 +128,7 @@ void CanvasResourceDispatcher::PostImageToPlaceholder( ...@@ -128,7 +128,7 @@ void CanvasResourceDispatcher::PostImageToPlaceholder(
void CanvasResourceDispatcher::DispatchFrameSync( void CanvasResourceDispatcher::DispatchFrameSync(
scoped_refptr<StaticBitmapImage> image, scoped_refptr<StaticBitmapImage> image,
double commit_start_time, base::TimeTicks commit_start_time,
const SkIRect& damage_rect) { const SkIRect& damage_rect) {
scoped_refptr<CanvasResource> canvas_resource = CanvasResourceBitmap::Create( scoped_refptr<CanvasResource> canvas_resource = CanvasResourceBitmap::Create(
std::move(image), std::move(image),
...@@ -150,7 +150,7 @@ void CanvasResourceDispatcher::DispatchFrameSync( ...@@ -150,7 +150,7 @@ void CanvasResourceDispatcher::DispatchFrameSync(
void CanvasResourceDispatcher::DispatchFrame( void CanvasResourceDispatcher::DispatchFrame(
scoped_refptr<StaticBitmapImage> image, scoped_refptr<StaticBitmapImage> image,
double commit_start_time, base::TimeTicks commit_start_time,
const SkIRect& damage_rect) { const SkIRect& damage_rect) {
scoped_refptr<CanvasResource> canvas_resource = CanvasResourceBitmap::Create( scoped_refptr<CanvasResource> canvas_resource = CanvasResourceBitmap::Create(
std::move(image), std::move(image),
...@@ -170,7 +170,7 @@ void CanvasResourceDispatcher::DispatchFrame( ...@@ -170,7 +170,7 @@ void CanvasResourceDispatcher::DispatchFrame(
bool CanvasResourceDispatcher::PrepareFrame( bool CanvasResourceDispatcher::PrepareFrame(
scoped_refptr<CanvasResource> canvas_resource, scoped_refptr<CanvasResource> canvas_resource,
double commit_start_time, base::TimeTicks commit_start_time,
const SkIRect& damage_rect, const SkIRect& damage_rect,
viz::CompositorFrame* frame) { viz::CompositorFrame* frame) {
DCHECK(canvas_resource->IsBitmap()); DCHECK(canvas_resource->IsBitmap());
...@@ -295,7 +295,7 @@ bool CanvasResourceDispatcher::PrepareFrame( ...@@ -295,7 +295,7 @@ bool CanvasResourceDispatcher::PrepareFrame(
frame->render_pass_list.push_back(std::move(pass)); frame->render_pass_list.push_back(std::move(pass));
double elapsed_time = WTF::CurrentTimeTicksInSeconds() - commit_start_time; base::TimeDelta elapsed_time = WTF::CurrentTimeTicks() - commit_start_time;
switch (commit_type) { switch (commit_type) {
case kCommitGPUCanvasGPUCompositing: case kCommitGPUCanvasGPUCompositing:
...@@ -304,16 +304,16 @@ bool CanvasResourceDispatcher::PrepareFrame( ...@@ -304,16 +304,16 @@ bool CanvasResourceDispatcher::PrepareFrame(
CustomCountHistogram, commit_gpu_canvas_gpu_compositing_main_timer, CustomCountHistogram, commit_gpu_canvas_gpu_compositing_main_timer,
("Blink.Canvas.OffscreenCommit.GPUCanvasGPUCompositingMain", 0, ("Blink.Canvas.OffscreenCommit.GPUCanvasGPUCompositingMain", 0,
10000000, 50)); 10000000, 50));
commit_gpu_canvas_gpu_compositing_main_timer.Count(elapsed_time * commit_gpu_canvas_gpu_compositing_main_timer.Count(
1000000.0); elapsed_time.InMicroseconds());
} else { } else {
DEFINE_THREAD_SAFE_STATIC_LOCAL( DEFINE_THREAD_SAFE_STATIC_LOCAL(
CustomCountHistogram, CustomCountHistogram,
commit_gpu_canvas_gpu_compositing_worker_timer, commit_gpu_canvas_gpu_compositing_worker_timer,
("Blink.Canvas.OffscreenCommit.GPUCanvasGPUCompositingWorker", 0, ("Blink.Canvas.OffscreenCommit.GPUCanvasGPUCompositingWorker", 0,
10000000, 50)); 10000000, 50));
commit_gpu_canvas_gpu_compositing_worker_timer.Count(elapsed_time * commit_gpu_canvas_gpu_compositing_worker_timer.Count(
1000000.0); elapsed_time.InMicroseconds());
} }
break; break;
case kCommitGPUCanvasSoftwareCompositing: case kCommitGPUCanvasSoftwareCompositing:
...@@ -323,8 +323,8 @@ bool CanvasResourceDispatcher::PrepareFrame( ...@@ -323,8 +323,8 @@ bool CanvasResourceDispatcher::PrepareFrame(
commit_gpu_canvas_software_compositing_main_timer, commit_gpu_canvas_software_compositing_main_timer,
("Blink.Canvas.OffscreenCommit.GPUCanvasSoftwareCompositingMain", 0, ("Blink.Canvas.OffscreenCommit.GPUCanvasSoftwareCompositingMain", 0,
10000000, 50)); 10000000, 50));
commit_gpu_canvas_software_compositing_main_timer.Count(elapsed_time * commit_gpu_canvas_software_compositing_main_timer.Count(
1000000.0); elapsed_time.InMicroseconds());
} else { } else {
DEFINE_THREAD_SAFE_STATIC_LOCAL( DEFINE_THREAD_SAFE_STATIC_LOCAL(
CustomCountHistogram, CustomCountHistogram,
...@@ -332,8 +332,8 @@ bool CanvasResourceDispatcher::PrepareFrame( ...@@ -332,8 +332,8 @@ bool CanvasResourceDispatcher::PrepareFrame(
("Blink.Canvas.OffscreenCommit." ("Blink.Canvas.OffscreenCommit."
"GPUCanvasSoftwareCompositingWorker", "GPUCanvasSoftwareCompositingWorker",
0, 10000000, 50)); 0, 10000000, 50));
commit_gpu_canvas_software_compositing_worker_timer.Count(elapsed_time * commit_gpu_canvas_software_compositing_worker_timer.Count(
1000000.0); elapsed_time.InMicroseconds());
} }
break; break;
case kCommitSoftwareCanvasGPUCompositing: case kCommitSoftwareCanvasGPUCompositing:
...@@ -343,8 +343,8 @@ bool CanvasResourceDispatcher::PrepareFrame( ...@@ -343,8 +343,8 @@ bool CanvasResourceDispatcher::PrepareFrame(
commit_software_canvas_gpu_compositing_main_timer, commit_software_canvas_gpu_compositing_main_timer,
("Blink.Canvas.OffscreenCommit.SoftwareCanvasGPUCompositingMain", 0, ("Blink.Canvas.OffscreenCommit.SoftwareCanvasGPUCompositingMain", 0,
10000000, 50)); 10000000, 50));
commit_software_canvas_gpu_compositing_main_timer.Count(elapsed_time * commit_software_canvas_gpu_compositing_main_timer.Count(
1000000.0); elapsed_time.InMicroseconds());
} else { } else {
DEFINE_THREAD_SAFE_STATIC_LOCAL( DEFINE_THREAD_SAFE_STATIC_LOCAL(
CustomCountHistogram, CustomCountHistogram,
...@@ -352,8 +352,8 @@ bool CanvasResourceDispatcher::PrepareFrame( ...@@ -352,8 +352,8 @@ bool CanvasResourceDispatcher::PrepareFrame(
("Blink.Canvas.OffscreenCommit." ("Blink.Canvas.OffscreenCommit."
"SoftwareCanvasGPUCompositingWorker", "SoftwareCanvasGPUCompositingWorker",
0, 10000000, 50)); 0, 10000000, 50));
commit_software_canvas_gpu_compositing_worker_timer.Count(elapsed_time * commit_software_canvas_gpu_compositing_worker_timer.Count(
1000000.0); elapsed_time.InMicroseconds());
} }
break; break;
case kCommitSoftwareCanvasSoftwareCompositing: case kCommitSoftwareCanvasSoftwareCompositing:
...@@ -365,7 +365,7 @@ bool CanvasResourceDispatcher::PrepareFrame( ...@@ -365,7 +365,7 @@ bool CanvasResourceDispatcher::PrepareFrame(
"SoftwareCanvasSoftwareCompositingMain", "SoftwareCanvasSoftwareCompositingMain",
0, 10000000, 50)); 0, 10000000, 50));
commit_software_canvas_software_compositing_main_timer.Count( commit_software_canvas_software_compositing_main_timer.Count(
elapsed_time * 1000000.0); elapsed_time.InMicroseconds());
} else { } else {
DEFINE_THREAD_SAFE_STATIC_LOCAL( DEFINE_THREAD_SAFE_STATIC_LOCAL(
CustomCountHistogram, CustomCountHistogram,
...@@ -374,7 +374,7 @@ bool CanvasResourceDispatcher::PrepareFrame( ...@@ -374,7 +374,7 @@ bool CanvasResourceDispatcher::PrepareFrame(
"SoftwareCanvasSoftwareCompositingWorker", "SoftwareCanvasSoftwareCompositingWorker",
0, 10000000, 50)); 0, 10000000, 50));
commit_software_canvas_software_compositing_worker_timer.Count( commit_software_canvas_software_compositing_worker_timer.Count(
elapsed_time * 1000000.0); elapsed_time.InMicroseconds());
} }
break; break;
case kOffscreenCanvasCommitTypeCount: case kOffscreenCanvasCommitTypeCount:
......
...@@ -48,11 +48,11 @@ class PLATFORM_EXPORT CanvasResourceDispatcher ...@@ -48,11 +48,11 @@ class PLATFORM_EXPORT CanvasResourceDispatcher
bool NeedsBeginFrame() const { return needs_begin_frame_; } bool NeedsBeginFrame() const { return needs_begin_frame_; }
bool IsAnimationSuspended() const { return suspend_animation_; } bool IsAnimationSuspended() const { return suspend_animation_; }
void DispatchFrame(scoped_refptr<StaticBitmapImage>, void DispatchFrame(scoped_refptr<StaticBitmapImage>,
double commit_start_time, base::TimeTicks commit_start_time,
const SkIRect& damage_rect); const SkIRect& damage_rect);
void ReclaimResource(viz::ResourceId); void ReclaimResource(viz::ResourceId);
void DispatchFrameSync(scoped_refptr<StaticBitmapImage>, void DispatchFrameSync(scoped_refptr<StaticBitmapImage>,
double commit_start_time, base::TimeTicks commit_start_time,
const SkIRect& damage_rect); const SkIRect& damage_rect);
void Reshape(const IntSize&); void Reshape(const IntSize&);
...@@ -86,7 +86,7 @@ class PLATFORM_EXPORT CanvasResourceDispatcher ...@@ -86,7 +86,7 @@ class PLATFORM_EXPORT CanvasResourceDispatcher
friend class CanvasResourceDispatcherTest; friend class CanvasResourceDispatcherTest;
bool PrepareFrame(scoped_refptr<CanvasResource>, bool PrepareFrame(scoped_refptr<CanvasResource>,
double commit_start_time, base::TimeTicks commit_start_time,
const SkIRect& damage_rect, const SkIRect& damage_rect,
viz::CompositorFrame* frame); viz::CompositorFrame* frame);
......
...@@ -60,8 +60,8 @@ class CanvasResourceDispatcherTest : public testing::Test { ...@@ -60,8 +60,8 @@ class CanvasResourceDispatcherTest : public testing::Test {
void CanvasResourceDispatcherTest::DispatchOneFrame() { void CanvasResourceDispatcherTest::DispatchOneFrame() {
sk_sp<SkSurface> surface = SkSurface::MakeRasterN32Premul(10, 10); sk_sp<SkSurface> surface = SkSurface::MakeRasterN32Premul(10, 10);
dispatcher_->DispatchFrame( dispatcher_->DispatchFrame(
StaticBitmapImage::Create(surface->makeImageSnapshot()), 0.0, StaticBitmapImage::Create(surface->makeImageSnapshot()),
SkIRect::MakeEmpty()); base::TimeTicks(), SkIRect::MakeEmpty());
} }
TEST_F(CanvasResourceDispatcherTest, PlaceholderRunsNormally) { TEST_F(CanvasResourceDispatcherTest, PlaceholderRunsNormally) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment