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

Side by Side Diff: android_webview/browser/hardware_renderer.h

Issue 623833003: replace OVERRIDE and FINAL with override and final in android_webview/ (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 ANDROID_WEBVIEW_BROWSER_HARDWARE_RENDERER_H_ 5 #ifndef ANDROID_WEBVIEW_BROWSER_HARDWARE_RENDERER_H_
6 #define ANDROID_WEBVIEW_BROWSER_HARDWARE_RENDERER_H_ 6 #define ANDROID_WEBVIEW_BROWSER_HARDWARE_RENDERER_H_
7 7
8 #include "android_webview/browser/parent_compositor_draw_constraints.h" 8 #include "android_webview/browser/parent_compositor_draw_constraints.h"
9 #include "android_webview/browser/shared_renderer_state.h" 9 #include "android_webview/browser/shared_renderer_state.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 21 matching lines...) Expand all
32 public: 32 public:
33 explicit HardwareRenderer(SharedRendererState* state); 33 explicit HardwareRenderer(SharedRendererState* state);
34 virtual ~HardwareRenderer(); 34 virtual ~HardwareRenderer();
35 35
36 void DrawGL(bool stencil_enabled, 36 void DrawGL(bool stencil_enabled,
37 int framebuffer_binding_ext, 37 int framebuffer_binding_ext,
38 AwDrawGLInfo* draw_info); 38 AwDrawGLInfo* draw_info);
39 void CommitFrame(); 39 void CommitFrame();
40 40
41 // cc::LayerTreeHostClient overrides. 41 // cc::LayerTreeHostClient overrides.
42 virtual void WillBeginMainFrame(int frame_id) OVERRIDE {} 42 virtual void WillBeginMainFrame(int frame_id) override {}
43 virtual void DidBeginMainFrame() OVERRIDE; 43 virtual void DidBeginMainFrame() override;
44 virtual void BeginMainFrame(const cc::BeginFrameArgs& args) OVERRIDE {} 44 virtual void BeginMainFrame(const cc::BeginFrameArgs& args) override {}
45 virtual void Layout() OVERRIDE {} 45 virtual void Layout() override {}
46 virtual void ApplyViewportDeltas(const gfx::Vector2d& inner_delta, 46 virtual void ApplyViewportDeltas(const gfx::Vector2d& inner_delta,
47 const gfx::Vector2d& outer_delta, 47 const gfx::Vector2d& outer_delta,
48 float page_scale, 48 float page_scale,
49 float top_controls_delta) OVERRIDE {} 49 float top_controls_delta) override {}
50 virtual void ApplyViewportDeltas(const gfx::Vector2d& scroll_delta, 50 virtual void ApplyViewportDeltas(const gfx::Vector2d& scroll_delta,
51 float page_scale, 51 float page_scale,
52 float top_controls_delta) OVERRIDE {} 52 float top_controls_delta) override {}
53 virtual void RequestNewOutputSurface(bool fallback) OVERRIDE; 53 virtual void RequestNewOutputSurface(bool fallback) override;
54 virtual void DidInitializeOutputSurface() OVERRIDE {} 54 virtual void DidInitializeOutputSurface() override {}
55 virtual void WillCommit() OVERRIDE {} 55 virtual void WillCommit() override {}
56 virtual void DidCommit() OVERRIDE {} 56 virtual void DidCommit() override {}
57 virtual void DidCommitAndDrawFrame() OVERRIDE {} 57 virtual void DidCommitAndDrawFrame() override {}
58 virtual void DidCompleteSwapBuffers() OVERRIDE {} 58 virtual void DidCompleteSwapBuffers() override {}
59 59
60 // cc::LayerTreeHostSingleThreadClient overrides. 60 // cc::LayerTreeHostSingleThreadClient overrides.
61 virtual void DidPostSwapBuffers() OVERRIDE {} 61 virtual void DidPostSwapBuffers() override {}
62 virtual void DidAbortSwapBuffers() OVERRIDE {} 62 virtual void DidAbortSwapBuffers() override {}
63 63
64 // cc::DelegatedFrameResourceCollectionClient overrides. 64 // cc::DelegatedFrameResourceCollectionClient overrides.
65 virtual void UnusedResourcesAreAvailable() OVERRIDE; 65 virtual void UnusedResourcesAreAvailable() override;
66 66
67 private: 67 private:
68 void SetFrameData(); 68 void SetFrameData();
69 69
70 SharedRendererState* shared_renderer_state_; 70 SharedRendererState* shared_renderer_state_;
71 71
72 typedef void* EGLContext; 72 typedef void* EGLContext;
73 EGLContext last_egl_context_; 73 EGLContext last_egl_context_;
74 74
75 scoped_ptr<DrawGLInput> committed_input_; 75 scoped_ptr<DrawGLInput> committed_input_;
(...skipping 21 matching lines...) Expand all
97 ParentOutputSurface* output_surface_; 97 ParentOutputSurface* output_surface_;
98 98
99 ParentCompositorDrawConstraints draw_constraints_; 99 ParentCompositorDrawConstraints draw_constraints_;
100 100
101 DISALLOW_COPY_AND_ASSIGN(HardwareRenderer); 101 DISALLOW_COPY_AND_ASSIGN(HardwareRenderer);
102 }; 102 };
103 103
104 } // namespace android_webview 104 } // namespace android_webview
105 105
106 #endif // ANDROID_WEBVIEW_BROWSER_HARDWARE_RENDERER_H_ 106 #endif // ANDROID_WEBVIEW_BROWSER_HARDWARE_RENDERER_H_
OLDNEW
« no previous file with comments | « android_webview/browser/global_tile_manager_unittest.cc ('k') | android_webview/browser/icon_helper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698