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

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: Bring back implPinch test and fix clip layer with root scroll offset 0 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
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 268 matching lines...) Expand 10 before | Expand all | Expand 10 after
279 279
280 private: 280 private:
281 void animatePageScale(base::TimeTicks monotonicTime); 281 void animatePageScale(base::TimeTicks monotonicTime);
282 void animateScrollbars(base::TimeTicks monotonicTime); 282 void animateScrollbars(base::TimeTicks monotonicTime);
283 283
284 void computeDoubleTapZoomDeltas(ScrollAndScaleSet* scrollInfo); 284 void computeDoubleTapZoomDeltas(ScrollAndScaleSet* scrollInfo);
285 void computePinchZoomDeltas(ScrollAndScaleSet* scrollInfo); 285 void computePinchZoomDeltas(ScrollAndScaleSet* scrollInfo);
286 void makeScrollAndScaleSet(ScrollAndScaleSet* scrollInfo, gfx::Vector2d scro llOffset, float pageScale); 286 void makeScrollAndScaleSet(ScrollAndScaleSet* scrollInfo, gfx::Vector2d scro llOffset, float pageScale);
287 287
288 void setPageScaleDelta(float); 288 void setPageScaleDelta(float);
289 gfx::Vector2dF scrollPinchZoomViewport(gfx::Vector2dF delta);
290 gfx::Vector2dF scrollLayerWithViewportSpaceDelta(LayerImpl* layerImpl, float scaleFromViewportToScreenSpace, gfx::PointF viewportPoint, gfx::Vector2dF viewp ortDelta); 289 gfx::Vector2dF scrollLayerWithViewportSpaceDelta(LayerImpl* layerImpl, float scaleFromViewportToScreenSpace, gfx::PointF viewportPoint, gfx::Vector2dF viewp ortDelta);
291 290
292 void updateMaxScrollOffset(); 291 void updateMaxScrollOffset();
293 void trackDamageForAllSurfaces(LayerImpl* rootDrawLayer, const LayerList& re nderSurfaceLayerList); 292 void trackDamageForAllSurfaces(LayerImpl* rootDrawLayer, const LayerList& re nderSurfaceLayerList);
294 293
295 // Returns false if the frame should not be displayed. This function should 294 // Returns false if the frame should not be displayed. This function should
296 // only be called from prepareToDraw, as didDrawAllLayers must be called 295 // only be called from prepareToDraw, as didDrawAllLayers must be called
297 // if this helper function is called. 296 // if this helper function is called.
298 bool calculateRenderPasses(FrameData&); 297 bool calculateRenderPasses(FrameData&);
299 void animateLayersRecursive(LayerImpl*, base::TimeTicks monotonicTime, base: :Time wallClockTime, AnimationEventsVector*, bool& didAnimate, bool& needsAnimat eLayers); 298 void animateLayersRecursive(LayerImpl*, base::TimeTicks monotonicTime, base: :Time wallClockTime, AnimationEventsVector*, bool& didAnimate, bool& needsAnimat eLayers);
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
363 size_t m_lastSentMemoryUseBytes; 362 size_t m_lastSentMemoryUseBytes;
364 363
365 scoped_ptr<AnimationRegistrar> m_animationRegistrar; 364 scoped_ptr<AnimationRegistrar> m_animationRegistrar;
366 365
367 DISALLOW_COPY_AND_ASSIGN(LayerTreeHostImpl); 366 DISALLOW_COPY_AND_ASSIGN(LayerTreeHostImpl);
368 }; 367 };
369 368
370 } // namespace cc 369 } // namespace cc
371 370
372 #endif // CC_LAYER_TREE_HOST_IMPL_H_ 371 #endif // CC_LAYER_TREE_HOST_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698