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

Side by Side Diff: Source/web/WebViewImpl.h

Issue 263853008: Added pinch viewport offset to history item. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Added backward compatibility, tests Created 6 years, 7 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 /* 1 /*
2 * Copyright (C) 2010 Google Inc. All rights reserved. 2 * Copyright (C) 2010 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after
182 virtual void setInitialPageScaleOverride(float) OVERRIDE; 182 virtual void setInitialPageScaleOverride(float) OVERRIDE;
183 virtual bool zoomToMultipleTargetsRect(const WebRect&) OVERRIDE; 183 virtual bool zoomToMultipleTargetsRect(const WebRect&) OVERRIDE;
184 virtual float pageScaleFactor() const OVERRIDE; 184 virtual float pageScaleFactor() const OVERRIDE;
185 virtual void setPageScaleFactorLimits(float minPageScale, float maxPageScale ) OVERRIDE; 185 virtual void setPageScaleFactorLimits(float minPageScale, float maxPageScale ) OVERRIDE;
186 virtual void setMainFrameScrollOffset(const WebPoint&) OVERRIDE; 186 virtual void setMainFrameScrollOffset(const WebPoint&) OVERRIDE;
187 virtual void setPageScaleFactor(float) OVERRIDE; 187 virtual void setPageScaleFactor(float) OVERRIDE;
188 virtual void setPinchViewportOffset(const WebFloatPoint&) OVERRIDE; 188 virtual void setPinchViewportOffset(const WebFloatPoint&) OVERRIDE;
189 virtual WebFloatPoint pinchViewportOffset() const OVERRIDE; 189 virtual WebFloatPoint pinchViewportOffset() const OVERRIDE;
190 virtual float minimumPageScaleFactor() const OVERRIDE; 190 virtual float minimumPageScaleFactor() const OVERRIDE;
191 virtual float maximumPageScaleFactor() const OVERRIDE; 191 virtual float maximumPageScaleFactor() const OVERRIDE;
192 virtual void saveScrollAndScaleState() OVERRIDE;
193 virtual void restoreScrollAndScaleState() OVERRIDE;
194 virtual void resetScrollAndScaleState() OVERRIDE; 192 virtual void resetScrollAndScaleState() OVERRIDE;
195 virtual void setIgnoreViewportTagScaleLimits(bool) OVERRIDE; 193 virtual void setIgnoreViewportTagScaleLimits(bool) OVERRIDE;
196 virtual WebSize contentsPreferredMinimumSize() OVERRIDE; 194 virtual WebSize contentsPreferredMinimumSize() OVERRIDE;
197 195
198 virtual float deviceScaleFactor() const OVERRIDE; 196 virtual float deviceScaleFactor() const OVERRIDE;
199 virtual void setDeviceScaleFactor(float) OVERRIDE; 197 virtual void setDeviceScaleFactor(float) OVERRIDE;
200 198
201 virtual void setFixedLayoutSize(const WebSize&) OVERRIDE; 199 virtual void setFixedLayoutSize(const WebSize&) OVERRIDE;
202 200
203 virtual void enableAutoResizeMode( 201 virtual void enableAutoResizeMode(
(...skipping 416 matching lines...) Expand 10 before | Expand all | Expand 10 after
620 // Keeps track of the current zoom level. 0 means no zoom, positive numbers 618 // Keeps track of the current zoom level. 0 means no zoom, positive numbers
621 // mean zoom in, negative numbers mean zoom out. 619 // mean zoom in, negative numbers mean zoom out.
622 double m_zoomLevel; 620 double m_zoomLevel;
623 621
624 double m_minimumZoomLevel; 622 double m_minimumZoomLevel;
625 623
626 double m_maximumZoomLevel; 624 double m_maximumZoomLevel;
627 625
628 PageScaleConstraintsSet m_pageScaleConstraintsSet; 626 PageScaleConstraintsSet m_pageScaleConstraintsSet;
629 627
630 // Saved page scale state.
631 float m_savedPageScaleFactor; // 0 means that no page scale factor is saved.
632 WebCore::IntSize m_savedScrollOffset;
633
634 // The scale moved to by the latest double tap zoom, if any. 628 // The scale moved to by the latest double tap zoom, if any.
635 float m_doubleTapZoomPageScaleFactor; 629 float m_doubleTapZoomPageScaleFactor;
636 // Have we sent a double-tap zoom and not yet heard back the scale? 630 // Have we sent a double-tap zoom and not yet heard back the scale?
637 bool m_doubleTapZoomPending; 631 bool m_doubleTapZoomPending;
638 632
639 // Used for testing purposes. 633 // Used for testing purposes.
640 bool m_enableFakePageScaleAnimationForTesting; 634 bool m_enableFakePageScaleAnimationForTesting;
641 WebCore::IntPoint m_fakePageScaleAnimationTargetPosition; 635 WebCore::IntPoint m_fakePageScaleAnimationTargetPosition;
642 float m_fakePageScaleAnimationPageScaleFactor; 636 float m_fakePageScaleAnimationPageScaleFactor;
643 bool m_fakePageScaleAnimationUseAnchor; 637 bool m_fakePageScaleAnimationUseAnchor;
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
730 bool m_userGestureObserved; 724 bool m_userGestureObserved;
731 }; 725 };
732 726
733 // We have no ways to check if the specified WebView is an instance of 727 // We have no ways to check if the specified WebView is an instance of
734 // WebViewImpl because WebViewImpl is the only implementation of WebView. 728 // WebViewImpl because WebViewImpl is the only implementation of WebView.
735 DEFINE_TYPE_CASTS(WebViewImpl, WebView, webView, true, true); 729 DEFINE_TYPE_CASTS(WebViewImpl, WebView, webView, true, true);
736 730
737 } // namespace blink 731 } // namespace blink
738 732
739 #endif 733 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698