| 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 13 matching lines...) Expand all Loading... |
| 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
| 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
| 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 29 */ | 29 */ |
| 30 | 30 |
| 31 #include "config.h" | 31 #include "config.h" |
| 32 #include "PageScaleConstraintsSet.h" | 32 #include "PageScaleConstraintsSet.h" |
| 33 | 33 |
| 34 #include "platform/Length.h" |
| 34 #include "wtf/Assertions.h" | 35 #include "wtf/Assertions.h" |
| 35 | 36 |
| 36 using namespace WebCore; | 37 using namespace WebCore; |
| 37 | 38 |
| 38 namespace blink { | 39 namespace blink { |
| 39 | 40 |
| 40 static const float defaultMinimumScale = 0.25f; | 41 static const float defaultMinimumScale = 0.25f; |
| 41 static const float defaultMaximumScale = 5.0f; | 42 static const float defaultMaximumScale = 5.0f; |
| 42 | 43 |
| 43 PageScaleConstraintsSet::PageScaleConstraintsSet() | 44 PageScaleConstraintsSet::PageScaleConstraintsSet() |
| 44 : m_lastContentsWidth(0) | 45 : m_lastContentsWidth(0) |
| 45 , m_needsReset(false) | 46 , m_needsReset(false) |
| 46 , m_constraintsDirty(false) | 47 , m_constraintsDirty(false) |
| 47 { | 48 { |
| 48 m_finalConstraints = defaultConstraints(); | 49 m_finalConstraints = defaultConstraints(); |
| 49 } | 50 } |
| 50 | 51 |
| 51 PageScaleConstraints PageScaleConstraintsSet::defaultConstraints() const | 52 PageScaleConstraints PageScaleConstraintsSet::defaultConstraints() const |
| 52 { | 53 { |
| 53 return PageScaleConstraints(-1, defaultMinimumScale, defaultMaximumScale); | 54 return PageScaleConstraints(-1, defaultMinimumScale, defaultMaximumScale); |
| 54 } | 55 } |
| 55 | 56 |
| 56 void PageScaleConstraintsSet::updatePageDefinedConstraints(const ViewportDescrip
tion& description, IntSize viewSize) | 57 void PageScaleConstraintsSet::updatePageDefinedConstraints(const ViewportDescrip
tion& description, IntSize viewSize, Length legacyFallbackWidth) |
| 57 { | 58 { |
| 58 m_pageDefinedConstraints = description.resolve(viewSize); | 59 m_pageDefinedConstraints = description.resolve(viewSize, legacyFallbackWidth
); |
| 59 | 60 |
| 60 m_constraintsDirty = true; | 61 m_constraintsDirty = true; |
| 61 } | 62 } |
| 62 | 63 |
| 63 void PageScaleConstraintsSet::setUserAgentConstraints(const PageScaleConstraints
& userAgentConstraints) | 64 void PageScaleConstraintsSet::setUserAgentConstraints(const PageScaleConstraints
& userAgentConstraints) |
| 64 { | 65 { |
| 65 m_userAgentConstraints = userAgentConstraints; | 66 m_userAgentConstraints = userAgentConstraints; |
| 66 m_constraintsDirty = true; | 67 m_constraintsDirty = true; |
| 67 } | 68 } |
| 68 | 69 |
| (...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 201 adjustedLayoutSizeWidth = viewSize.width() / targetDensityDPIFactor; | 202 adjustedLayoutSizeWidth = viewSize.width() / targetDensityDPIFactor; |
| 202 adjustedLayoutSizeHeight = computeHeightByAspectRatio(adjustedLayout
SizeWidth, viewSize); | 203 adjustedLayoutSizeHeight = computeHeightByAspectRatio(adjustedLayout
SizeWidth, viewSize); |
| 203 } | 204 } |
| 204 } | 205 } |
| 205 | 206 |
| 206 m_pageDefinedConstraints.layoutSize.setWidth(adjustedLayoutSizeWidth); | 207 m_pageDefinedConstraints.layoutSize.setWidth(adjustedLayoutSizeWidth); |
| 207 m_pageDefinedConstraints.layoutSize.setHeight(adjustedLayoutSizeHeight); | 208 m_pageDefinedConstraints.layoutSize.setHeight(adjustedLayoutSizeHeight); |
| 208 } | 209 } |
| 209 | 210 |
| 210 } // namespace WebCore | 211 } // namespace WebCore |
| OLD | NEW |