Diff
Modified: trunk/LayoutTests/ChangeLog (136501 => 136502)
--- trunk/LayoutTests/ChangeLog 2012-12-04 11:59:34 UTC (rev 136501)
+++ trunk/LayoutTests/ChangeLog 2012-12-04 12:34:41 UTC (rev 136502)
@@ -1,3 +1,31 @@
+2012-12-04 Markus Heintz <[email protected]>
+
+ Web Inspector: Updating test expectations after viewport console warnings cleanup.
+ https://bugs.webkit.org/show_bug.cgi?id=102890
+
+ Reviewed by Jochen Eisinger.
+
+ Updating test expectations after improving the console message text
+ for a viewport console warning and change the log level to warning.
+
+ * fast/viewport/viewport-121-expected.txt:
+ * fast/viewport/viewport-122-expected.txt:
+ * fast/viewport/viewport-125-expected.txt:
+ * fast/viewport/viewport-126-expected.txt:
+ * fast/viewport/viewport-127-expected.txt:
+ * fast/viewport/viewport-134-expected.txt:
+ * fast/viewport/viewport-52-expected.txt:
+ * fast/viewport/viewport-53-expected.txt:
+ * fast/viewport/viewport-54-expected.txt:
+ * fast/viewport/viewport-55-expected.txt:
+ * fast/viewport/viewport-77-expected.txt:
+ * fast/viewport/viewport-83-expected.txt:
+ * fast/viewport/viewport-84-expected.txt:
+ * fast/viewport/viewport-87-expected.txt:
+ * fast/viewport/viewport-warnings-3-expected.txt:
+ * fast/viewport/viewport-warnings-5-expected.txt:
+ * fast/viewport/viewport-warnings-6-expected.txt:
+
2012-12-04 Takashi Sakamoto <[email protected]>
Unreviewed, WebKit gardening.
Modified: trunk/LayoutTests/fast/viewport/viewport-121-expected.txt (136501 => 136502)
--- trunk/LayoutTests/fast/viewport/viewport-121-expected.txt 2012-12-04 11:59:34 UTC (rev 136501)
+++ trunk/LayoutTests/fast/viewport/viewport-121-expected.txt 2012-12-04 12:34:41 UTC (rev 136502)
@@ -1,3 +1,3 @@
-CONSOLE MESSAGE: line 3: Viewport argument value " device-width" for key "width" not recognized. Content ignored.
+CONSOLE MESSAGE: line 3: Viewport argument value " device-width" for key "width" is invalid, and has been ignored.
ALERT: viewport size 64x70.4 scale 5 with limits [5, 5] and userScalable true
Modified: trunk/LayoutTests/fast/viewport/viewport-122-expected.txt (136501 => 136502)
--- trunk/LayoutTests/fast/viewport/viewport-122-expected.txt 2012-12-04 11:59:34 UTC (rev 136501)
+++ trunk/LayoutTests/fast/viewport/viewport-122-expected.txt 2012-12-04 12:34:41 UTC (rev 136502)
@@ -1,3 +1,3 @@
-CONSOLE MESSAGE: line 3: Viewport argument value " device-width" for key "width" not recognized. Content ignored.
+CONSOLE MESSAGE: line 3: Viewport argument value " device-width" for key "width" is invalid, and has been ignored.
ALERT: viewport size 64x70.4 scale 5 with limits [5, 5] and userScalable true
Modified: trunk/LayoutTests/fast/viewport/viewport-125-expected.txt (136501 => 136502)
--- trunk/LayoutTests/fast/viewport/viewport-125-expected.txt 2012-12-04 11:59:34 UTC (rev 136501)
+++ trunk/LayoutTests/fast/viewport/viewport-125-expected.txt 2012-12-04 12:34:41 UTC (rev 136502)
@@ -1,3 +1,3 @@
-CONSOLE MESSAGE: line 3: Viewport argument value " device-width" for key "width" not recognized. Content ignored.
+CONSOLE MESSAGE: line 3: Viewport argument value " device-width" for key "width" is invalid, and has been ignored.
ALERT: viewport size 64x70.4 scale 5 with limits [5, 5] and userScalable true
Modified: trunk/LayoutTests/fast/viewport/viewport-126-expected.txt (136501 => 136502)
--- trunk/LayoutTests/fast/viewport/viewport-126-expected.txt 2012-12-04 11:59:34 UTC (rev 136501)
+++ trunk/LayoutTests/fast/viewport/viewport-126-expected.txt 2012-12-04 12:34:41 UTC (rev 136502)
@@ -1,3 +1,3 @@
-CONSOLE MESSAGE: line 3: Viewport argument value "" for key "width" not recognized. Content ignored.
+CONSOLE MESSAGE: line 3: Viewport argument value "" for key "width" is invalid, and has been ignored.
ALERT: viewport size 64x70.4 scale 5 with limits [5, 5] and userScalable true
Modified: trunk/LayoutTests/fast/viewport/viewport-127-expected.txt (136501 => 136502)
--- trunk/LayoutTests/fast/viewport/viewport-127-expected.txt 2012-12-04 11:59:34 UTC (rev 136501)
+++ trunk/LayoutTests/fast/viewport/viewport-127-expected.txt 2012-12-04 12:34:41 UTC (rev 136502)
@@ -1,3 +1,3 @@
-CONSOLE MESSAGE: line 3: Viewport argument value "" for key "width" not recognized. Content ignored.
+CONSOLE MESSAGE: line 3: Viewport argument value "" for key "width" is invalid, and has been ignored.
ALERT: viewport size 64x70.4 scale 5 with limits [5, 5] and userScalable true
Modified: trunk/LayoutTests/fast/viewport/viewport-134-expected.txt (136501 => 136502)
--- trunk/LayoutTests/fast/viewport/viewport-134-expected.txt 2012-12-04 11:59:34 UTC (rev 136501)
+++ trunk/LayoutTests/fast/viewport/viewport-134-expected.txt 2012-12-04 12:34:41 UTC (rev 136502)
@@ -1,3 +1,3 @@
-CONSOLE MESSAGE: line 3: Viewport argument value "device-width;" for key "width" not recognized. Content ignored. Note that ';' is not a separator in viewport values. The list should be comma-separated.
+CONSOLE MESSAGE: line 3: Viewport argument value "device-width;" for key "width" is invalid, and has been ignored. Note that ';' is not a separator in viewport values. The list should be comma-separated.
ALERT: viewport size 160x176 scale 2 with limits [2, 5] and userScalable true
Modified: trunk/LayoutTests/fast/viewport/viewport-52-expected.txt (136501 => 136502)
--- trunk/LayoutTests/fast/viewport/viewport-52-expected.txt 2012-12-04 11:59:34 UTC (rev 136501)
+++ trunk/LayoutTests/fast/viewport/viewport-52-expected.txt 2012-12-04 12:34:41 UTC (rev 136502)
@@ -1,3 +1,3 @@
-CONSOLE MESSAGE: line 3: Viewport argument value "garbage" for key "width" not recognized. Content ignored.
+CONSOLE MESSAGE: line 3: Viewport argument value "garbage" for key "width" is invalid, and has been ignored.
ALERT: viewport size 64x70.4 scale 5 with limits [5, 5] and userScalable true
Modified: trunk/LayoutTests/fast/viewport/viewport-53-expected.txt (136501 => 136502)
--- trunk/LayoutTests/fast/viewport/viewport-53-expected.txt 2012-12-04 11:59:34 UTC (rev 136501)
+++ trunk/LayoutTests/fast/viewport/viewport-53-expected.txt 2012-12-04 12:34:41 UTC (rev 136502)
@@ -1,3 +1,3 @@
-CONSOLE MESSAGE: line 3: Viewport argument value "y20" for key "height" not recognized. Content ignored.
+CONSOLE MESSAGE: line 3: Viewport argument value "y20" for key "height" is invalid, and has been ignored.
ALERT: viewport size 980x70.4 scale 5 with limits [5, 5] and userScalable true
Modified: trunk/LayoutTests/fast/viewport/viewport-54-expected.txt (136501 => 136502)
--- trunk/LayoutTests/fast/viewport/viewport-54-expected.txt 2012-12-04 11:59:34 UTC (rev 136501)
+++ trunk/LayoutTests/fast/viewport/viewport-54-expected.txt 2012-12-04 12:34:41 UTC (rev 136502)
@@ -1,3 +1,3 @@
-CONSOLE MESSAGE: line 3: Viewport argument value "device-width;" for key "width" not recognized. Content ignored. Note that ';' is not a separator in viewport values. The list should be comma-separated.
+CONSOLE MESSAGE: line 3: Viewport argument value "device-width;" for key "width" is invalid, and has been ignored. Note that ';' is not a separator in viewport values. The list should be comma-separated.
ALERT: viewport size 64x70.4 scale 5 with limits [5, 5] and userScalable true
Modified: trunk/LayoutTests/fast/viewport/viewport-55-expected.txt (136501 => 136502)
--- trunk/LayoutTests/fast/viewport/viewport-55-expected.txt 2012-12-04 11:59:34 UTC (rev 136501)
+++ trunk/LayoutTests/fast/viewport/viewport-55-expected.txt 2012-12-04 12:34:41 UTC (rev 136502)
@@ -1,4 +1,4 @@
-CONSOLE MESSAGE: line 3: Viewport argument value "yes" for key "width" not recognized. Content ignored.
-CONSOLE MESSAGE: line 3: Viewport argument value "no" for key "height" not recognized. Content ignored.
+CONSOLE MESSAGE: line 3: Viewport argument value "yes" for key "width" is invalid, and has been ignored.
+CONSOLE MESSAGE: line 3: Viewport argument value "no" for key "height" is invalid, and has been ignored.
ALERT: viewport size 64x70.4 scale 5 with limits [5, 5] and userScalable true
Modified: trunk/LayoutTests/fast/viewport/viewport-77-expected.txt (136501 => 136502)
--- trunk/LayoutTests/fast/viewport/viewport-77-expected.txt 2012-12-04 11:59:34 UTC (rev 136501)
+++ trunk/LayoutTests/fast/viewport/viewport-77-expected.txt 2012-12-04 12:34:41 UTC (rev 136502)
@@ -1,4 +1,4 @@
CONSOLE MESSAGE: line 3: Viewport argument key ";" not recognized and ignored.
-CONSOLE MESSAGE: line 3: Viewport argument value "yes;" for key "initial-scale" not recognized. Content ignored. Note that ';' is not a separator in viewport values. The list should be comma-separated.
+CONSOLE MESSAGE: line 3: Viewport argument value "yes;" for key "initial-scale" is invalid, and has been ignored. Note that ';' is not a separator in viewport values. The list should be comma-separated.
ALERT: viewport size 1280x1408 scale 0.25 with limits [0.25, 5] and userScalable true
Modified: trunk/LayoutTests/fast/viewport/viewport-83-expected.txt (136501 => 136502)
--- trunk/LayoutTests/fast/viewport/viewport-83-expected.txt 2012-12-04 11:59:34 UTC (rev 136501)
+++ trunk/LayoutTests/fast/viewport/viewport-83-expected.txt 2012-12-04 12:34:41 UTC (rev 136502)
@@ -1,4 +1,4 @@
-CONSOLE MESSAGE: line 3: Viewport argument value "height" for key "width" not recognized. Content ignored.
+CONSOLE MESSAGE: line 3: Viewport argument value "height" for key "width" is invalid, and has been ignored.
CONSOLE MESSAGE: line 3: Viewport argument key "830" not recognized and ignored.
ALERT: viewport size 64x70.4 scale 5 with limits [5, 5] and userScalable true
Modified: trunk/LayoutTests/fast/viewport/viewport-84-expected.txt (136501 => 136502)
--- trunk/LayoutTests/fast/viewport/viewport-84-expected.txt 2012-12-04 11:59:34 UTC (rev 136501)
+++ trunk/LayoutTests/fast/viewport/viewport-84-expected.txt 2012-12-04 12:34:41 UTC (rev 136502)
@@ -1,3 +1,3 @@
-CONSOLE MESSAGE: line 3: Viewport argument value "" for key "width" not recognized. Content ignored.
+CONSOLE MESSAGE: line 3: Viewport argument value "" for key "width" is invalid, and has been ignored.
ALERT: viewport size 64x480 scale 5 with limits [5, 5] and userScalable true
Modified: trunk/LayoutTests/fast/viewport/viewport-87-expected.txt (136501 => 136502)
--- trunk/LayoutTests/fast/viewport/viewport-87-expected.txt 2012-12-04 11:59:34 UTC (rev 136501)
+++ trunk/LayoutTests/fast/viewport/viewport-87-expected.txt 2012-12-04 12:34:41 UTC (rev 136502)
@@ -1,3 +1,3 @@
-CONSOLE MESSAGE: line 3: Viewport argument value "" for key "width" not recognized. Content ignored.
+CONSOLE MESSAGE: line 3: Viewport argument value "" for key "width" is invalid, and has been ignored.
ALERT: viewport size 64x70.4 scale 5 with limits [5, 5] and userScalable true
Modified: trunk/LayoutTests/fast/viewport/viewport-warnings-3-expected.txt (136501 => 136502)
--- trunk/LayoutTests/fast/viewport/viewport-warnings-3-expected.txt 2012-12-04 11:59:34 UTC (rev 136501)
+++ trunk/LayoutTests/fast/viewport/viewport-warnings-3-expected.txt 2012-12-04 12:34:41 UTC (rev 136502)
@@ -1,3 +1,3 @@
-CONSOLE MESSAGE: line 3: Viewport argument value "unrecognized-width" for key "width" not recognized. Content ignored.
+CONSOLE MESSAGE: line 3: Viewport argument value "unrecognized-width" for key "width" is invalid, and has been ignored.
ALERT: viewport size 64x70.4 scale 5 with limits [5, 5] and userScalable true
Modified: trunk/LayoutTests/fast/viewport/viewport-warnings-5-expected.txt (136501 => 136502)
--- trunk/LayoutTests/fast/viewport/viewport-warnings-5-expected.txt 2012-12-04 11:59:34 UTC (rev 136501)
+++ trunk/LayoutTests/fast/viewport/viewport-warnings-5-expected.txt 2012-12-04 12:34:41 UTC (rev 136502)
@@ -1,4 +1,4 @@
-CONSOLE MESSAGE: line 3: Viewport argument value "device-width;" for key "width" not recognized. Content ignored. Note that ';' is not a separator in viewport values. The list should be comma-separated.
+CONSOLE MESSAGE: line 3: Viewport argument value "device-width;" for key "width" is invalid, and has been ignored. Note that ';' is not a separator in viewport values. The list should be comma-separated.
CONSOLE MESSAGE: line 3: Viewport argument value "1.0;" for key "initial-scale" was truncated to its numeric prefix. Note that ';' is not a separator in viewport values. The list should be comma-separated.
CONSOLE MESSAGE: line 3: Viewport argument value "1.0;" for key "maximum-scale" was truncated to its numeric prefix. Note that ';' is not a separator in viewport values. The list should be comma-separated.
CONSOLE MESSAGE: line 3: Viewport argument value "0;" for key "user-scalable" was truncated to its numeric prefix. Note that ';' is not a separator in viewport values. The list should be comma-separated.
Modified: trunk/LayoutTests/fast/viewport/viewport-warnings-6-expected.txt (136501 => 136502)
--- trunk/LayoutTests/fast/viewport/viewport-warnings-6-expected.txt 2012-12-04 11:59:34 UTC (rev 136501)
+++ trunk/LayoutTests/fast/viewport/viewport-warnings-6-expected.txt 2012-12-04 12:34:41 UTC (rev 136502)
@@ -1,3 +1,3 @@
-CONSOLE MESSAGE: line 3: Viewport argument value "" for key "width" not recognized. Content ignored.
+CONSOLE MESSAGE: line 3: Viewport argument value "" for key "width" is invalid, and has been ignored.
ALERT: viewport size 64x70.4 scale 5 with limits [5, 5] and userScalable true
Modified: trunk/Source/WebCore/ChangeLog (136501 => 136502)
--- trunk/Source/WebCore/ChangeLog 2012-12-04 11:59:34 UTC (rev 136501)
+++ trunk/Source/WebCore/ChangeLog 2012-12-04 12:34:41 UTC (rev 136502)
@@ -1,3 +1,25 @@
+2012-12-04 Markus Heintz <[email protected]>
+
+ Web Inspector: Viewport console warnings cleanup.
+ https://bugs.webkit.org/show_bug.cgi?id=102890
+
+ Reviewed by Jochen Eisinger.
+
+ Improve the console message text for a viewport console warning and
+ change the log level to warning.
+
+ No new tests added, as this change is covered by updates to existing
+ test expectations.
+
+ * dom/ViewportArguments.cpp:
+ (WebCore::viewportErrorMessageTemplate):
+ Improve the console message text for invalid values.
+ (WebCore::viewportErrorMessageLevel):
+ Upgraded the TruncatedViewportArgumentValueError and the
+ TargetDensityDpiUnsupported messages's MessageLeval to warning.
+ (WebCore::reportViewportWarning):
+ Adding only a comment for a FIXIT reminder.
+
2012-12-04 Carlos Garcia Campos <[email protected]>
[GTK] Use a private struct and placement new syntax in GObject DOM bindings
Modified: trunk/Source/WebCore/dom/ViewportArguments.cpp (136501 => 136502)
--- trunk/Source/WebCore/dom/ViewportArguments.cpp 2012-12-04 11:59:34 UTC (rev 136501)
+++ trunk/Source/WebCore/dom/ViewportArguments.cpp 2012-12-04 12:34:41 UTC (rev 136502)
@@ -409,7 +409,7 @@
{
static const char* const errors[] = {
"Viewport argument key \"%replacement1\" not recognized and ignored.",
- "Viewport argument value \"%replacement1\" for key \"%replacement2\" not recognized. Content 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.",
@@ -423,7 +423,7 @@
switch (errorCode) {
case TruncatedViewportArgumentValueError:
case TargetDensityDpiUnsupported:
- return TipMessageLevel;
+ return WarningMessageLevel;
case UnrecognizedViewportArgumentKeyError:
case UnrecognizedViewportArgumentValueError:
case MaximumScaleTooLargeError:
@@ -460,7 +460,7 @@
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->domWindow()->console()->addMessage(HTMLMessageSource, LogMessageType, viewportErrorMessageLevel(errorCode), message, document->url().string(), parserLineNumber(document));
}
