content/browser/android/in_process/synchronous_compositor_impl.h - Issue 23533051: [android_webview] Use a fraction to calculate scroll offset.

Side by Side Diff: content/browser/android/in_process/synchronous_compositor_impl.h

Issue 23533051: [android_webview] Use a fraction to calculate scroll offset. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: revert changes from previous patch set as they break AwSettings tests Created 7 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 | Annotate | Revision Log

« no previous file with comments | « cc/trees/layer_tree_impl.cc ('k') | content/browser/android/in_process/synchronous_compositor_impl.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2013 The Chromium Authors. All rights reserved.	1 // Copyright 2013 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_ANDROID_IN_PROCESS_SYNCHRONOUS_COMPOSITOR_IMPL_H_	5 #ifndef CONTENT_BROWSER_ANDROID_IN_PROCESS_SYNCHRONOUS_COMPOSITOR_IMPL_H_

6 #define CONTENT_BROWSER_ANDROID_IN_PROCESS_SYNCHRONOUS_COMPOSITOR_IMPL_H_	6 #define CONTENT_BROWSER_ANDROID_IN_PROCESS_SYNCHRONOUS_COMPOSITOR_IMPL_H_

7	7

8 #include "base/basictypes.h"	8 #include "base/basictypes.h"

9 #include "base/compiler_specific.h"	9 #include "base/compiler_specific.h"

10 #include "base/memory/scoped_ptr.h"	10 #include "base/memory/scoped_ptr.h"

(...skipping 55 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
66 virtual void DidBindOutputSurface(	66 virtual void DidBindOutputSurface(

67 SynchronousCompositorOutputSurface* output_surface) OVERRIDE;	67 SynchronousCompositorOutputSurface* output_surface) OVERRIDE;

68 virtual void DidDestroySynchronousOutputSurface(	68 virtual void DidDestroySynchronousOutputSurface(

69 SynchronousCompositorOutputSurface* output_surface) OVERRIDE;	69 SynchronousCompositorOutputSurface* output_surface) OVERRIDE;

70 virtual void SetContinuousInvalidate(bool enable) OVERRIDE;	70 virtual void SetContinuousInvalidate(bool enable) OVERRIDE;

71 virtual void UpdateFrameMetaData(	71 virtual void UpdateFrameMetaData(

72 const cc::CompositorFrameMetadata& frame_info) OVERRIDE;	72 const cc::CompositorFrameMetadata& frame_info) OVERRIDE;

73 virtual void DidActivatePendingTree() OVERRIDE;	73 virtual void DidActivatePendingTree() OVERRIDE;

74	74

75 // LayerScrollOffsetDelegate	75 // LayerScrollOffsetDelegate

	76 virtual void SetMaxScrollOffset(gfx::Vector2dF max_scroll_offset) OVERRIDE;

76 virtual void SetTotalScrollOffset(gfx::Vector2dF new_value) OVERRIDE;	77 virtual void SetTotalScrollOffset(gfx::Vector2dF new_value) OVERRIDE;

77 virtual gfx::Vector2dF GetTotalScrollOffset() OVERRIDE;	78 virtual gfx::Vector2dF GetTotalScrollOffset() OVERRIDE;

	79 virtual void SetPageScaleFactor(float page_scale_factor) OVERRIDE;

	80 virtual void SetScrollableSize(gfx::SizeF scrollable_size) OVERRIDE;

78	81

79 void SetInputHandler(cc::InputHandler* input_handler);	82 void SetInputHandler(cc::InputHandler* input_handler);

80 void DidOverscroll(const cc::DidOverscrollParams& params);	83 void DidOverscroll(const cc::DidOverscrollParams& params);

81	84

82 private:	85 private:

83 explicit SynchronousCompositorImpl(WebContents* contents);	86 explicit SynchronousCompositorImpl(WebContents* contents);

84 virtual ~SynchronousCompositorImpl();	87 virtual ~SynchronousCompositorImpl();

85 friend class WebContentsUserData<SynchronousCompositorImpl>;	88 friend class WebContentsUserData<SynchronousCompositorImpl>;

86	89

87 void DidCreateSynchronousOutputSurface(	90 void DidCreateSynchronousOutputSurface(

88 SynchronousCompositorOutputSurface* output_surface);	91 SynchronousCompositorOutputSurface* output_surface);

89 bool CalledOnValidThread() const;	92 bool CalledOnValidThread() const;

90	93

91 SynchronousCompositorClient* compositor_client_;	94 SynchronousCompositorClient* compositor_client_;

92 SynchronousCompositorOutputSurface* output_surface_;	95 SynchronousCompositorOutputSurface* output_surface_;

93 WebContents* contents_;	96 WebContents* contents_;

94 cc::InputHandler* input_handler_;	97 cc::InputHandler* input_handler_;

95	98

96 DISALLOW_COPY_AND_ASSIGN(SynchronousCompositorImpl);	99 DISALLOW_COPY_AND_ASSIGN(SynchronousCompositorImpl);

97 };	100 };

98	101

99 } // namespace content	102 } // namespace content

100	103

101 #endif // CONTENT_BROWSER_ANDROID_IN_PROCESS_SYNCHRONOUS_COMPOSITOR_IMPL_H_	104 #endif // CONTENT_BROWSER_ANDROID_IN_PROCESS_SYNCHRONOUS_COMPOSITOR_IMPL_H_

OLD	NEW