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

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

Issue 1412663005: Introduce painted-device-scale-factor and use it when --enable-use-zoom-for-dsf is specified. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month 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 192 matching lines...) Expand 10 before | Expand all | Expand 10 after
203 WebFloatPoint visualViewportOffset() const override; 203 WebFloatPoint visualViewportOffset() const override;
204 WebFloatPoint pinchViewportOffset() const override; 204 WebFloatPoint pinchViewportOffset() const override;
205 WebFloatSize visualViewportSize() const override; 205 WebFloatSize visualViewportSize() const override;
206 void resetScrollAndScaleState() override; 206 void resetScrollAndScaleState() override;
207 void setIgnoreViewportTagScaleLimits(bool) override; 207 void setIgnoreViewportTagScaleLimits(bool) override;
208 WebSize contentsPreferredMinimumSize() override; 208 WebSize contentsPreferredMinimumSize() override;
209 void setDisplayMode(WebDisplayMode) override; 209 void setDisplayMode(WebDisplayMode) override;
210 210
211 float deviceScaleFactor() const override; 211 float deviceScaleFactor() const override;
212 void setDeviceScaleFactor(float) override; 212 void setDeviceScaleFactor(float) override;
213 void setZoomFactorForDeviceScaleFactor(float) override;
214
213 void setDeviceColorProfile(const WebVector<char>&) override; 215 void setDeviceColorProfile(const WebVector<char>&) override;
214 void resetDeviceColorProfile() override; 216 void resetDeviceColorProfile() override;
215 217
216 void enableAutoResizeMode( 218 void enableAutoResizeMode(
217 const WebSize& minSize, 219 const WebSize& minSize,
218 const WebSize& maxSize) override; 220 const WebSize& maxSize) override;
219 void disableAutoResizeMode() override; 221 void disableAutoResizeMode() override;
220 void performMediaPlayerAction( 222 void performMediaPlayerAction(
221 const WebMediaPlayerAction& action, 223 const WebMediaPlayerAction& action,
222 const WebPoint& location) override; 224 const WebPoint& location) override;
(...skipping 422 matching lines...) Expand 10 before | Expand all | Expand 10 after
645 WebPoint m_lastMouseDownPoint; 647 WebPoint m_lastMouseDownPoint;
646 648
647 // Keeps track of the current zoom level. 0 means no zoom, positive numbers 649 // Keeps track of the current zoom level. 0 means no zoom, positive numbers
648 // mean zoom in, negative numbers mean zoom out. 650 // mean zoom in, negative numbers mean zoom out.
649 double m_zoomLevel; 651 double m_zoomLevel;
650 652
651 double m_minimumZoomLevel; 653 double m_minimumZoomLevel;
652 654
653 double m_maximumZoomLevel; 655 double m_maximumZoomLevel;
654 656
657 // Additional zoom factor used to scale the content by device scale factor.
658 double m_zoomFactorForDeviceScaleFactor;
659
655 // This value, when multiplied by the font scale factor, gives the maximum 660 // This value, when multiplied by the font scale factor, gives the maximum
656 // page scale that can result from automatic zooms. 661 // page scale that can result from automatic zooms.
657 float m_maximumLegibleScale; 662 float m_maximumLegibleScale;
658 663
659 // The scale moved to by the latest double tap zoom, if any. 664 // The scale moved to by the latest double tap zoom, if any.
660 float m_doubleTapZoomPageScaleFactor; 665 float m_doubleTapZoomPageScaleFactor;
661 // Have we sent a double-tap zoom and not yet heard back the scale? 666 // Have we sent a double-tap zoom and not yet heard back the scale?
662 bool m_doubleTapZoomPending; 667 bool m_doubleTapZoomPending;
663 668
664 // Used for testing purposes. 669 // Used for testing purposes.
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
751 }; 756 };
752 757
753 DEFINE_TYPE_CASTS(WebViewImpl, WebWidget, widget, widget->isWebView(), widget.is WebView()); 758 DEFINE_TYPE_CASTS(WebViewImpl, WebWidget, widget, widget->isWebView(), widget.is WebView());
754 // We have no ways to check if the specified WebView is an instance of 759 // We have no ways to check if the specified WebView is an instance of
755 // WebViewImpl because WebViewImpl is the only implementation of WebView. 760 // WebViewImpl because WebViewImpl is the only implementation of WebView.
756 DEFINE_TYPE_CASTS(WebViewImpl, WebView, webView, true, true); 761 DEFINE_TYPE_CASTS(WebViewImpl, WebView, webView, true, true);
757 762
758 } // namespace blink 763 } // namespace blink
759 764
760 #endif 765 #endif
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/web/WebPagePopupImpl.cpp ('k') | third_party/WebKit/Source/web/WebViewImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698