Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(143)

Side by Side Diff: content/browser/android/in_process/synchronous_compositor_impl.h

Issue 897773002: Update {virtual,override,final} to follow C++11 style. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 years, 10 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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CONTENT_BROWSER_ANDROID_IN_PROCESS_SYNCHRONOUS_COMPOSITOR_IMPL_H_ 5 #ifndef CONTENT_BROWSER_ANDROID_IN_PROCESS_SYNCHRONOUS_COMPOSITOR_IMPL_H_
6 #define CONTENT_BROWSER_ANDROID_IN_PROCESS_SYNCHRONOUS_COMPOSITOR_IMPL_H_ 6 #define CONTENT_BROWSER_ANDROID_IN_PROCESS_SYNCHRONOUS_COMPOSITOR_IMPL_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 // Called by SynchronousCompositorRegistry. 52 // Called by SynchronousCompositorRegistry.
53 void DidInitializeRendererObjects( 53 void DidInitializeRendererObjects(
54 SynchronousCompositorOutputSurface* output_surface, 54 SynchronousCompositorOutputSurface* output_surface,
55 SynchronousCompositorExternalBeginFrameSource* begin_frame_source); 55 SynchronousCompositorExternalBeginFrameSource* begin_frame_source);
56 void DidDestroyRendererObjects(); 56 void DidDestroyRendererObjects();
57 57
58 // Called by SynchronousCompositorExternalBeginFrameSource. 58 // Called by SynchronousCompositorExternalBeginFrameSource.
59 void NeedsBeginFramesChanged() const; 59 void NeedsBeginFramesChanged() const;
60 60
61 // SynchronousCompositor 61 // SynchronousCompositor
62 virtual bool InitializeHwDraw() override; 62 bool InitializeHwDraw() override;
63 virtual void ReleaseHwDraw() override; 63 void ReleaseHwDraw() override;
64 virtual scoped_ptr<cc::CompositorFrame> DemandDrawHw( 64 scoped_ptr<cc::CompositorFrame> DemandDrawHw(
65 gfx::Size surface_size, 65 gfx::Size surface_size,
66 const gfx::Transform& transform, 66 const gfx::Transform& transform,
67 gfx::Rect viewport, 67 gfx::Rect viewport,
68 gfx::Rect clip, 68 gfx::Rect clip,
69 gfx::Rect viewport_rect_for_tile_priority, 69 gfx::Rect viewport_rect_for_tile_priority,
70 const gfx::Transform& transform_for_tile_priority) override; 70 const gfx::Transform& transform_for_tile_priority) override;
71 virtual bool DemandDrawSw(SkCanvas* canvas) override; 71 bool DemandDrawSw(SkCanvas* canvas) override;
72 virtual void ReturnResources( 72 void ReturnResources(const cc::CompositorFrameAck& frame_ack) override;
73 const cc::CompositorFrameAck& frame_ack) override; 73 void SetMemoryPolicy(size_t bytes_limit) override;
74 virtual void SetMemoryPolicy(size_t bytes_limit) override; 74 void DidChangeRootLayerScrollOffset() override;
75 virtual void DidChangeRootLayerScrollOffset() override;
76 75
77 // LayerScrollOffsetDelegate 76 // LayerScrollOffsetDelegate
78 virtual gfx::ScrollOffset GetTotalScrollOffset() override; 77 gfx::ScrollOffset GetTotalScrollOffset() override;
79 virtual void UpdateRootLayerState( 78 void UpdateRootLayerState(const gfx::ScrollOffset& total_scroll_offset,
80 const gfx::ScrollOffset& total_scroll_offset, 79 const gfx::ScrollOffset& max_scroll_offset,
81 const gfx::ScrollOffset& max_scroll_offset, 80 const gfx::SizeF& scrollable_size,
82 const gfx::SizeF& scrollable_size, 81 float page_scale_factor,
83 float page_scale_factor, 82 float min_page_scale_factor,
84 float min_page_scale_factor, 83 float max_page_scale_factor) override;
85 float max_page_scale_factor) override; 84 bool IsExternalFlingActive() const override;
86 virtual bool IsExternalFlingActive() const override;
87 85
88 void SetInputHandler(cc::InputHandler* input_handler); 86 void SetInputHandler(cc::InputHandler* input_handler);
89 void DidOverscroll(const DidOverscrollParams& params); 87 void DidOverscroll(const DidOverscrollParams& params);
90 void DidStopFlinging(); 88 void DidStopFlinging();
91 89
92 private: 90 private:
93 friend class WebContentsUserData<SynchronousCompositorImpl>; 91 friend class WebContentsUserData<SynchronousCompositorImpl>;
94 friend class SynchronousCompositor; 92 friend class SynchronousCompositor;
95 explicit SynchronousCompositorImpl(WebContents* contents); 93 explicit SynchronousCompositorImpl(WebContents* contents);
96 virtual ~SynchronousCompositorImpl(); 94 ~SynchronousCompositorImpl() override;
97 95
98 void SetClient(SynchronousCompositorClient* compositor_client); 96 void SetClient(SynchronousCompositorClient* compositor_client);
99 void UpdateFrameMetaData(const cc::CompositorFrameMetadata& frame_info); 97 void UpdateFrameMetaData(const cc::CompositorFrameMetadata& frame_info);
100 void NotifyDidDestroyCompositorToClient(); 98 void NotifyDidDestroyCompositorToClient();
101 void DidActivatePendingTree(); 99 void DidActivatePendingTree();
102 void DeliverMessages(); 100 void DeliverMessages();
103 bool CalledOnValidThread() const; 101 bool CalledOnValidThread() const;
104 102
105 SynchronousCompositorClient* compositor_client_; 103 SynchronousCompositorClient* compositor_client_;
106 SynchronousCompositorOutputSurface* output_surface_; 104 SynchronousCompositorOutputSurface* output_surface_;
107 SynchronousCompositorExternalBeginFrameSource* begin_frame_source_; 105 SynchronousCompositorExternalBeginFrameSource* begin_frame_source_;
108 WebContents* contents_; 106 WebContents* contents_;
109 const int routing_id_; 107 const int routing_id_;
110 cc::InputHandler* input_handler_; 108 cc::InputHandler* input_handler_;
111 bool invoking_composite_; 109 bool invoking_composite_;
112 110
113 base::WeakPtrFactory<SynchronousCompositorImpl> weak_ptr_factory_; 111 base::WeakPtrFactory<SynchronousCompositorImpl> weak_ptr_factory_;
114 112
115 DISALLOW_COPY_AND_ASSIGN(SynchronousCompositorImpl); 113 DISALLOW_COPY_AND_ASSIGN(SynchronousCompositorImpl);
116 }; 114 };
117 115
118 } // namespace content 116 } // namespace content
119 117
120 #endif // CONTENT_BROWSER_ANDROID_IN_PROCESS_SYNCHRONOUS_COMPOSITOR_IMPL_H_ 118 #endif // CONTENT_BROWSER_ANDROID_IN_PROCESS_SYNCHRONOUS_COMPOSITOR_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698