Changeset 80068 in webkit
- Timestamp:
- Mar 1, 2011 4:59:59 PM (13 years ago)
- Location:
- trunk
- Files:
-
- 7 added
- 12 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r80066 r80068 1 2011-03-01 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 * fast/viewport/viewport-warnings-7.html: Added. 17 1 18 2011-03-01 Tony Gentilcore <tonyg@chromium.org> 2 19 -
trunk/Source/WebCore/ChangeLog
r80061 r80068 1 2011-03-01 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 9 parsing. Clarify the difference between incorrect 10 keys, values, and when to use the device-width or 11 device-height constants. 12 13 * dom/ViewportArguments.cpp: 14 (WebCore::computeViewportAttributes): suggest using keywords if fixed input matches device width or height. 15 (WebCore::numericPrefix): 16 (WebCore::findSizeValue): remove incorrect warnings about fixed numbers because we don't know the device width or height. 17 (WebCore::setViewportFeature): report a warning for an unrecognized key. 18 (WebCore::viewportErrorMessageTemplate): added template for unrecognized key. 19 (WebCore::viewportErrorMessageLevel): 20 * dom/ViewportArguments.h: 21 1 22 2011-03-01 Ryosuke Niwa <rniwa@webkit.org> 2 23 -
trunk/Source/WebCore/dom/ViewportArguments.cpp
r80012 r80068 42 42 namespace WebCore { 43 43 44 ViewportAttributes computeViewportAttributes( ViewportArguments args, int desktopWidth, int deviceWidth, int deviceHeight, int deviceDPI, IntSize visibleViewport)44 ViewportAttributes computeViewportAttributes(Document* document, ViewportArguments args, int desktopWidth, int deviceWidth, int deviceHeight, int deviceDPI, IntSize visibleViewport) 45 45 { 46 46 ViewportAttributes result; … … 50 50 51 51 ASSERT(availableWidth > 0 && availableHeight > 0); 52 53 if (args.width == deviceWidth || args.height == deviceWidth) 54 reportViewportWarning(document, DeviceWidthShouldBeUsedWarning, String(), String()); 55 if (args.width == deviceHeight || args.height == deviceHeight) 56 reportViewportWarning(document, DeviceHeightShouldBeUsedWarning, String(), String()); 52 57 53 58 switch (int(args.targetDensityDpi)) { … … 191 196 if (!didReadNumber) { 192 197 ASSERT(!value); 193 reportViewportWarning(document, UnrecognizedViewportArgument Error, valueString, keyString);198 reportViewportWarning(document, UnrecognizedViewportArgumentValueError, valueString, keyString); 194 199 return value; 195 200 } … … 221 226 if (value < 0) 222 227 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());228 228 229 229 return value; … … 333 333 else if (keyString == "target-densitydpi") 334 334 arguments->targetDensityDpi = findTargetDensityDPIValue(keyString, valueString, document); 335 else 336 reportViewportWarning(document, UnrecognizedViewportArgumentKeyError, keyString, String()); 335 337 } 336 338 … … 340 342 "Viewport width or height set to physical device width, try using \"device-width\" constant instead for future compatibility.", 341 343 "Viewport height or height set to physical device height, try using \"device-height\" constant instead for future compatibility.", 344 "Viewport argument key \"%replacement1\" not recognized and ignored.", 342 345 "Viewport argument value \"%replacement1\" for key \"%replacement2\" not recognized. Content ignored.", 343 346 "Viewport argument value \"%replacement1\" for key \"%replacement2\" was truncated to its numeric prefix.", … … 357 360 case TargetDensityDpiTooSmallOrLargeError: 358 361 return TipMessageLevel; 359 case UnrecognizedViewportArgumentError: 362 case UnrecognizedViewportArgumentKeyError: 363 case UnrecognizedViewportArgumentValueError: 360 364 case MaximumScaleTooLargeError: 361 365 return ErrorMessageLevel; -
trunk/Source/WebCore/dom/ViewportArguments.h
r80012 r80068 38 38 DeviceWidthShouldBeUsedWarning, 39 39 DeviceHeightShouldBeUsedWarning, 40 UnrecognizedViewportArgumentError, 40 UnrecognizedViewportArgumentKeyError, 41 UnrecognizedViewportArgumentValueError, 41 42 TruncatedViewportArgumentValueError, 42 43 MaximumScaleTooLargeError, … … 101 102 }; 102 103 103 ViewportAttributes computeViewportAttributes( ViewportArguments args, int desktopWidth, int deviceWidth, int deviceHeight, int deviceDPI, IntSize visibleViewport);104 ViewportAttributes computeViewportAttributes(Document*, ViewportArguments args, int desktopWidth, int deviceWidth, int deviceHeight, int deviceDPI, IntSize visibleViewport); 104 105 105 106 void setViewportFeature(const String& keyString, const String& valueString, Document*, void* data); -
trunk/Source/WebKit/efl/ChangeLog
r79953 r80068 1 2011-03-01 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 * ewk/ewk_view.cpp: 9 (_ewk_view_viewport_attributes_compute): pass a Document into computeViewportAttributes for warnings to be reported to. 10 1 11 2011-02-28 Chang Shu <cshu@webkit.org> 2 12 -
trunk/Source/WebKit/efl/ewk/ewk_view.cpp
r79838 r80068 1024 1024 int device_height = (int) priv->page->chrome()->client()->windowRect().height(); 1025 1025 1026 WebCore::Document* document = priv->page->mainFrame()->document(); 1027 1026 1028 WebCore::IntSize available_size = WebCore::IntSize(available_width, available_height); 1027 WebCore::ViewportAttributes attributes = WebCore::computeViewportAttributes( priv->viewport_arguments, desktop_width, device_width, device_height, device_dpi, available_size);1029 WebCore::ViewportAttributes attributes = WebCore::computeViewportAttributes(document, priv->viewport_arguments, desktop_width, device_width, device_height, device_dpi, available_size); 1028 1030 1029 1031 return attributes; -
trunk/Source/WebKit/gtk/ChangeLog
r80029 r80068 1 2011-03-01 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 * WebCoreSupport/DumpRenderTreeSupportGtk.cpp: 9 (DumpRenderTreeSupportGtk::dumpConfigurationForViewport): pass a Document into computeViewportAttributes for warnings to be reported to. 10 * webkit/webkitviewportattributes.cpp: 11 (webkitViewportAttributesRecompute): pass a Document into computeViewportAttributes for warnings to be reported to. 12 1 13 2011-03-01 Kamil Blank <k.blank@samsung.com> 2 14 -
trunk/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp
r79793 r80068 627 627 g_return_if_fail(WEBKIT_IS_WEB_VIEW(webView)); 628 628 629 ViewportArguments arguments = webView->priv->corePage->mainFrame()->document()->viewportArguments(); 630 ViewportAttributes attrs = computeViewportAttributes(arguments, /* default layout width for non-mobile pages */ 980, deviceWidth, deviceHeight, deviceDPI, IntSize(availableWidth, availableHeight)); 629 Document* document = webView->priv->corePage->mainFrame()->document(); 630 ViewportArguments arguments = document->viewportArguments(); 631 ViewportAttributes attrs = computeViewportAttributes(document, arguments, /* default layout width for non-mobile pages */ 980, deviceWidth, deviceHeight, deviceDPI, IntSize(availableWidth, availableHeight)); 631 632 632 633 fprintf(stdout, "viewport size %dx%d scale %f with limits [%f, %f]\n", attrs.layoutSize.width(), attrs.layoutSize.height(), attrs.initialScale, attrs.minimumScale, attrs.maximumScale); -
trunk/Source/WebKit/gtk/webkit/webkitviewportattributes.cpp
r74933 r80068 533 533 g_signal_emit_by_name(webView, "viewport-attributes-recompute-requested", viewportAttributes); 534 534 535 ViewportArguments arguments = webView->priv->corePage->mainFrame()->document()->viewportArguments(); 536 537 ViewportAttributes attributes = computeViewportAttributes(arguments, priv->desktopWidth, priv->deviceWidth, priv->deviceHeight, priv->deviceDPI, IntSize(priv->availableWidth, priv->availableHeight)); 535 Document* document = webView->priv->corePage->mainFrame()->document(); 536 ViewportArguments arguments = document->viewportArguments(); 537 538 ViewportAttributes attributes = computeViewportAttributes(document, arguments, priv->desktopWidth, priv->deviceWidth, priv->deviceHeight, priv->deviceDPI, IntSize(priv->availableWidth, priv->availableHeight)); 538 539 539 540 priv->width = attributes.layoutSize.width(); -
trunk/Source/WebKit/qt/Api/qwebpage.cpp
r79953 r80068 2524 2524 } 2525 2525 2526 WebCore::ViewportAttributes conf = WebCore::computeViewportAttributes(d->viewportArguments(), desktopWidth, deviceWidth, deviceHeight, qt_defaultDpi(), availableSize); 2526 WebCore::Document* document = d->page->mainFrame()->document(); 2527 WebCore::ViewportAttributes conf = WebCore::computeViewportAttributes(document, d->viewportArguments(), desktopWidth, deviceWidth, deviceHeight, qt_defaultDpi(), availableSize); 2527 2528 2528 2529 result.m_isValid = true; -
trunk/Source/WebKit/qt/ChangeLog
r79999 r80068 1 2011-03-01 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 * Api/qwebpage.cpp: 9 (QWebPage::viewportAttributesForSize): pass a Document into computeViewportAttributes for warnings to be reported to. 10 * WebCoreSupport/DumpRenderTreeSupportQt.cpp: 11 (DumpRenderTreeSupportQt::viewportAsText): pass a Document into computeViewportAttributes for warnings to be reported to. 12 1 13 2011-03-01 Andras Becsi <abecsi@webkit.org> 2 14 -
trunk/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp
r79793 r80068 723 723 QString DumpRenderTreeSupportQt::viewportAsText(QWebPage* page, int deviceDPI, const QSize& deviceSize, const QSize& availableSize) 724 724 { 725 WebCore::Document* document = page->d->page->mainFrame()->document(); 725 726 WebCore::ViewportArguments args = page->d->viewportArguments(); 726 727 727 WebCore::ViewportAttributes conf = WebCore::computeViewportAttributes( args,728 WebCore::ViewportAttributes conf = WebCore::computeViewportAttributes(document, args, 728 729 /* desktop-width */ 980, 729 730 /* device-width */ deviceSize.width(),
Note: See TracChangeset
for help on using the changeset viewer.