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

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

Issue 585063002: Made double-tap zoom work in pinch virtual viewport mode (Chromium-side). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Another build fix 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/services/html_viewer/weblayertreeview_impl.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 215 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 ApplyViewportDeltas( 235 virtual void ApplyViewportDeltas(
236 const gfx::Vector2d& inner_delta,
237 const gfx::Vector2d& outer_delta,
238 float page_scale,
239 float top_controls_delta) OVERRIDE {}
240 virtual void ApplyViewportDeltas(
236 const gfx::Vector2d& scroll_delta, 241 const gfx::Vector2d& scroll_delta,
237 float page_scale, 242 float page_scale,
238 float top_controls_delta) OVERRIDE {} 243 float top_controls_delta) OVERRIDE {}
239 virtual scoped_ptr<cc::OutputSurface> CreateOutputSurface(bool fallback) 244 virtual scoped_ptr<cc::OutputSurface> CreateOutputSurface(bool fallback)
240 OVERRIDE; 245 OVERRIDE;
241 virtual void DidInitializeOutputSurface() OVERRIDE {} 246 virtual void DidInitializeOutputSurface() OVERRIDE {}
242 virtual void WillCommit() OVERRIDE {} 247 virtual void WillCommit() OVERRIDE {}
243 virtual void DidCommit() OVERRIDE; 248 virtual void DidCommit() OVERRIDE;
244 virtual void DidCommitAndDrawFrame() OVERRIDE; 249 virtual void DidCommitAndDrawFrame() OVERRIDE;
245 virtual void DidCompleteSwapBuffers() OVERRIDE; 250 virtual void DidCompleteSwapBuffers() OVERRIDE;
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
317 LayerAnimatorCollection layer_animator_collection_; 322 LayerAnimatorCollection layer_animator_collection_;
318 323
319 base::WeakPtrFactory<Compositor> schedule_draw_factory_; 324 base::WeakPtrFactory<Compositor> schedule_draw_factory_;
320 325
321 DISALLOW_COPY_AND_ASSIGN(Compositor); 326 DISALLOW_COPY_AND_ASSIGN(Compositor);
322 }; 327 };
323 328
324 } // namespace ui 329 } // namespace ui
325 330
326 #endif // UI_COMPOSITOR_COMPOSITOR_H_ 331 #endif // UI_COMPOSITOR_COMPOSITOR_H_
OLDNEW
« no previous file with comments | « mojo/services/html_viewer/weblayertreeview_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698