Changeset 80077 in webkit
- Timestamp:
- Mar 1, 2011 6:04:19 PM (13 years ago)
- Location:
- trunk
- Files:
-
- 7 deleted
- 14 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r80076 r80077 1 2011-03-01 Joseph Pecoraro <joepeck@webkit.org> 2 3 Unreviewed. Roll out r80068 and r80073 due to breaking WebKit2 Qt port. 4 5 * fast/viewport/viewport-warnings-1.html: Removed. 6 * fast/viewport/viewport-warnings-2.html: Removed. 7 * fast/viewport/viewport-warnings-3.html: Removed. 8 * fast/viewport/viewport-warnings-4.html: Removed. 9 * fast/viewport/viewport-warnings-5.html: Removed. 10 * fast/viewport/viewport-warnings-6.html: Removed. 11 * fast/viewport/viewport-warnings-7.html: Removed. 12 1 13 2011-03-01 Jeremy Orlow <jorlow@chromium.org> 2 14 -
trunk/Source/WebCore/ChangeLog
r80076 r80077 1 2011-03-01 Joseph Pecoraro <joepeck@webkit.org> 2 3 Unreviewed. Roll out r80068 and r80073 due to breaking WebKit2 Qt port. 4 5 * dom/ViewportArguments.cpp: 6 (WebCore::computeViewportAttributes): 7 (WebCore::numericPrefix): 8 (WebCore::findSizeValue): 9 (WebCore::setViewportFeature): 10 (WebCore::viewportErrorMessageTemplate): 11 (WebCore::viewportErrorMessageLevel): 12 * dom/ViewportArguments.h: 13 1 14 2011-03-01 Jeremy Orlow <jorlow@chromium.org> 2 15 -
trunk/Source/WebCore/dom/ViewportArguments.cpp
r80068 r80077 42 42 namespace WebCore { 43 43 44 ViewportAttributes computeViewportAttributes( Document* document,ViewportArguments args, int desktopWidth, int deviceWidth, int deviceHeight, int deviceDPI, IntSize visibleViewport)44 ViewportAttributes computeViewportAttributes(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());57 52 58 53 switch (int(args.targetDensityDpi)) { … … 196 191 if (!didReadNumber) { 197 192 ASSERT(!value); 198 reportViewportWarning(document, UnrecognizedViewportArgument ValueError, valueString, keyString);193 reportViewportWarning(document, UnrecognizedViewportArgumentError, valueString, keyString); 199 194 return value; 200 195 } … … 226 221 if (value < 0) 227 222 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 else336 reportViewportWarning(document, UnrecognizedViewportArgumentKeyError, keyString, String());337 335 } 338 336 … … 342 340 "Viewport width or height set to physical device width, try using \"device-width\" constant instead for future compatibility.", 343 341 "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.",345 342 "Viewport argument value \"%replacement1\" for key \"%replacement2\" not recognized. Content ignored.", 346 343 "Viewport argument value \"%replacement1\" for key \"%replacement2\" was truncated to its numeric prefix.", … … 360 357 case TargetDensityDpiTooSmallOrLargeError: 361 358 return TipMessageLevel; 362 case UnrecognizedViewportArgumentKeyError: 363 case UnrecognizedViewportArgumentValueError: 359 case UnrecognizedViewportArgumentError: 364 360 case MaximumScaleTooLargeError: 365 361 return ErrorMessageLevel; -
trunk/Source/WebCore/dom/ViewportArguments.h
r80068 r80077 38 38 DeviceWidthShouldBeUsedWarning, 39 39 DeviceHeightShouldBeUsedWarning, 40 UnrecognizedViewportArgumentKeyError, 41 UnrecognizedViewportArgumentValueError, 40 UnrecognizedViewportArgumentError, 42 41 TruncatedViewportArgumentValueError, 43 42 MaximumScaleTooLargeError, … … 102 101 }; 103 102 104 ViewportAttributes computeViewportAttributes( Document*,ViewportArguments args, int desktopWidth, int deviceWidth, int deviceHeight, int deviceDPI, IntSize visibleViewport);103 ViewportAttributes computeViewportAttributes(ViewportArguments args, int desktopWidth, int deviceWidth, int deviceHeight, int deviceDPI, IntSize visibleViewport); 105 104 106 105 void setViewportFeature(const String& keyString, const String& valueString, Document*, void* data); -
trunk/Source/WebKit/efl/ChangeLog
r80068 r80077 1 2011-03-01 Joseph Pecoraro <joepeck@webkit.org> 2 3 Unreviewed. Roll out r80068 and r80073 due to breaking WebKit2 Qt port. 4 5 * ewk/ewk_view.cpp: 6 (_ewk_view_viewport_attributes_compute): 7 1 8 2011-03-01 Joseph Pecoraro <joepeck@webkit.org> 2 9 -
trunk/Source/WebKit/efl/ewk/ewk_view.cpp
r80068 r80077 1024 1024 int device_height = (int) priv->page->chrome()->client()->windowRect().height(); 1025 1025 1026 WebCore::Document* document = priv->page->mainFrame()->document();1027 1028 1026 WebCore::IntSize available_size = WebCore::IntSize(available_width, available_height); 1029 WebCore::ViewportAttributes attributes = WebCore::computeViewportAttributes( document,priv->viewport_arguments, desktop_width, device_width, device_height, device_dpi, available_size);1027 WebCore::ViewportAttributes attributes = WebCore::computeViewportAttributes(priv->viewport_arguments, desktop_width, device_width, device_height, device_dpi, available_size); 1030 1028 1031 1029 return attributes; -
trunk/Source/WebKit/gtk/ChangeLog
r80068 r80077 1 2011-03-01 Joseph Pecoraro <joepeck@webkit.org> 2 3 Unreviewed. Roll out r80068 and r80073 due to breaking WebKit2 Qt port. 4 5 * WebCoreSupport/DumpRenderTreeSupportGtk.cpp: 6 (DumpRenderTreeSupportGtk::dumpConfigurationForViewport): 7 * webkit/webkitviewportattributes.cpp: 8 (webkitViewportAttributesRecompute): 9 1 10 2011-03-01 Joseph Pecoraro <joepeck@webkit.org> 2 11 -
trunk/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp
r80068 r80077 627 627 g_return_if_fail(WEBKIT_IS_WEB_VIEW(webView)); 628 628 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)); 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)); 632 631 633 632 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
r80068 r80077 533 533 g_signal_emit_by_name(webView, "viewport-attributes-recompute-requested", viewportAttributes); 534 534 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)); 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)); 539 538 540 539 priv->width = attributes.layoutSize.width(); -
trunk/Source/WebKit/qt/Api/qwebpage.cpp
r80068 r80077 2524 2524 } 2525 2525 2526 WebCore::Document* document = d->page->mainFrame()->document(); 2527 WebCore::ViewportAttributes conf = WebCore::computeViewportAttributes(document, d->viewportArguments(), desktopWidth, deviceWidth, deviceHeight, qt_defaultDpi(), availableSize); 2526 WebCore::ViewportAttributes conf = WebCore::computeViewportAttributes(d->viewportArguments(), desktopWidth, deviceWidth, deviceHeight, qt_defaultDpi(), availableSize); 2528 2527 2529 2528 result.m_isValid = true; -
trunk/Source/WebKit/qt/ChangeLog
r80068 r80077 1 2011-03-01 Joseph Pecoraro <joepeck@webkit.org> 2 3 Unreviewed. Roll out r80068 and r80073 due to breaking WebKit2 Qt port. 4 5 * Api/qwebpage.cpp: 6 (QWebPage::viewportAttributesForSize): 7 * WebCoreSupport/DumpRenderTreeSupportQt.cpp: 8 (DumpRenderTreeSupportQt::viewportAsText): 9 1 10 2011-03-01 Joseph Pecoraro <joepeck@webkit.org> 2 11 -
trunk/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp
r80068 r80077 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();726 725 WebCore::ViewportArguments args = page->d->viewportArguments(); 727 726 728 WebCore::ViewportAttributes conf = WebCore::computeViewportAttributes( document,args,727 WebCore::ViewportAttributes conf = WebCore::computeViewportAttributes(args, 729 728 /* desktop-width */ 980, 730 729 /* device-width */ deviceSize.width(), -
trunk/Source/WebKit2/ChangeLog
r80073 r80077 1 2011-03-01 Joseph Pecoraro <joepeck@webkit.org> 2 3 Unreviewed. Roll out r80068 and r80073 due to breaking WebKit2 Qt port. 4 5 * UIProcess/API/qt/qwkpage.cpp: 6 (QWKPage::viewportAttributesForSize): 7 1 8 2011-03-01 Joseph Pecoraro <joepeck@webkit.org> 2 9 -
trunk/Source/WebKit2/UIProcess/API/qt/qwkpage.cpp
r80073 r80077 558 558 int deviceHeight = 864; 559 559 560 WebCore::Document* document = d->page->mainFrame()->document(); 561 WebCore::ViewportAttributes conf = WebCore::computeViewportAttributes(document, d->viewportArguments, desktopWidth, deviceWidth, deviceHeight, deviceDPI, availableSize); 560 WebCore::ViewportAttributes conf = WebCore::computeViewportAttributes(d->viewportArguments, desktopWidth, deviceWidth, deviceHeight, deviceDPI, availableSize); 562 561 563 562 result.m_isValid = true;
Note: See TracChangeset
for help on using the changeset viewer.