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

Side by Side Diff: mojo/services/html_viewer/weblayertreeview_impl.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, 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 MOJO_SERVICES_HTML_VIEWER_WEBLAYERTREEVIEW_IMPL_H_ 5 #ifndef MOJO_SERVICES_HTML_VIEWER_WEBLAYERTREEVIEW_IMPL_H_
6 #define MOJO_SERVICES_HTML_VIEWER_WEBLAYERTREEVIEW_IMPL_H_ 6 #define MOJO_SERVICES_HTML_VIEWER_WEBLAYERTREEVIEW_IMPL_H_
7 7
8 #include "base/memory/ref_counted.h" 8 #include "base/memory/ref_counted.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/memory/weak_ptr.h" 10 #include "base/memory/weak_ptr.h"
(...skipping 30 matching lines...) Expand all
41 virtual ~WebLayerTreeViewImpl(); 41 virtual ~WebLayerTreeViewImpl();
42 42
43 void set_widget(blink::WebWidget* widget) { widget_ = widget; } 43 void set_widget(blink::WebWidget* widget) { widget_ = widget; }
44 void set_view(View* view) { view_ = view; } 44 void set_view(View* view) { view_ = view; }
45 45
46 // cc::LayerTreeHostClient implementation. 46 // cc::LayerTreeHostClient implementation.
47 virtual void WillBeginMainFrame(int frame_id) OVERRIDE; 47 virtual void WillBeginMainFrame(int frame_id) OVERRIDE;
48 virtual void DidBeginMainFrame() OVERRIDE; 48 virtual void DidBeginMainFrame() OVERRIDE;
49 virtual void BeginMainFrame(const cc::BeginFrameArgs& args) OVERRIDE; 49 virtual void BeginMainFrame(const cc::BeginFrameArgs& args) OVERRIDE;
50 virtual void Layout() OVERRIDE; 50 virtual void Layout() OVERRIDE;
51 virtual void ApplyViewportDeltas(const gfx::Vector2d& inner_delta,
52 const gfx::Vector2d& outer_delta,
53 float page_scale,
54 float top_controls_delta) OVERRIDE;
51 virtual void ApplyViewportDeltas(const gfx::Vector2d& scroll_delta, 55 virtual void ApplyViewportDeltas(const gfx::Vector2d& scroll_delta,
52 float page_scale, 56 float page_scale,
53 float top_controls_delta) OVERRIDE; 57 float top_controls_delta) OVERRIDE;
54 virtual scoped_ptr<cc::OutputSurface> CreateOutputSurface( 58 virtual scoped_ptr<cc::OutputSurface> CreateOutputSurface(
55 bool fallback) OVERRIDE; 59 bool fallback) OVERRIDE;
56 virtual void DidInitializeOutputSurface() OVERRIDE; 60 virtual void DidInitializeOutputSurface() OVERRIDE;
57 virtual void WillCommit() OVERRIDE; 61 virtual void WillCommit() OVERRIDE;
58 virtual void DidCommit() OVERRIDE; 62 virtual void DidCommit() OVERRIDE;
59 virtual void DidCommitAndDrawFrame() OVERRIDE; 63 virtual void DidCommitAndDrawFrame() OVERRIDE;
60 virtual void DidCompleteSwapBuffers() OVERRIDE; 64 virtual void DidCompleteSwapBuffers() OVERRIDE;
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 main_thread_compositor_task_runner_; 127 main_thread_compositor_task_runner_;
124 base::WeakPtr<WebLayerTreeViewImpl> main_thread_bound_weak_ptr_; 128 base::WeakPtr<WebLayerTreeViewImpl> main_thread_bound_weak_ptr_;
125 129
126 base::WeakPtrFactory<WebLayerTreeViewImpl> weak_factory_; 130 base::WeakPtrFactory<WebLayerTreeViewImpl> weak_factory_;
127 DISALLOW_COPY_AND_ASSIGN(WebLayerTreeViewImpl); 131 DISALLOW_COPY_AND_ASSIGN(WebLayerTreeViewImpl);
128 }; 132 };
129 133
130 } // namespace mojo 134 } // namespace mojo
131 135
132 #endif // MOJO_SERVICES_HTML_VIEWER_WEBLAYERTREEVIEW_IMPL_H_ 136 #endif // MOJO_SERVICES_HTML_VIEWER_WEBLAYERTREEVIEW_IMPL_H_
OLDNEW
« no previous file with comments | « mojo/examples/compositor_app/compositor_host.cc ('k') | mojo/services/html_viewer/weblayertreeview_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698