Changeset 80077 in webkit


Ignore:
Timestamp:
Mar 1, 2011 6:04:19 PM (13 years ago)
Author:
Joseph Pecoraro
Message:

2011-03-01 Joseph Pecoraro <Joseph Pecoraro>

Unreviewed. Roll out r80068 and r80073 due to breaking WebKit2 Qt port.

Location:
trunk
Files:
7 deleted
14 edited

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r80076 r80077  
     12011-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
    1132011-03-01  Jeremy Orlow  <jorlow@chromium.org>
    214
  • trunk/Source/WebCore/ChangeLog

    r80076 r80077  
     12011-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
    1142011-03-01  Jeremy Orlow  <jorlow@chromium.org>
    215
  • trunk/Source/WebCore/dom/ViewportArguments.cpp

    r80068 r80077  
    4242namespace WebCore {
    4343
    44 ViewportAttributes computeViewportAttributes(Document* document, ViewportArguments args, int desktopWidth, int deviceWidth, int deviceHeight, int deviceDPI, IntSize visibleViewport)
     44ViewportAttributes computeViewportAttributes(ViewportArguments args, int desktopWidth, int deviceWidth, int deviceHeight, int deviceDPI, IntSize visibleViewport)
    4545{
    4646    ViewportAttributes result;
     
    5050
    5151    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());
    5752
    5853    switch (int(args.targetDensityDpi)) {
     
    196191        if (!didReadNumber) {
    197192            ASSERT(!value);
    198             reportViewportWarning(document, UnrecognizedViewportArgumentValueError, valueString, keyString);
     193            reportViewportWarning(document, UnrecognizedViewportArgumentError, valueString, keyString);
    199194            return value;
    200195        }
     
    226221    if (value < 0)
    227222        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());
    228228
    229229    return value;
     
    333333    else if (keyString == "target-densitydpi")
    334334        arguments->targetDensityDpi = findTargetDensityDPIValue(keyString, valueString, document);
    335     else
    336         reportViewportWarning(document, UnrecognizedViewportArgumentKeyError, keyString, String());
    337335}
    338336
     
    342340        "Viewport width or height set to physical device width, try using \"device-width\" constant instead for future compatibility.",
    343341        "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.",
    345342        "Viewport argument value \"%replacement1\" for key \"%replacement2\" not recognized. Content ignored.",
    346343        "Viewport argument value \"%replacement1\" for key \"%replacement2\" was truncated to its numeric prefix.",
     
    360357    case TargetDensityDpiTooSmallOrLargeError:
    361358        return TipMessageLevel;
    362     case UnrecognizedViewportArgumentKeyError:
    363     case UnrecognizedViewportArgumentValueError:
     359    case UnrecognizedViewportArgumentError:
    364360    case MaximumScaleTooLargeError:
    365361        return ErrorMessageLevel;
  • trunk/Source/WebCore/dom/ViewportArguments.h

    r80068 r80077  
    3838    DeviceWidthShouldBeUsedWarning,
    3939    DeviceHeightShouldBeUsedWarning,
    40     UnrecognizedViewportArgumentKeyError,
    41     UnrecognizedViewportArgumentValueError,
     40    UnrecognizedViewportArgumentError,
    4241    TruncatedViewportArgumentValueError,
    4342    MaximumScaleTooLargeError,
     
    102101};
    103102
    104 ViewportAttributes computeViewportAttributes(Document*, ViewportArguments args, int desktopWidth, int deviceWidth, int deviceHeight, int deviceDPI, IntSize visibleViewport);
     103ViewportAttributes computeViewportAttributes(ViewportArguments args, int desktopWidth, int deviceWidth, int deviceHeight, int deviceDPI, IntSize visibleViewport);
    105104
    106105void setViewportFeature(const String& keyString, const String& valueString, Document*, void* data);
  • trunk/Source/WebKit/efl/ChangeLog

    r80068 r80077  
     12011-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
    182011-03-01  Joseph Pecoraro  <joepeck@webkit.org>
    29
  • trunk/Source/WebKit/efl/ewk/ewk_view.cpp

    r80068 r80077  
    10241024    int device_height = (int) priv->page->chrome()->client()->windowRect().height();
    10251025
    1026     WebCore::Document* document = priv->page->mainFrame()->document();
    1027 
    10281026    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);
    10301028
    10311029    return attributes;
  • trunk/Source/WebKit/gtk/ChangeLog

    r80068 r80077  
     12011-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
    1102011-03-01  Joseph Pecoraro  <joepeck@webkit.org>
    211
  • trunk/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp

    r80068 r80077  
    627627    g_return_if_fail(WEBKIT_IS_WEB_VIEW(webView));
    628628
    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));
    632631
    633632    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  
    533533    g_signal_emit_by_name(webView, "viewport-attributes-recompute-requested", viewportAttributes);
    534534
    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));
    539538
    540539    priv->width = attributes.layoutSize.width();
  • trunk/Source/WebKit/qt/Api/qwebpage.cpp

    r80068 r80077  
    25242524    }
    25252525
    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);
    25282527
    25292528    result.m_isValid = true;
  • trunk/Source/WebKit/qt/ChangeLog

    r80068 r80077  
     12011-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
    1102011-03-01  Joseph Pecoraro  <joepeck@webkit.org>
    211
  • trunk/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp

    r80068 r80077  
    723723QString DumpRenderTreeSupportQt::viewportAsText(QWebPage* page, int deviceDPI, const QSize& deviceSize, const QSize& availableSize)
    724724{
    725     WebCore::Document* document = page->d->page->mainFrame()->document();
    726725    WebCore::ViewportArguments args = page->d->viewportArguments();
    727726
    728     WebCore::ViewportAttributes conf = WebCore::computeViewportAttributes(document, args,
     727    WebCore::ViewportAttributes conf = WebCore::computeViewportAttributes(args,
    729728        /* desktop-width */ 980,
    730729        /* device-width  */ deviceSize.width(),
  • trunk/Source/WebKit2/ChangeLog

    r80073 r80077  
     12011-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
    182011-03-01  Joseph Pecoraro  <joepeck@webkit.org>
    29
  • trunk/Source/WebKit2/UIProcess/API/qt/qwkpage.cpp

    r80073 r80077  
    558558    int deviceHeight = 864;
    559559
    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);
    562561
    563562    result.m_isValid = true;
Note: See TracChangeset for help on using the changeset viewer.