ChangeLog

2013-01-30  Jacky Jiang  <zhajiang@rim.com>

        [BlackBerry] Zooming in during page load of non-scalable webpage results in fixed magnification

        https://bugs.webkit.org/show_bug.cgi?id=108252

        Reviewed by NOBODY (OOPS!).

        Internally reviewed by Jakob Petsovits.

        PR: 284828

        We got float layoutSize(342.284122, 521.448467) and

        m_maximumScale(2.243750) after computing viewport meta based on the

        device pixel ratio and laid out the contents at IntSize(342, 521).

        Therefore, zoomToFitScale(2.245681) would be a bit larger than

        m_maximumScale based on that contents size and resulted in

        maximumScale()!=minimumScale(), which made the non-scalable page

        scalable.

        The patch basically ignores the rounding error and returns

        zoomToFitScale instead.

        * Api/WebPage.cpp:

        (BlackBerry::WebKit::WebPagePrivate::maximumScale):

2013-01-30  Ed Baker  <edbaker@rim.com>

        [BlackBerry] Screenshot is clipped when content is smaller than the desintation size

Source/WebKit/blackberry/Api/WebPage.cpp

@@void WebPage::setMaximumScale(double maximumScale)

double WebPagePrivate::maximumScale() const

{

    if (m_maximumScale >= zoomToFitScale() && m_maximumScale >= m_minimumScale && respectViewport())

        return m_maximumScale;

    return hasVirtualViewport() ? std::max<double>(zoomToFitScale(), 4.0) : 4.0;

    double zoomToFitScale = this->zoomToFitScale();

    if (m_maximumScale >= m_minimumScale && respectViewport()) {

        if (m_maximumScale >= zoomToFitScale)

            return m_maximumScale;

        // We can get float layoutSize(342.284122, 521.448467) and m_maximumScale(2.243750)

        // after computing viewport meta and lay out the contents at IntSize(342, 521).

        // Therefore, zoomToFitScale(2.245681) could be a bit larger than m_maximumScale

        // based on that contents size and results in maximumScale()!=minimumScale(), which

        // can make non-scalable page scalable. So ignore the rounding error here and pick up

        // zoomToFitScale instead.

        if (zoomToFitScale - m_maximumScale < 0.01)

            return zoomToFitScale;

    }

    return hasVirtualViewport() ? std::max<double>(zoomToFitScale, 4.0) : 4.0;

}

double WebPage::maximumScale() const