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

Side by Side Diff: content/browser/renderer_host/compositor_impl_android.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
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 CONTENT_BROWSER_RENDERER_HOST_COMPOSITOR_IMPL_ANDROID_H_ 5 #ifndef CONTENT_BROWSER_RENDERER_HOST_COMPOSITOR_IMPL_ANDROID_H_
6 #define CONTENT_BROWSER_RENDERER_HOST_COMPOSITOR_IMPL_ANDROID_H_ 6 #define CONTENT_BROWSER_RENDERER_HOST_COMPOSITOR_IMPL_ANDROID_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/cancelable_callback.h" 9 #include "base/cancelable_callback.h"
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 virtual void SetHasTransparentBackground(bool flag) OVERRIDE; 69 virtual void SetHasTransparentBackground(bool flag) OVERRIDE;
70 virtual void SetNeedsComposite() OVERRIDE; 70 virtual void SetNeedsComposite() OVERRIDE;
71 virtual UIResourceProvider& GetUIResourceProvider() OVERRIDE; 71 virtual UIResourceProvider& GetUIResourceProvider() OVERRIDE;
72 72
73 // LayerTreeHostClient implementation. 73 // LayerTreeHostClient implementation.
74 virtual void WillBeginMainFrame(int frame_id) OVERRIDE {} 74 virtual void WillBeginMainFrame(int frame_id) OVERRIDE {}
75 virtual void DidBeginMainFrame() OVERRIDE {} 75 virtual void DidBeginMainFrame() OVERRIDE {}
76 virtual void BeginMainFrame(const cc::BeginFrameArgs& args) OVERRIDE {} 76 virtual void BeginMainFrame(const cc::BeginFrameArgs& args) OVERRIDE {}
77 virtual void Layout() OVERRIDE; 77 virtual void Layout() OVERRIDE;
78 virtual void ApplyViewportDeltas( 78 virtual void ApplyViewportDeltas(
79 const gfx::Vector2d& inner_delta,
80 const gfx::Vector2d& outer_delta,
81 float page_scale,
82 float top_controls_delta) OVERRIDE {}
83 virtual void ApplyViewportDeltas(
79 const gfx::Vector2d& scroll_delta, 84 const gfx::Vector2d& scroll_delta,
80 float page_scale, 85 float page_scale,
81 float top_controls_delta) OVERRIDE {} 86 float top_controls_delta) OVERRIDE {}
82 virtual scoped_ptr<cc::OutputSurface> CreateOutputSurface(bool fallback) 87 virtual scoped_ptr<cc::OutputSurface> CreateOutputSurface(bool fallback)
83 OVERRIDE; 88 OVERRIDE;
84 virtual void DidInitializeOutputSurface() OVERRIDE {} 89 virtual void DidInitializeOutputSurface() OVERRIDE {}
85 virtual void WillCommit() OVERRIDE {} 90 virtual void WillCommit() OVERRIDE {}
86 virtual void DidCommit() OVERRIDE; 91 virtual void DidCommit() OVERRIDE;
87 virtual void DidCommitAndDrawFrame() OVERRIDE {} 92 virtual void DidCommitAndDrawFrame() OVERRIDE {}
88 virtual void DidCompleteSwapBuffers() OVERRIDE; 93 virtual void DidCompleteSwapBuffers() OVERRIDE;
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
185 base::TimeTicks last_vsync_; 190 base::TimeTicks last_vsync_;
186 191
187 base::WeakPtrFactory<CompositorImpl> weak_factory_; 192 base::WeakPtrFactory<CompositorImpl> weak_factory_;
188 193
189 DISALLOW_COPY_AND_ASSIGN(CompositorImpl); 194 DISALLOW_COPY_AND_ASSIGN(CompositorImpl);
190 }; 195 };
191 196
192 } // namespace content 197 } // namespace content
193 198
194 #endif // CONTENT_BROWSER_RENDERER_HOST_COMPOSITOR_IMPL_ANDROID_H_ 199 #endif // CONTENT_BROWSER_RENDERER_HOST_COMPOSITOR_IMPL_ANDROID_H_
OLDNEW
« no previous file with comments | « cc/trees/layer_tree_host_unittest_no_message_loop.cc ('k') | content/renderer/gpu/render_widget_compositor.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698