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

Side by Side Diff: ui/compositor/compositor.h

Issue 511253003: Made Blink aware of top controls offset (Chromium-side) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed crash + mojo example build break Created 6 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 unified diff | Download patch
« no previous file with comments | « mojo/examples/compositor_app/compositor_host.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 UI_COMPOSITOR_COMPOSITOR_H_ 5 #ifndef UI_COMPOSITOR_COMPOSITOR_H_
6 #define UI_COMPOSITOR_COMPOSITOR_H_ 6 #define UI_COMPOSITOR_COMPOSITOR_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/containers/hash_tables.h" 10 #include "base/containers/hash_tables.h"
(...skipping 214 matching lines...) Expand 10 before | Expand all | Expand 10 after
225 void OnSwapBuffersComplete(); 225 void OnSwapBuffersComplete();
226 226
227 // Signals swap has aborted (e.g. lost context). 227 // Signals swap has aborted (e.g. lost context).
228 void OnSwapBuffersAborted(); 228 void OnSwapBuffersAborted();
229 229
230 // LayerTreeHostClient implementation. 230 // LayerTreeHostClient implementation.
231 virtual void WillBeginMainFrame(int frame_id) OVERRIDE {} 231 virtual void WillBeginMainFrame(int frame_id) OVERRIDE {}
232 virtual void DidBeginMainFrame() OVERRIDE {} 232 virtual void DidBeginMainFrame() OVERRIDE {}
233 virtual void BeginMainFrame(const cc::BeginFrameArgs& args) OVERRIDE; 233 virtual void BeginMainFrame(const cc::BeginFrameArgs& args) OVERRIDE;
234 virtual void Layout() OVERRIDE; 234 virtual void Layout() OVERRIDE;
235 virtual void ApplyScrollAndScale(const gfx::Vector2d& scroll_delta, 235 virtual void ApplyViewportDeltas(
236 float page_scale) OVERRIDE {} 236 const gfx::Vector2d& scroll_delta,
237 float page_scale,
238 float top_controls_delta) OVERRIDE {}
237 virtual scoped_ptr<cc::OutputSurface> CreateOutputSurface(bool fallback) 239 virtual scoped_ptr<cc::OutputSurface> CreateOutputSurface(bool fallback)
238 OVERRIDE; 240 OVERRIDE;
239 virtual void DidInitializeOutputSurface() OVERRIDE {} 241 virtual void DidInitializeOutputSurface() OVERRIDE {}
240 virtual void WillCommit() OVERRIDE {} 242 virtual void WillCommit() OVERRIDE {}
241 virtual void DidCommit() OVERRIDE; 243 virtual void DidCommit() OVERRIDE;
242 virtual void DidCommitAndDrawFrame() OVERRIDE; 244 virtual void DidCommitAndDrawFrame() OVERRIDE;
243 virtual void DidCompleteSwapBuffers() OVERRIDE; 245 virtual void DidCompleteSwapBuffers() OVERRIDE;
244 246
245 // cc::LayerTreeHostSingleThreadClient implementation. 247 // cc::LayerTreeHostSingleThreadClient implementation.
246 virtual void ScheduleComposite() OVERRIDE; 248 virtual void ScheduleComposite() OVERRIDE;
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
315 LayerAnimatorCollection layer_animator_collection_; 317 LayerAnimatorCollection layer_animator_collection_;
316 318
317 base::WeakPtrFactory<Compositor> schedule_draw_factory_; 319 base::WeakPtrFactory<Compositor> schedule_draw_factory_;
318 320
319 DISALLOW_COPY_AND_ASSIGN(Compositor); 321 DISALLOW_COPY_AND_ASSIGN(Compositor);
320 }; 322 };
321 323
322 } // namespace ui 324 } // namespace ui
323 325
324 #endif // UI_COMPOSITOR_COMPOSITOR_H_ 326 #endif // UI_COMPOSITOR_COMPOSITOR_H_
OLDNEW
« no previous file with comments | « mojo/examples/compositor_app/compositor_host.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698