content/browser/android/synchronous_compositor_host.h - Issue 2347563003: Added FrameFuture class

Unified Diff: content/browser/android/synchronous_compositor_host.h

Issue 2347563003: Added FrameFuture class (Closed)

Patch Set: Code review Created 4 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

« android_webview/browser/hardware_renderer.cc ('K') | « android_webview/browser/hardware_renderer.cc ('k') | content/browser/android/synchronous_compositor_host.cc » ('j') | content/browser/android/synchronous_compositor_host.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/android/synchronous_compositor_host.h

diff --git a/content/browser/android/synchronous_compositor_host.h b/content/browser/android/synchronous_compositor_host.h

index 44b0bc2d65fec7c7172c35e1a89e519620af7c0e..26365c1b4ac7d27c562dcf03800f436886128a07 100644

--- a/content/browser/android/synchronous_compositor_host.h

+++ b/content/browser/android/synchronous_compositor_host.h

@@ -11,6 +11,7 @@

#include <memory>

#include "base/macros.h"

+#include "base/memory/ref_counted.h"

#include "base/memory/weak_ptr.h"

#include "base/single_thread_task_runner.h"

#include "cc/output/compositor_frame.h"

@@ -54,11 +55,11 @@ class SynchronousCompositorHost : public SynchronousCompositor {

~SynchronousCompositorHost() override;

// SynchronousCompositor overrides.

- SynchronousCompositor::Frame DemandDrawHw(

+ scoped_refptr<SynchronousCompositor::FrameFuture> DemandDrawHw(

const gfx::Size& viewport_size,

const gfx::Rect& viewport_rect_for_tile_priority,

const gfx::Transform& transform_for_tile_priority) override;

- void DemandDrawHwAsync(

+ scoped_refptr<SynchronousCompositor::FrameFuture> DemandDrawHwAsync(

boliu 2016/09/20 00:27:56 leave this void for now, if you are not using the

ojars 2016/09/22 18:21:38 Done.

const gfx::Size& viewport_size,

const gfx::Rect& viewport_rect_for_tile_priority,

const gfx::Transform& transform_for_tile_priority) override;

@@ -95,7 +96,7 @@ class SynchronousCompositorHost : public SynchronousCompositor {

bool DemandDrawSwInProc(SkCanvas* canvas);

void SetSoftwareDrawSharedMemoryIfNeeded(size_t stride, size_t buffer_size);

void SendZeroMemory();

- SynchronousCompositor::Frame ProcessHardwareFrame(

+ std::unique_ptr<SynchronousCompositor::Frame> ProcessHardwareFrame(

uint32_t compositor_frame_sink_id,

cc::CompositorFrame compositor_frame);

bool DemandDrawHwReceiveFrame(const IPC::Message& message);

@@ -111,6 +112,7 @@ class SynchronousCompositorHost : public SynchronousCompositor {

size_t bytes_limit_;

std::unique_ptr<SharedMemoryWithSize> software_draw_shm_;

+ scoped_refptr<SynchronousCompositor::FrameFuture> frame_future_;

boliu 2016/09/20 00:27:56 you don't need this

ojars 2016/09/22 18:21:39 Done.

// Updated by both renderer and browser.

gfx::ScrollOffset root_scroll_offset_;