cc/trees/layer_tree_host_impl.h - Issue 1418273002: cc: Move draw params from SetExternalDrawConstraints to OnDraw

Unified Diff: cc/trees/layer_tree_host_impl.h

Issue 1418273002: cc: Move draw params from SetExternalDrawConstraints to OnDraw (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: tests fixed Created 5 years, 1 month 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

Download patch

Index: cc/trees/layer_tree_host_impl.h

diff --git a/cc/trees/layer_tree_host_impl.h b/cc/trees/layer_tree_host_impl.h

index e8d981acab4d03d19718a9d1af932bd6ce11d832..63bec58bfd66dff6d4e084e3951d5ba715a74350 100644

--- a/cc/trees/layer_tree_host_impl.h

+++ b/cc/trees/layer_tree_host_impl.h

@@ -96,8 +96,6 @@ class LayerTreeHostImplClient {

virtual void SetMaxSwapsPendingOnImplThread(int max) = 0;

virtual void DidSwapBuffersOnImplThread() = 0;

virtual void DidSwapBuffersCompleteOnImplThread() = 0;

- virtual void OnResourcelessSoftareDrawStateChanged(

danakj 2015/11/24 21:17:31 Softare :D

- bool resourceless_draw) = 0;

virtual void OnCanDrawStateChanged(bool can_draw) = 0;

virtual void NotifyReadyToActivate() = 0;

virtual void NotifyReadyToDraw() = 0;

@@ -124,7 +122,7 @@ class LayerTreeHostImplClient {

virtual void DidCompletePageScaleAnimationOnImplThread() = 0;

// Called when output surface asks for a draw.

- virtual void OnDrawForOutputSurface() = 0;

+ virtual void OnDrawForOutputSurface(bool resourceless_software_draw) = 0;

virtual void PostFrameTimingEventsOnImplThread(

scoped_ptr<FrameTimingTracker::CompositeTimingSet> composite_events,

@@ -300,6 +298,8 @@ class CC_EXPORT LayerTreeHostImpl

void ResetTreesForTesting();

size_t SourceAnimationFrameNumberForTesting() const;

+ void SetExternalViewporForTesting(const gfx::Rect& external_viewport);

danakj 2015/11/24 21:17:31 "Viewport"

boliu 2015/11/24 23:27:38 Done.

+ void SetResourcelessSoftwareDrawForTesting(bool resourceless_software_draw);

void RegisterScrollbarAnimationController(int scroll_layer_id);

void UnregisterScrollbarAnimationController(int scroll_layer_id);

@@ -346,19 +346,18 @@ class CC_EXPORT LayerTreeHostImpl

base::TimeDelta interval) override;

void SetNeedsRedrawRect(const gfx::Rect& rect) override;

void SetExternalDrawConstraints(

danakj 2015/11/24 21:17:31 Now more like SetExternalTilePriority...Constraint

boliu 2015/11/24 23:27:38 Done Also dropped the _for_tile_priority part fro

- const gfx::Transform& transform,

- const gfx::Rect& viewport,

- const gfx::Rect& clip,

const gfx::Rect& viewport_rect_for_tile_priority,

- const gfx::Transform& transform_for_tile_priority,

- bool resourceless_software_draw) override;

+ const gfx::Transform& transform_for_tile_priority) override;

void DidLoseOutputSurface() override;

void DidSwapBuffers() override;

void DidSwapBuffersComplete() override;

void ReclaimResources(const CompositorFrameAck* ack) override;

void SetMemoryPolicy(const ManagedMemoryPolicy& policy) override;

void SetTreeActivationCallback(const base::Closure& callback) override;

- void OnDraw() override;

+ void OnDraw(const gfx::Transform& transform,

+ const gfx::Rect& viewport,

+ const gfx::Rect& clip,

+ bool resourceless_software_draw) override;

// Called from LayerTreeImpl.

void OnCanDrawStateChangedForTree();

« cc/test/fake_output_surface.h ('K') | « cc/test/layer_tree_pixel_test.cc ('k') | cc/trees/layer_tree_host_impl.cc » ('j') | cc/trees/layer_tree_host_impl.cc » ('J')