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

Side by Side Diff: cc/layer_tree_host_impl.h

Issue 12045002: Delete zoomed_viewport_offset_ and its users. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Add imports for DisabledTest and rebase to 179449 Created 7 years, 10 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 | « cc/layer_tree_host.cc ('k') | cc/layer_tree_host_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2011 The Chromium Authors. All rights reserved. 1 // Copyright 2011 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 CC_LAYER_TREE_HOST_IMPL_H_ 5 #ifndef CC_LAYER_TREE_HOST_IMPL_H_
6 #define CC_LAYER_TREE_HOST_IMPL_H_ 6 #define CC_LAYER_TREE_HOST_IMPL_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/time.h" 10 #include "base/time.h"
(...skipping 272 matching lines...) Expand 10 before | Expand all | Expand 10 after
283 283
284 private: 284 private:
285 void animatePageScale(base::TimeTicks monotonicTime); 285 void animatePageScale(base::TimeTicks monotonicTime);
286 void animateScrollbars(base::TimeTicks monotonicTime); 286 void animateScrollbars(base::TimeTicks monotonicTime);
287 287
288 void computeDoubleTapZoomDeltas(ScrollAndScaleSet* scrollInfo); 288 void computeDoubleTapZoomDeltas(ScrollAndScaleSet* scrollInfo);
289 void computePinchZoomDeltas(ScrollAndScaleSet* scrollInfo); 289 void computePinchZoomDeltas(ScrollAndScaleSet* scrollInfo);
290 void makeScrollAndScaleSet(ScrollAndScaleSet* scrollInfo, gfx::Vector2d scro llOffset, float pageScale); 290 void makeScrollAndScaleSet(ScrollAndScaleSet* scrollInfo, gfx::Vector2d scro llOffset, float pageScale);
291 291
292 void setPageScaleDelta(float); 292 void setPageScaleDelta(float);
293 gfx::Vector2dF scrollPinchZoomViewport(gfx::Vector2dF delta);
294 gfx::Vector2dF scrollLayerWithViewportSpaceDelta(LayerImpl* layerImpl, float scaleFromViewportToScreenSpace, gfx::PointF viewportPoint, gfx::Vector2dF viewp ortDelta); 293 gfx::Vector2dF scrollLayerWithViewportSpaceDelta(LayerImpl* layerImpl, float scaleFromViewportToScreenSpace, gfx::PointF viewportPoint, gfx::Vector2dF viewp ortDelta);
295 294
296 void updateMaxScrollOffset(); 295 void updateMaxScrollOffset();
297 void trackDamageForAllSurfaces(LayerImpl* rootDrawLayer, const LayerList& re nderSurfaceLayerList); 296 void trackDamageForAllSurfaces(LayerImpl* rootDrawLayer, const LayerList& re nderSurfaceLayerList);
298 297
299 // Returns false if the frame should not be displayed. This function should 298 // Returns false if the frame should not be displayed. This function should
300 // only be called from prepareToDraw, as didDrawAllLayers must be called 299 // only be called from prepareToDraw, as didDrawAllLayers must be called
301 // if this helper function is called. 300 // if this helper function is called.
302 bool calculateRenderPasses(FrameData&); 301 bool calculateRenderPasses(FrameData&);
303 void animateLayersRecursive(LayerImpl*, base::TimeTicks monotonicTime, base: :Time wallClockTime, AnimationEventsVector*, bool& didAnimate, bool& needsAnimat eLayers); 302 void animateLayersRecursive(LayerImpl*, base::TimeTicks monotonicTime, base: :Time wallClockTime, AnimationEventsVector*, bool& didAnimate, bool& needsAnimat eLayers);
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
369 base::TimeTicks m_currentFrameTime; 368 base::TimeTicks m_currentFrameTime;
370 369
371 scoped_ptr<AnimationRegistrar> m_animationRegistrar; 370 scoped_ptr<AnimationRegistrar> m_animationRegistrar;
372 371
373 DISALLOW_COPY_AND_ASSIGN(LayerTreeHostImpl); 372 DISALLOW_COPY_AND_ASSIGN(LayerTreeHostImpl);
374 }; 373 };
375 374
376 } // namespace cc 375 } // namespace cc
377 376
378 #endif // CC_LAYER_TREE_HOST_IMPL_H_ 377 #endif // CC_LAYER_TREE_HOST_IMPL_H_
OLDNEW
« no previous file with comments | « cc/layer_tree_host.cc ('k') | cc/layer_tree_host_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698