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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: Source/core/dom/ViewportArguments.cpp

Issue 19555002: Translate viewport related meta tags into @viewport descriptors as suggested by the CSS Device Adap… (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 4 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 side-by-side diff with in-line comments
Download patch
« Source/core/css/resolver/ViewportStyleResolver.cpp ('K') | « Source/core/dom/ViewportArguments.h ('k') | Source/core/html/HTMLMetaElement.h » ('j') | Source/core/page/PageScaleConstraintsSet.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/dom/ViewportArguments.cpp
diff --git a/Source/core/dom/ViewportArguments.cpp b/Source/core/dom/ViewportArguments.cpp
index 72a64ebe4a5bffde8b2bc26d1fe4a13c9709c0b4..f011b4f2082acf667b8c8422ff41a45451dedf0b 100644
--- a/Source/core/dom/ViewportArguments.cpp
+++ b/Source/core/dom/ViewportArguments.cpp
@@ -46,34 +46,13 @@ static const float& compareIgnoringAuto(const float& value1, const float& value2
return compare(value1, value2);
}
-static inline float clampLengthValue(float value)
+PageScaleConstraints ViewportArguments::resolve(const FloatSize& initialViewportSize) const
{
- ASSERT(value != ViewportArguments::ValueDeviceWidth);
- ASSERT(value != ViewportArguments::ValueDeviceHeight);
-
- // Limits as defined in the css-device-adapt spec.
- if (value != ViewportArguments::ValueAuto)
- return min(float(10000), max(value, float(1)));
- return value;
-}
-
-static inline float clampScaleValue(float value)
-{
- ASSERT(value != ViewportArguments::ValueDeviceWidth);
- ASSERT(value != ViewportArguments::ValueDeviceHeight);
-
- // Limits as defined in the css-device-adapt spec.
- if (value != ViewportArguments::ValueAuto)
- return min(float(10), max(value, float(0.1)));
- return value;
-}
-
-PageScaleConstraints ViewportArguments::resolve(const FloatSize& initialViewportSize, int defaultWidth) const
-{
- float resultWidth = width;
+ float resultWidth = ViewportArguments::ValueAuto;
float resultMaxWidth = maxWidth;
float resultMinWidth = minWidth;
- float resultHeight = height;
+
+ float resultHeight = ViewportArguments::ValueAuto;
float resultMinHeight = minHeight;
float resultMaxHeight = maxHeight;
@@ -82,363 +61,79 @@ PageScaleConstraints ViewportArguments::resolve(const FloatSize& initialViewport
float resultMaxZoom = maxZoom;
float resultUserZoom = userZoom;
- if (type == ViewportArguments::CSSDeviceAdaptation) {
-
- // device-width/device-height not supported for @viewport.
- ASSERT(resultMinWidth != ViewportArguments::ValueDeviceWidth);
- ASSERT(resultMinWidth != ViewportArguments::ValueDeviceHeight);
- ASSERT(resultMaxWidth != ViewportArguments::ValueDeviceWidth);
- ASSERT(resultMaxWidth != ViewportArguments::ValueDeviceHeight);
- ASSERT(resultMinHeight != ViewportArguments::ValueDeviceWidth);
- ASSERT(resultMinHeight != ViewportArguments::ValueDeviceHeight);
- ASSERT(resultMaxHeight != ViewportArguments::ValueDeviceWidth);
- ASSERT(resultMaxHeight != ViewportArguments::ValueDeviceHeight);
-
- // 1. Resolve min-zoom and max-zoom values.
- if (resultMinZoom != ViewportArguments::ValueAuto && resultMaxZoom != ViewportArguments::ValueAuto)
- resultMaxZoom = max(resultMinZoom, resultMaxZoom);
+ // 1. Resolve min-zoom and max-zoom values.
+ if (resultMinZoom != ViewportArguments::ValueAuto && resultMaxZoom != ViewportArguments::ValueAuto)
+ resultMaxZoom = max(resultMinZoom, resultMaxZoom);
- // 2. Constrain zoom value to the [min-zoom, max-zoom] range.
- if (resultZoom != ViewportArguments::ValueAuto)
- resultZoom = compareIgnoringAuto(resultMinZoom, compareIgnoringAuto(resultMaxZoom, resultZoom, min), max);
+ // 2. Constrain zoom value to the [min-zoom, max-zoom] range.
+ if (resultZoom != ViewportArguments::ValueAuto)
+ resultZoom = compareIgnoringAuto(resultMinZoom, compareIgnoringAuto(resultMaxZoom, resultZoom, min), max);
- float extendZoom = compareIgnoringAuto(resultZoom, resultMaxZoom, min);
+ float extendZoom = compareIgnoringAuto(resultZoom, resultMaxZoom, min);
- if (extendZoom == ViewportArguments::ValueAuto) {
- if (resultMaxWidth == ViewportArguments::ValueExtendToZoom)
- resultMaxWidth = ViewportArguments::ValueAuto;
+ // 3. Resolve non-"auto" lengths to pixel lengths.
+ if (extendZoom == ViewportArguments::ValueAuto) {
+ if (resultMaxWidth == ViewportArguments::ValueExtendToZoom)
+ resultMaxWidth = ViewportArguments::ValueAuto;
- if (resultMaxHeight == ViewportArguments::ValueExtendToZoom)
- resultMaxHeight = ViewportArguments::ValueAuto;
+ if (resultMaxHeight == ViewportArguments::ValueExtendToZoom)
+ resultMaxHeight = ViewportArguments::ValueAuto;
- if (resultMinWidth == ViewportArguments::ValueExtendToZoom)
- resultMinWidth = resultMaxWidth;
+ if (resultMinWidth == ViewportArguments::ValueExtendToZoom)
+ resultMinWidth = resultMaxWidth;
- if (resultMinHeight == ViewportArguments::ValueExtendToZoom)
- resultMinHeight = resultMaxHeight;
- } else {
- float extendWidth = initialViewportSize.width() / extendZoom;
- float extendHeight = initialViewportSize.height() / extendZoom;
+ if (resultMinHeight == ViewportArguments::ValueExtendToZoom)
+ resultMinHeight = resultMaxHeight;
+ } else {
+ float extendWidth = initialViewportSize.width() / extendZoom;
+ float extendHeight = initialViewportSize.height() / extendZoom;
- if (resultMaxWidth == ViewportArguments::ValueExtendToZoom)
- resultMaxWidth = extendWidth;
+ if (resultMaxWidth == ViewportArguments::ValueExtendToZoom)
+ resultMaxWidth = extendWidth;
- if (resultMaxHeight == ViewportArguments::ValueExtendToZoom)
- resultMaxHeight = extendHeight;
+ if (resultMaxHeight == ViewportArguments::ValueExtendToZoom)
+ resultMaxHeight = extendHeight;
- if (resultMinWidth == ViewportArguments::ValueExtendToZoom)
- resultMinWidth = compareIgnoringAuto(extendWidth, resultMaxWidth, max);
-
- if (resultMinHeight == ViewportArguments::ValueExtendToZoom)
- resultMinHeight = compareIgnoringAuto(extendHeight, resultMaxHeight, max);
- }
-
- // 4. Resolve initial width from min/max descriptors.
- if (resultMinWidth != ViewportArguments::ValueAuto || resultMaxWidth != ViewportArguments::ValueAuto)
- resultWidth = compareIgnoringAuto(resultMinWidth, compareIgnoringAuto(resultMaxWidth, initialViewportSize.width(), min), max);
-
- // 5. Resolve initial height from min/max descriptors.
- if (resultMinHeight != ViewportArguments::ValueAuto || resultMaxHeight != ViewportArguments::ValueAuto)
- resultHeight = compareIgnoringAuto(resultMinHeight, compareIgnoringAuto(resultMaxHeight, initialViewportSize.height(), min), max);
-
- // 6-7. Resolve width value.
- if (resultWidth == ViewportArguments::ValueAuto) {
- if (resultHeight == ViewportArguments::ValueAuto || !initialViewportSize .height())
- resultWidth = initialViewportSize.width();
- else
- resultWidth = resultHeight * (initialViewportSize.width() / initialViewportSize.height());
- }
-
- // 8. Resolve height value.
- if (resultHeight == ViewportArguments::ValueAuto) {
- if (!initialViewportSize.width())
- resultHeight = initialViewportSize.height();
- else
- resultHeight = resultWidth * initialViewportSize.height() / initialViewportSize.width();
- }
-
- PageScaleConstraints result;
- result.minimumScale = resultMinZoom;
- result.maximumScale = resultMaxZoom;
- result.initialScale = resultZoom;
- result.layoutSize.setWidth(resultWidth);
- result.layoutSize.setHeight(resultHeight);
- return result;
- }
-
- switch (static_cast<int>(resultWidth)) {
- case ViewportArguments::ValueDeviceWidth:
- resultWidth = initialViewportSize.width();
- break;
- case ViewportArguments::ValueDeviceHeight:
- resultWidth = initialViewportSize.height();
- break;
- }
-
- switch (static_cast<int>(resultHeight)) {
- case ViewportArguments::ValueDeviceWidth:
- resultHeight = initialViewportSize.width();
- break;
- case ViewportArguments::ValueDeviceHeight:
- resultHeight = initialViewportSize.height();
- break;
- }
+ if (resultMinWidth == ViewportArguments::ValueExtendToZoom)
+ resultMinWidth = compareIgnoringAuto(extendWidth, resultMaxWidth, max);
- if (type != ViewportArguments::Implicit) {
- // Clamp values to a valid range, but not for @viewport since is
- // not mandated by the specification.
- resultWidth = clampLengthValue(resultWidth);
- resultHeight = clampLengthValue(resultHeight);
- resultZoom = clampScaleValue(resultZoom);
- resultMinZoom = clampScaleValue(resultMinZoom);
- resultMaxZoom = clampScaleValue(resultMaxZoom);
+ if (resultMinHeight == ViewportArguments::ValueExtendToZoom)
+ resultMinHeight = compareIgnoringAuto(extendHeight, resultMaxHeight, max);
}
- PageScaleConstraints result;
-
- // Resolve minimum-scale and maximum-scale values according to spec.
- if (resultMinZoom == ViewportArguments::ValueAuto)
- result.minimumScale = float(0.25);
- else
- result.minimumScale = resultMinZoom;
-
- if (resultMaxZoom == ViewportArguments::ValueAuto) {
- result.maximumScale = float(5.0);
- result.minimumScale = min(float(5.0), result.minimumScale);
- } else
- result.maximumScale = resultMaxZoom;
- result.maximumScale = max(result.minimumScale, result.maximumScale);
-
- // Resolve initial-scale value.
- result.initialScale = resultZoom;
- if (resultZoom == ViewportArguments::ValueAuto) {
- result.initialScale = initialViewportSize.width() / defaultWidth;
- if (resultWidth != ViewportArguments::ValueAuto && resultWidth > 0)
- result.initialScale = initialViewportSize.width() / resultWidth;
- if (resultHeight != ViewportArguments::ValueAuto && resultHeight > 0) {
- // if 'auto', the initial-scale will be negative here and thus ignored.
- result.initialScale = max<float>(result.initialScale, initialViewportSize.height() / resultHeight);
- }
- }
+ // 4. Resolve initial width from min/max descriptors.
+ if (resultMinWidth != ViewportArguments::ValueAuto || resultMaxWidth != ViewportArguments::ValueAuto)
+ resultWidth = compareIgnoringAuto(resultMinWidth, compareIgnoringAuto(resultMaxWidth, initialViewportSize.width(), min), max);
- // Constrain initial-scale value to minimum-scale/maximum-scale range.
- result.initialScale = min(result.maximumScale, max(result.minimumScale, result.initialScale));
+ // 5. Resolve initial height from min/max descriptors.
+ if (resultMinHeight != ViewportArguments::ValueAuto || resultMaxHeight != ViewportArguments::ValueAuto)
+ resultHeight = compareIgnoringAuto(resultMinHeight, compareIgnoringAuto(resultMaxHeight, initialViewportSize.height(), min), max);
- // Resolve width value.
+ // 6-7. Resolve width value.
if (resultWidth == ViewportArguments::ValueAuto) {
- if (resultZoom == ViewportArguments::ValueAuto)
- resultWidth = defaultWidth;
- else if (resultHeight != ViewportArguments::ValueAuto)
- resultWidth = resultHeight * (initialViewportSize.width() / initialViewportSize.height());
+ if (resultHeight == ViewportArguments::ValueAuto || !initialViewportSize.height())
+ resultWidth = initialViewportSize.width();
else
- resultWidth = initialViewportSize.width() / result.initialScale;
+ resultWidth = resultHeight * (initialViewportSize.width() / initialViewportSize.height());
}
- // Resolve height value.
- if (resultHeight == ViewportArguments::ValueAuto)
- resultHeight = resultWidth * (initialViewportSize.height() / initialViewportSize.width());
-
- if (type == ViewportArguments::ViewportMeta) {
- // Extend width and height to fill the visual viewport for the resolved initial-scale.
- resultWidth = max<float>(resultWidth, initialViewportSize.width() / result.initialScale);
- resultHeight = max<float>(resultHeight, initialViewportSize.height() / result.initialScale);
+ // 8. Resolve height value.
+ if (resultHeight == ViewportArguments::ValueAuto) {
+ if (!initialViewportSize.width())
+ resultHeight = initialViewportSize.height();
+ else
+ resultHeight = resultWidth * (initialViewportSize.height() / initialViewportSize.width());
}
+ PageScaleConstraints result;
+
+ result.minimumScale = resultMinZoom;
+ result.maximumScale = resultMaxZoom;
+ result.initialScale = resultZoom;
result.layoutSize.setWidth(resultWidth);
result.layoutSize.setHeight(resultHeight);
- // If user-scalable = no, lock the min/max scale to the computed initial
- // scale.
- if (!resultUserZoom)
- result.maximumScale = result.minimumScale = result.initialScale;
-
- // Only set initialScale to a value if it was explicitly set.
- if (resultZoom == ViewportArguments::ValueAuto)
- result.initialScale = ViewportArguments::ValueAuto;
-
return result;
}
-static float numericPrefix(const String& keyString, const String& valueString, Document* document, bool* ok = 0)
-{
- size_t parsedLength;
- float value;
- if (valueString.is8Bit())
- value = charactersToFloat(valueString.characters8(), valueString.length(), parsedLength);
- else
- value = charactersToFloat(valueString.characters16(), valueString.length(), parsedLength);
- if (!parsedLength) {
- reportViewportWarning(document, UnrecognizedViewportArgumentValueError, valueString, keyString);
- if (ok)
- *ok = false;
- return 0;
- }
- if (parsedLength < valueString.length())
- reportViewportWarning(document, TruncatedViewportArgumentValueError, valueString, keyString);
- if (ok)
- *ok = true;
- return value;
-}
-
-static float findSizeValue(const String& keyString, const String& valueString, Document* document)
-{
- // 1) Non-negative number values are translated to px lengths.
- // 2) Negative number values are translated to auto.
- // 3) device-width and device-height are used as keywords.
- // 4) Other keywords and unknown values translate to 0.0.
-
- if (equalIgnoringCase(valueString, "device-width"))
- return ViewportArguments::ValueDeviceWidth;
- if (equalIgnoringCase(valueString, "device-height"))
- return ViewportArguments::ValueDeviceHeight;
-
- float value = numericPrefix(keyString, valueString, document);
-
- if (value < 0)
- return ViewportArguments::ValueAuto;
-
- return value;
-}
-
-static float findScaleValue(const String& keyString, const String& valueString, Document* document)
-{
- // 1) Non-negative number values are translated to <number> values.
- // 2) Negative number values are translated to auto.
- // 3) yes is translated to 1.0.
- // 4) device-width and device-height are translated to 10.0.
- // 5) no and unknown values are translated to 0.0
-
- if (equalIgnoringCase(valueString, "yes"))
- return 1;
- if (equalIgnoringCase(valueString, "no"))
- return 0;
- if (equalIgnoringCase(valueString, "device-width"))
- return 10;
- if (equalIgnoringCase(valueString, "device-height"))
- return 10;
-
- float value = numericPrefix(keyString, valueString, document);
-
- if (value < 0)
- return ViewportArguments::ValueAuto;
-
- if (value > 10.0)
- reportViewportWarning(document, MaximumScaleTooLargeError, String(), String());
-
- return value;
-}
-
-static float findUserScalableValue(const String& keyString, const String& valueString, Document* document)
-{
- // yes and no are used as keywords.
- // Numbers >= 1, numbers <= -1, device-width and device-height are mapped to yes.
- // Numbers in the range <-1, 1>, and unknown values, are mapped to no.
-
- if (equalIgnoringCase(valueString, "yes"))
- return 1;
- if (equalIgnoringCase(valueString, "no"))
- return 0;
- if (equalIgnoringCase(valueString, "device-width"))
- return 1;
- if (equalIgnoringCase(valueString, "device-height"))
- return 1;
-
- float value = numericPrefix(keyString, valueString, document);
-
- if (fabs(value) < 1)
- return 0;
-
- return 1;
-}
-
-static float findTargetDensityDPIValue(const String& keyString, const String& valueString, Document* document)
-{
- if (equalIgnoringCase(valueString, "device-dpi"))
- return ViewportArguments::ValueDeviceDPI;
- if (equalIgnoringCase(valueString, "low-dpi"))
- return ViewportArguments::ValueLowDPI;
- if (equalIgnoringCase(valueString, "medium-dpi"))
- return ViewportArguments::ValueMediumDPI;
- if (equalIgnoringCase(valueString, "high-dpi"))
- return ViewportArguments::ValueHighDPI;
-
- bool ok;
- float value = numericPrefix(keyString, valueString, document, &ok);
- if (!ok || value < 70 || value > 400)
- return ViewportArguments::ValueAuto;
-
- return value;
-}
-
-void setViewportFeature(const String& keyString, const String& valueString, Document* document, void* data)
-{
- ViewportArguments* arguments = static_cast<ViewportArguments*>(data);
-
- if (keyString == "width")
- arguments->width = findSizeValue(keyString, valueString, document);
- else if (keyString == "height")
- arguments->height = findSizeValue(keyString, valueString, document);
- else if (keyString == "initial-scale")
- arguments->zoom = findScaleValue(keyString, valueString, document);
- else if (keyString == "minimum-scale")
- arguments->minZoom = findScaleValue(keyString, valueString, document);
- else if (keyString == "maximum-scale")
- arguments->maxZoom = findScaleValue(keyString, valueString, document);
- else if (keyString == "user-scalable")
- arguments->userZoom = findUserScalableValue(keyString, valueString, document);
- else if (keyString == "target-densitydpi") {
- arguments->deprecatedTargetDensityDPI = findTargetDensityDPIValue(keyString, valueString, document);
- reportViewportWarning(document, TargetDensityDpiUnsupported, String(), String());
- } else
- reportViewportWarning(document, UnrecognizedViewportArgumentKeyError, keyString, String());
-}
-
-static const char* viewportErrorMessageTemplate(ViewportErrorCode errorCode)
-{
- static const char* const errors[] = {
- "Viewport argument key \"%replacement1\" not recognized and ignored.",
- "Viewport argument value \"%replacement1\" for key \"%replacement2\" is invalid, and has been ignored.",
- "Viewport argument value \"%replacement1\" for key \"%replacement2\" was truncated to its numeric prefix.",
- "Viewport maximum-scale cannot be larger than 10.0. The maximum-scale will be set to 10.0.",
- "Viewport target-densitydpi is not supported.",
- };
-
- return errors[errorCode];
-}
-
-static MessageLevel viewportErrorMessageLevel(ViewportErrorCode errorCode)
-{
- switch (errorCode) {
- case TruncatedViewportArgumentValueError:
- case TargetDensityDpiUnsupported:
- return WarningMessageLevel;
- case UnrecognizedViewportArgumentKeyError:
- case UnrecognizedViewportArgumentValueError:
- case MaximumScaleTooLargeError:
- return ErrorMessageLevel;
- }
-
- ASSERT_NOT_REACHED();
- return ErrorMessageLevel;
-}
-
-void reportViewportWarning(Document* document, ViewportErrorCode errorCode, const String& replacement1, const String& replacement2)
-{
- Frame* frame = document->frame();
- if (!frame)
- return;
-
- String message = viewportErrorMessageTemplate(errorCode);
- if (!replacement1.isNull())
- message.replace("%replacement1", replacement1);
- if (!replacement2.isNull())
- message.replace("%replacement2", replacement2);
-
- if ((errorCode == UnrecognizedViewportArgumentValueError || errorCode == TruncatedViewportArgumentValueError) && replacement1.find(';') != WTF::notFound)
- message.append(" Note that ';' is not a separator in viewport values. The list should be comma-separated.");
-
- // FIXME: This message should be moved off the console once a solution to https://bugs.webkit.org/show_bug.cgi?id=103274 exists.
- document->addConsoleMessage(RenderingMessageSource, viewportErrorMessageLevel(errorCode), message);
-}
-
} // namespace WebCore
« Source/core/css/resolver/ViewportStyleResolver.cpp ('K') | « Source/core/dom/ViewportArguments.h ('k') | Source/core/html/HTMLMetaElement.h » ('j') | Source/core/page/PageScaleConstraintsSet.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698