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

Side by Side Diff: Source/web/WebViewImpl.cpp

Issue 82083002: Move viewport unit resolution to style recalc time (Closed) Base URL: https://chromium.googlesource.com/chromium/blink@master
Patch Set: fix compile on mac Created 7 years 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) 2011, 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2011, 2012 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 2982 matching lines...) Expand 10 before | Expand all | Expand 10 after
2993 { 2993 {
2994 if (!settings()->viewportEnabled() || !page() || !m_size.width || !m_size.he ight) 2994 if (!settings()->viewportEnabled() || !page() || !m_size.width || !m_size.he ight)
2995 return; 2995 return;
2996 2996
2997 ViewportDescription adjustedDescription = description; 2997 ViewportDescription adjustedDescription = description;
2998 if (settingsImpl()->viewportMetaLayoutSizeQuirk() && adjustedDescription.typ e == ViewportDescription::ViewportMeta) { 2998 if (settingsImpl()->viewportMetaLayoutSizeQuirk() && adjustedDescription.typ e == ViewportDescription::ViewportMeta) {
2999 if (adjustedDescription.maxWidth.type() == ExtendToZoom) 2999 if (adjustedDescription.maxWidth.type() == ExtendToZoom)
3000 adjustedDescription.maxWidth = Length(); // auto 3000 adjustedDescription.maxWidth = Length(); // auto
3001 const int legacyWidthSnappingMagicNumber = 320; 3001 const int legacyWidthSnappingMagicNumber = 320;
3002 if (adjustedDescription.maxWidth.isFixed() && adjustedDescription.maxWid th.value() <= legacyWidthSnappingMagicNumber) 3002 if (adjustedDescription.maxWidth.isFixed() && adjustedDescription.maxWid th.value() <= legacyWidthSnappingMagicNumber)
3003 adjustedDescription.maxWidth = Length(100, ViewportPercentageWidth); 3003 adjustedDescription.maxWidth = Length(DeviceWidth);
3004 if (adjustedDescription.maxHeight.isFixed() && adjustedDescription.maxWi dth.value() <= m_size.height) 3004 if (adjustedDescription.maxHeight.isFixed() && adjustedDescription.maxWi dth.value() <= m_size.height)
3005 adjustedDescription.maxHeight = Length(100, ViewportPercentageHeight ); 3005 adjustedDescription.maxHeight = Length(DeviceHeight);
3006 adjustedDescription.minWidth = adjustedDescription.maxWidth; 3006 adjustedDescription.minWidth = adjustedDescription.maxWidth;
3007 adjustedDescription.minHeight = adjustedDescription.maxHeight; 3007 adjustedDescription.minHeight = adjustedDescription.maxHeight;
3008 } 3008 }
3009 float oldInitialScale = m_pageScaleConstraintsSet.pageDefinedConstraints().i nitialScale; 3009 float oldInitialScale = m_pageScaleConstraintsSet.pageDefinedConstraints().i nitialScale;
3010 m_pageScaleConstraintsSet.updatePageDefinedConstraints(adjustedDescription, m_size); 3010 m_pageScaleConstraintsSet.updatePageDefinedConstraints(adjustedDescription, m_size);
3011 3011
3012 if (settingsImpl()->clobberUserAgentInitialScaleQuirk() 3012 if (settingsImpl()->clobberUserAgentInitialScaleQuirk()
3013 && m_pageScaleConstraintsSet.userAgentConstraints().initialScale != -1 3013 && m_pageScaleConstraintsSet.userAgentConstraints().initialScale != -1
3014 && m_pageScaleConstraintsSet.userAgentConstraints().initialScale * devic eScaleFactor() <= 1) { 3014 && m_pageScaleConstraintsSet.userAgentConstraints().initialScale * devic eScaleFactor() <= 1) {
3015 if (description.maxWidth == Length(100, ViewportPercentageWidth) 3015 if (description.maxWidth == Length(DeviceWidth)
3016 || (description.maxWidth.type() == ExtendToZoom && m_pageScaleConstr aintsSet.pageDefinedConstraints().initialScale == 1.0f)) 3016 || (description.maxWidth.type() == ExtendToZoom && m_pageScaleConstr aintsSet.pageDefinedConstraints().initialScale == 1.0f))
3017 setInitialPageScaleOverride(-1); 3017 setInitialPageScaleOverride(-1);
3018 } 3018 }
3019 m_pageScaleConstraintsSet.adjustForAndroidWebViewQuirks(adjustedDescription, m_size, page()->settings().layoutFallbackWidth(), deviceScaleFactor(), settings Impl()->supportDeprecatedTargetDensityDPI(), page()->settings().wideViewportQuir kEnabled(), page()->settings().useWideViewport(), page()->settings().loadWithOve rviewMode(), settingsImpl()->viewportMetaNonUserScalableQuirk()); 3019 m_pageScaleConstraintsSet.adjustForAndroidWebViewQuirks(adjustedDescription, m_size, page()->settings().layoutFallbackWidth(), deviceScaleFactor(), settings Impl()->supportDeprecatedTargetDensityDPI(), page()->settings().wideViewportQuir kEnabled(), page()->settings().useWideViewport(), page()->settings().loadWithOve rviewMode(), settingsImpl()->viewportMetaNonUserScalableQuirk());
3020 float newInitialScale = m_pageScaleConstraintsSet.pageDefinedConstraints().i nitialScale; 3020 float newInitialScale = m_pageScaleConstraintsSet.pageDefinedConstraints().i nitialScale;
3021 if (oldInitialScale != newInitialScale && newInitialScale != -1) { 3021 if (oldInitialScale != newInitialScale && newInitialScale != -1) {
3022 m_pageScaleConstraintsSet.setNeedsReset(true); 3022 m_pageScaleConstraintsSet.setNeedsReset(true);
3023 if (mainFrameImpl() && mainFrameImpl()->frameView()) 3023 if (mainFrameImpl() && mainFrameImpl()->frameView())
3024 mainFrameImpl()->frameView()->setNeedsLayout(); 3024 mainFrameImpl()->frameView()->setNeedsLayout();
3025 } 3025 }
(...skipping 1162 matching lines...) Expand 10 before | Expand all | Expand 10 after
4188 const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefi nedConstraints(); 4188 const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefi nedConstraints();
4189 4189
4190 if (!mainFrameImpl() || !mainFrameImpl()->frameView()) 4190 if (!mainFrameImpl() || !mainFrameImpl()->frameView())
4191 return false; 4191 return false;
4192 4192
4193 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width 4193 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width
4194 || (constraints.minimumScale == constraints.maximumScale && constraints. minimumScale != -1); 4194 || (constraints.minimumScale == constraints.maximumScale && constraints. minimumScale != -1);
4195 } 4195 }
4196 4196
4197 } // namespace blink 4197 } // namespace blink
OLDNEW
« Source/platform/Length.h ('K') | « Source/web/PageScaleConstraintsSet.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698