Changeset 80483 in webkit


Ignore:
Timestamp:
Mar 7, 2011 11:41:31 AM (13 years ago)
Author:
Joseph Pecoraro
Message:

2011-03-07 Joseph Pecoraro <Joseph Pecoraro>

Reviewed by Kenneth Rohde Christiansen.

Viewport Warning/Error Messages Are Now Inaccurate
​https://bugs.webkit.org/show_bug.cgi?id=53707

Added tests specifically to test Console warnings.

  • fast/viewport/viewport-warnings-1.html: Added.
  • fast/viewport/viewport-warnings-2.html: Added.
  • fast/viewport/viewport-warnings-3.html: Added.
  • fast/viewport/viewport-warnings-4.html: Added.
  • fast/viewport/viewport-warnings-5.html: Added.
  • fast/viewport/viewport-warnings-6.html: Added.

2011-03-07 Joseph Pecoraro <Joseph Pecoraro>

Reviewed by Kenneth Rohde Christiansen.

Viewport Warning/Error Messages Are Now Inaccurate
​https://bugs.webkit.org/show_bug.cgi?id=53707

Correct and improve the error messages for viewport parsing.

Tests: fast/viewport/viewport-warnings-1.html

fast/viewport/viewport-warnings-2.html
fast/viewport/viewport-warnings-3.html
fast/viewport/viewport-warnings-4.html
fast/viewport/viewport-warnings-5.html
fast/viewport/viewport-warnings-6.html

  • dom/ViewportArguments.cpp: (WebCore::numericPrefix): (WebCore::findSizeValue): remove incorrect device-width / height tips. (WebCore::setViewportFeature): report a warning for an unrecognized key. (WebCore::viewportErrorMessageTemplate): added template for unrecognized key. (WebCore::viewportErrorMessageLevel): classify an unrecognized key is an error.
  • dom/ViewportArguments.h: removed no longer used warnings.
Location:
trunk
Files:
6 added
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r80471 r80483  
     12011-03-07  Joseph Pecoraro  <joepeck@webkit.org>
     2
     3        Reviewed by Kenneth Rohde Christiansen.
     4
     5        Viewport Warning/Error Messages Are Now Inaccurate
     6        https://bugs.webkit.org/show_bug.cgi?id=53707
     7
     8        Added tests specifically to test Console warnings.
     9
     10        * fast/viewport/viewport-warnings-1.html: Added.
     11        * fast/viewport/viewport-warnings-2.html: Added.
     12        * fast/viewport/viewport-warnings-3.html: Added.
     13        * fast/viewport/viewport-warnings-4.html: Added.
     14        * fast/viewport/viewport-warnings-5.html: Added.
     15        * fast/viewport/viewport-warnings-6.html: Added.
     16
    1172011-03-07  Jeremy Orlow  <jorlow@chromium.org>
    218

  • trunk/Source/WebCore/ChangeLog

    r80482 r80483  
     12011-03-07  Joseph Pecoraro  <joepeck@webkit.org>
     2
     3        Reviewed by Kenneth Rohde Christiansen.
     4
     5        Viewport Warning/Error Messages Are Now Inaccurate
     6        https://bugs.webkit.org/show_bug.cgi?id=53707
     7
     8        Correct and improve the error messages for viewport parsing.
     9
     10        Tests: fast/viewport/viewport-warnings-1.html
     11               fast/viewport/viewport-warnings-2.html
     12               fast/viewport/viewport-warnings-3.html
     13               fast/viewport/viewport-warnings-4.html
     14               fast/viewport/viewport-warnings-5.html
     15               fast/viewport/viewport-warnings-6.html
     16
     17        * dom/ViewportArguments.cpp:
     18        (WebCore::numericPrefix):
     19        (WebCore::findSizeValue): remove incorrect device-width / height tips.
     20        (WebCore::setViewportFeature): report a warning for an unrecognized key.
     21        (WebCore::viewportErrorMessageTemplate): added template for unrecognized key.
     22        (WebCore::viewportErrorMessageLevel): classify an unrecognized key is an error.
     23        * dom/ViewportArguments.h: removed no longer used warnings.
     24
    1252011-03-07  James Robinson  <jamesr@chromium.org>
    226

  • trunk/Source/WebCore/dom/ViewportArguments.cpp

    r80077 r80483  
    191191        if (!didReadNumber) {
    192192            ASSERT(!value);
    193             reportViewportWarning(document, UnrecognizedViewportArgumentError, valueString, keyString);
     193            reportViewportWarning(document, UnrecognizedViewportArgumentValueError, valueString, keyString);
    194194            return value;
    195195        }
    … …  
    221221    if (value < 0)
    222222        return ViewportArguments::ValueAuto;
    223 
    224     if (keyString == "width")
    225         reportViewportWarning(document, DeviceWidthShouldBeUsedWarning, String(), String());
    226     else if (keyString == "height")
    227         reportViewportWarning(document, DeviceHeightShouldBeUsedWarning, String(), String());
    228223
    229224    return value;
    … …  
    333328    else if (keyString == "target-densitydpi")
    334329        arguments->targetDensityDpi = findTargetDensityDPIValue(keyString, valueString, document);
     330    else
     331        reportViewportWarning(document, UnrecognizedViewportArgumentKeyError, keyString, String());
    335332}
    336333
    … …  
    338335{
    339336    static const char* const errors[] = {
    340         "Viewport width or height set to physical device width, try using \"device-width\" constant instead for future compatibility.",
    341         "Viewport height or height set to physical device height, try using \"device-height\" constant instead for future compatibility.",
     337        "Viewport argument key \"%replacement1\" not recognized and ignored.",
    342338        "Viewport argument value \"%replacement1\" for key \"%replacement2\" not recognized. Content ignored.",
    343339        "Viewport argument value \"%replacement1\" for key \"%replacement2\" was truncated to its numeric prefix.",
    … …  
    352348{
    353349    switch (errorCode) {
    354     case DeviceWidthShouldBeUsedWarning:
    355     case DeviceHeightShouldBeUsedWarning:
    356350    case TruncatedViewportArgumentValueError:
    357351    case TargetDensityDpiTooSmallOrLargeError:
    358352        return TipMessageLevel;
    359     case UnrecognizedViewportArgumentError:
     353    case UnrecognizedViewportArgumentKeyError:
     354    case UnrecognizedViewportArgumentValueError:
    360355    case MaximumScaleTooLargeError:
    361356        return ErrorMessageLevel;

  • trunk/Source/WebCore/dom/ViewportArguments.h

    r80077 r80483  
    3636
    3737enum ViewportErrorCode {
    38     DeviceWidthShouldBeUsedWarning,
    39     DeviceHeightShouldBeUsedWarning,
    40     UnrecognizedViewportArgumentError,
     38    UnrecognizedViewportArgumentKeyError,
     39    UnrecognizedViewportArgumentValueError,
    4140    TruncatedViewportArgumentValueError,
    4241    MaximumScaleTooLargeError,
Note: See TracChangeset for help on using the changeset viewer.