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

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: 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
« no previous file with comments | « Source/web/WebHistoryItem.cpp ('k') | Source/web/WebViewImpl.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 417 matching lines...) Expand 10 before | Expand all | Expand 10 after
621 // Keeps track of the current zoom level. 0 means no zoom, positive numbers 619 // Keeps track of the current zoom level. 0 means no zoom, positive numbers
622 // mean zoom in, negative numbers mean zoom out. 620 // mean zoom in, negative numbers mean zoom out.
623 double m_zoomLevel; 621 double m_zoomLevel;
624 622
625 double m_minimumZoomLevel; 623 double m_minimumZoomLevel;
626 624
627 double m_maximumZoomLevel; 625 double m_maximumZoomLevel;
628 626
629 PageScaleConstraintsSet m_pageScaleConstraintsSet; 627 PageScaleConstraintsSet m_pageScaleConstraintsSet;
630 628
631 // Saved page scale state.
632 float m_savedPageScaleFactor; // 0 means that no page scale factor is saved.
633 WebCore::IntSize m_savedScrollOffset;
634
635 // The scale moved to by the latest double tap zoom, if any. 629 // The scale moved to by the latest double tap zoom, if any.
636 float m_doubleTapZoomPageScaleFactor; 630 float m_doubleTapZoomPageScaleFactor;
637 // Have we sent a double-tap zoom and not yet heard back the scale? 631 // Have we sent a double-tap zoom and not yet heard back the scale?
638 bool m_doubleTapZoomPending; 632 bool m_doubleTapZoomPending;
639 633
640 // Used for testing purposes. 634 // Used for testing purposes.
641 bool m_enableFakePageScaleAnimationForTesting; 635 bool m_enableFakePageScaleAnimationForTesting;
642 WebCore::IntPoint m_fakePageScaleAnimationTargetPosition; 636 WebCore::IntPoint m_fakePageScaleAnimationTargetPosition;
643 float m_fakePageScaleAnimationPageScaleFactor; 637 float m_fakePageScaleAnimationPageScaleFactor;
644 bool m_fakePageScaleAnimationUseAnchor; 638 bool m_fakePageScaleAnimationUseAnchor;
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
731 bool m_userGestureObserved; 725 bool m_userGestureObserved;
732 }; 726 };
733 727
734 // We have no ways to check if the specified WebView is an instance of 728 // We have no ways to check if the specified WebView is an instance of
735 // WebViewImpl because WebViewImpl is the only implementation of WebView. 729 // WebViewImpl because WebViewImpl is the only implementation of WebView.
736 DEFINE_TYPE_CASTS(WebViewImpl, WebView, webView, true, true); 730 DEFINE_TYPE_CASTS(WebViewImpl, WebView, webView, true, true);
737 731
738 } // namespace blink 732 } // namespace blink
739 733
740 #endif 734 #endif
OLDNEW
« no previous file with comments | « Source/web/WebHistoryItem.cpp ('k') | Source/web/WebViewImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698