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

Side by Side Diff: third_party/WebKit/Source/core/frame/PageScaleConstraintsSet.h

Issue 1611693002: Revert of Don't change layout size due to top control show/hide (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 11 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) 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 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 void didChangeContentsSize(IntSize contentsSize, float pageScaleFactor); 78 void didChangeContentsSize(IntSize contentsSize, float pageScaleFactor);
79 79
80 // This should be set to true on each page load to note that the page scale 80 // This should be set to true on each page load to note that the page scale
81 // factor needs to be reset to its initial value. 81 // factor needs to be reset to its initial value.
82 void setNeedsReset(bool); 82 void setNeedsReset(bool);
83 bool needsReset() const { return m_needsReset; } 83 bool needsReset() const { return m_needsReset; }
84 84
85 // This is set when one of the inputs to finalConstraints changes. 85 // This is set when one of the inputs to finalConstraints changes.
86 bool constraintsDirty() const { return m_constraintsDirty; } 86 bool constraintsDirty() const { return m_constraintsDirty; }
87 87
88 void didChangeInitialContainingBlockSize(const IntSize&); 88 void didChangeViewSize(const IntSize&);
89
90 IntSize mainFrameSize() const;
89 91
90 IntSize layoutSize() const; 92 IntSize layoutSize() const;
91 93
92 private: 94 private:
93 PageScaleConstraintsSet(); 95 PageScaleConstraintsSet();
94 96
95 PageScaleConstraints computeConstraintsStack() const; 97 PageScaleConstraints computeConstraintsStack() const;
96 98
97 PageScaleConstraints m_defaultConstraints; 99 PageScaleConstraints m_defaultConstraints;
98 PageScaleConstraints m_pageDefinedConstraints; 100 PageScaleConstraints m_pageDefinedConstraints;
99 PageScaleConstraints m_userAgentConstraints; 101 PageScaleConstraints m_userAgentConstraints;
100 PageScaleConstraints m_fullscreenConstraints; 102 PageScaleConstraints m_fullscreenConstraints;
101 PageScaleConstraints m_finalConstraints; 103 PageScaleConstraints m_finalConstraints;
102 104
103 int m_lastContentsWidth; 105 int m_lastContentsWidth;
104 IntSize m_icbSize; 106 IntSize m_viewSize;
105 107
106 bool m_needsReset; 108 bool m_needsReset;
107 bool m_constraintsDirty; 109 bool m_constraintsDirty;
108 }; 110 };
109 111
110 } // namespace blink 112 } // namespace blink
111 113
112 #endif // PageScaleConstraintsSet_h 114 #endif // PageScaleConstraintsSet_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/frame/FrameView.cpp ('k') | third_party/WebKit/Source/core/frame/PageScaleConstraintsSet.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698