Source/web/PageScaleConstraintsSet.h - Issue 61593006: Zoom instead of autosizing for desktop sites.

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

Issue 61593006: Zoom instead of autosizing for desktop sites. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Address review comments. Created 7 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

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 2013 Google Inc. All rights reserved.	2 * Copyright (C) 2013 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 32 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
43 public:	43 public:

44 PageScaleConstraintsSet();	44 PageScaleConstraintsSet();

45	45

46 WebCore::PageScaleConstraints defaultConstraints() const;	46 WebCore::PageScaleConstraints defaultConstraints() const;

47	47

48 // Settings defined in the website's viewport tag, if viewport tag support	48 // Settings defined in the website's viewport tag, if viewport tag support

49 // is enabled.	49 // is enabled.

50 const WebCore::PageScaleConstraints& pageDefinedConstraints() const { return m_pageDefinedConstraints; }	50 const WebCore::PageScaleConstraints& pageDefinedConstraints() const { return m_pageDefinedConstraints; }

51 void updatePageDefinedConstraints(const WebCore::ViewportDescription&, WebCo re::IntSize viewSize);	51 void updatePageDefinedConstraints(const WebCore::ViewportDescription&, WebCo re::IntSize viewSize);

52 void adjustForAndroidWebViewQuirks(const WebCore::ViewportDescription&, WebC ore::IntSize viewSize, int layoutFallbackWidth, float deviceScaleFactor, bool su pportTargetDensityDPI, bool wideViewportQuirkEnabled, bool useWideViewport, bool loadWithOverviewMode);	52 void adjustForAndroidWebViewQuirks(const WebCore::ViewportDescription&, WebC ore::IntSize viewSize, int layoutFallbackWidth, float deviceScaleFactor, bool su pportTargetDensityDPI, bool wideViewportQuirkEnabled, bool useWideViewport, bool loadWithOverviewMode);

	53 void applyDeviceScaleAdjustment(const WebCore::ViewportDescription&, float d eviceScaleAdjustment);

53	54

54 // Constraints may also be set from Chromium -- this overrides any	55 // Constraints may also be set from Chromium -- this overrides any

55 // page-defined values.	56 // page-defined values.

56 const WebCore::PageScaleConstraints& userAgentConstraints() const { return m _userAgentConstraints; }	57 const WebCore::PageScaleConstraints& userAgentConstraints() const { return m _userAgentConstraints; }

57 void setUserAgentConstraints(const WebCore::PageScaleConstraints&);	58 void setUserAgentConstraints(const WebCore::PageScaleConstraints&);

58	59

59 // Actual computed values, taking into account the above plus the current	60 // Actual computed values, taking into account the above plus the current

60 // viewport size and document width.	61 // viewport size and document width.

61 const WebCore::PageScaleConstraints& finalConstraints() const { return m_fin alConstraints; }	62 const WebCore::PageScaleConstraints& finalConstraints() const { return m_fin alConstraints; }

62 void computeFinalConstraints();	63 void computeFinalConstraints();

(...skipping 18 matching lines...) Expand all Loading...
81	82

82 int m_lastContentsWidth;	83 int m_lastContentsWidth;

83	84

84 bool m_needsReset;	85 bool m_needsReset;

85 bool m_constraintsDirty;	86 bool m_constraintsDirty;

86 };	87 };

87	88

88 } // namespace WebCore	89 } // namespace WebCore

89	90

90 #endif // PageScaleConstraintsSet_h	91 #endif // PageScaleConstraintsSet_h

OLD	NEW

« no previous file with comments | « no previous file | Source/web/PageScaleConstraintsSet.cpp » ('j') | Source/web/PageScaleConstraintsSet.cpp » ('J')