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

Side by Side Diff: content/browser/compositor/onscreen_display_client.h

Issue 634703003: Replacing the OVERRIDE with override and FINAL with final in content/browser/[accessibility|battery… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_COMPOSITOR_ONSCREEN_DISPLAY_CLIENT_H_ 5 #ifndef CONTENT_BROWSER_COMPOSITOR_ONSCREEN_DISPLAY_CLIENT_H_
6 #define CONTENT_BROWSER_COMPOSITOR_ONSCREEN_DISPLAY_CLIENT_H_ 6 #define CONTENT_BROWSER_COMPOSITOR_ONSCREEN_DISPLAY_CLIENT_H_
7 7
8 #include "cc/surfaces/display_client.h" 8 #include "cc/surfaces/display_client.h"
9 9
10 #include "base/memory/ref_counted.h" 10 #include "base/memory/ref_counted.h"
(...skipping 19 matching lines...) Expand all
30 scoped_refptr<base::SingleThreadTaskRunner> task_runner); 30 scoped_refptr<base::SingleThreadTaskRunner> task_runner);
31 virtual ~OnscreenDisplayClient(); 31 virtual ~OnscreenDisplayClient();
32 32
33 bool Initialize(); 33 bool Initialize();
34 cc::Display* display() { return display_.get(); } 34 cc::Display* display() { return display_.get(); }
35 void set_surface_output_surface(SurfaceDisplayOutputSurface* surface) { 35 void set_surface_output_surface(SurfaceDisplayOutputSurface* surface) {
36 surface_display_output_surface_ = surface; 36 surface_display_output_surface_ = surface;
37 } 37 }
38 38
39 // cc::DisplayClient implementation. 39 // cc::DisplayClient implementation.
40 virtual void DisplayDamaged() OVERRIDE; 40 virtual void DisplayDamaged() override;
41 virtual void DidSwapBuffers() OVERRIDE; 41 virtual void DidSwapBuffers() override;
42 virtual void DidSwapBuffersComplete() OVERRIDE; 42 virtual void DidSwapBuffersComplete() override;
43 virtual void CommitVSyncParameters(base::TimeTicks timebase, 43 virtual void CommitVSyncParameters(base::TimeTicks timebase,
44 base::TimeDelta interval) OVERRIDE; 44 base::TimeDelta interval) override;
45 virtual void OutputSurfaceLost() OVERRIDE; 45 virtual void OutputSurfaceLost() override;
46 virtual void SetMemoryPolicy(const cc::ManagedMemoryPolicy& policy) OVERRIDE; 46 virtual void SetMemoryPolicy(const cc::ManagedMemoryPolicy& policy) override;
47 47
48 private: 48 private:
49 void ScheduleDraw(); 49 void ScheduleDraw();
50 void Draw(); 50 void Draw();
51 51
52 scoped_ptr<cc::OutputSurface> output_surface_; 52 scoped_ptr<cc::OutputSurface> output_surface_;
53 scoped_ptr<cc::Display> display_; 53 scoped_ptr<cc::Display> display_;
54 scoped_refptr<base::SingleThreadTaskRunner> task_runner_; 54 scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
55 SurfaceDisplayOutputSurface* surface_display_output_surface_; 55 SurfaceDisplayOutputSurface* surface_display_output_surface_;
56 bool scheduled_draw_; 56 bool scheduled_draw_;
57 // True if a draw should be scheduled, but it's hit the limit on max frames 57 // True if a draw should be scheduled, but it's hit the limit on max frames
58 // pending. 58 // pending.
59 bool deferred_draw_; 59 bool deferred_draw_;
60 int pending_frames_; 60 int pending_frames_;
61 61
62 base::WeakPtrFactory<OnscreenDisplayClient> weak_ptr_factory_; 62 base::WeakPtrFactory<OnscreenDisplayClient> weak_ptr_factory_;
63 63
64 DISALLOW_COPY_AND_ASSIGN(OnscreenDisplayClient); 64 DISALLOW_COPY_AND_ASSIGN(OnscreenDisplayClient);
65 }; 65 };
66 66
67 } // namespace content 67 } // namespace content
68 68
69 #endif // CONTENT_BROWSER_COMPOSITOR_ONSCREEN_DISPLAY_CLIENT_H_ 69 #endif // CONTENT_BROWSER_COMPOSITOR_ONSCREEN_DISPLAY_CLIENT_H_
OLDNEW
« no previous file with comments | « content/browser/compositor/io_surface_context_mac.h ('k') | content/browser/compositor/overlay_candidate_validator_ozone.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698