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 22 matching lines...) Expand all Loading... |
33 | 33 |
34 #include "platform/Length.h" | 34 #include "platform/Length.h" |
35 #include "wtf/Assertions.h" | 35 #include "wtf/Assertions.h" |
36 | 36 |
37 namespace blink { | 37 namespace blink { |
38 | 38 |
39 static const float defaultMinimumScale = 0.25f; | 39 static const float defaultMinimumScale = 0.25f; |
40 static const float defaultMaximumScale = 5.0f; | 40 static const float defaultMaximumScale = 5.0f; |
41 | 41 |
42 PageScaleConstraintsSet::PageScaleConstraintsSet() | 42 PageScaleConstraintsSet::PageScaleConstraintsSet() |
43 : m_lastContentsWidth(0) | 43 : m_finalConstraints(1, 1, 1) |
| 44 , m_lastContentsWidth(0) |
44 , m_needsReset(false) | 45 , m_needsReset(false) |
45 , m_constraintsDirty(false) | 46 , m_constraintsDirty(false) |
46 { | 47 { |
47 m_finalConstraints = defaultConstraints(); | |
48 } | 48 } |
49 | 49 |
50 PageScaleConstraints PageScaleConstraintsSet::defaultConstraints() const | 50 PageScaleConstraints PageScaleConstraintsSet::defaultConstraints() const |
51 { | 51 { |
52 return PageScaleConstraints(-1, defaultMinimumScale, defaultMaximumScale); | 52 return PageScaleConstraints(-1, defaultMinimumScale, defaultMaximumScale); |
53 } | 53 } |
54 | 54 |
55 void PageScaleConstraintsSet::updatePageDefinedConstraints(const ViewportDescrip
tion& description, Length legacyFallbackWidth) | 55 void PageScaleConstraintsSet::updatePageDefinedConstraints(const ViewportDescrip
tion& description, Length legacyFallbackWidth) |
56 { | 56 { |
57 m_pageDefinedConstraints = description.resolve(m_viewSize, legacyFallbackWid
th); | 57 m_pageDefinedConstraints = description.resolve(m_viewSize, legacyFallbackWid
th); |
(...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
226 adjustedLayoutSizeWidth = m_viewSize.width() / targetDensityDPIFacto
r; | 226 adjustedLayoutSizeWidth = m_viewSize.width() / targetDensityDPIFacto
r; |
227 adjustedLayoutSizeHeight = computeHeightByAspectRatio(adjustedLayout
SizeWidth, m_viewSize); | 227 adjustedLayoutSizeHeight = computeHeightByAspectRatio(adjustedLayout
SizeWidth, m_viewSize); |
228 } | 228 } |
229 } | 229 } |
230 | 230 |
231 m_pageDefinedConstraints.layoutSize.setWidth(adjustedLayoutSizeWidth); | 231 m_pageDefinedConstraints.layoutSize.setWidth(adjustedLayoutSizeWidth); |
232 m_pageDefinedConstraints.layoutSize.setHeight(adjustedLayoutSizeHeight); | 232 m_pageDefinedConstraints.layoutSize.setHeight(adjustedLayoutSizeHeight); |
233 } | 233 } |
234 | 234 |
235 } // namespace blink | 235 } // namespace blink |
OLD | NEW |