Attachment #155678 for bug #92698

View Details Raw Unified Return to Bug 92698

| Differences between



2012-07-30  Yusuf Ozuysal  <yusufo@google.com>

        [chromium]Upstream WebViewImpl:StartPageScaleAnimation changes for Chrome for Android
        https://bugs.webkit.org/show_bug.cgi?id=92698

        Reviewed by NOBODY (OOPS!).

        Enforce the maximum and minimum scroll positions after the scale has changed.

        * src/WebViewImpl.cpp:
        (WebKit::WebViewImpl::startPageScaleAnimation):
        * src/WebViewImpl.h:
        (WebViewImpl):

2012-07-30  Sheriff Bot  <webkit.review.bot@gmail.com>

        Unreviewed, rolling out r124025.



        m_layerTreeView.renderingStats(stats);
}

void WebViewImpl::startPageScaleAnimation(const IntPoint& targetPosition, bool useAnchor, float newScale, double durationInSeconds)
{
    if (m_layerTreeView.isNull())
        return;

    IntPoint clampedPoint = targetPosition;
    if (!useAnchor)
        clampedPoint = clampOffsetAtScale(targetPosition, newScale);

    if (!durationInSeconds && !useAnchor) {
        setPageScaleFactor(newScale, clampedPoint);
        return;
    }

    m_layerTreeView.startPageScaleAnimation(targetPosition, useAnchor, newScale, durationInSeconds);
}
#endif


Return to Bug 92698

Lines 768-777 void WebViewImpl::renderingStats(WebRenderingStats& stats) const a/Source/WebKit/chromium/src/WebViewImpl.cpp_sec1
- a/Source/WebKit/chromium/src/WebViewImpl.cpp -3 / +14 lines
768	m_layerTreeView.renderingStats(stats);	768	m_layerTreeView.renderingStats(stats);
769	}	769	}
770		770
771	void WebViewImpl::startPageScaleAnimation(const IntPoint& scroll, bool useAnchor, float newScale, double durationInSeconds)	771	void WebViewImpl::startPageScaleAnimation(const IntPoint& targetPosition, bool useAnchor, float newScale, double durationInSeconds)
772	{	772	{
773	if (!m_layerTreeView.isNull())	773	if (m_layerTreeView.isNull())
774	m_layerTreeView.startPageScaleAnimation(scroll, useAnchor, newScale, durationInSeconds);	774	return;
		775
		776	IntPoint clampedPoint = targetPosition;
		777	if (!useAnchor)
		778	clampedPoint = clampOffsetAtScale(targetPosition, newScale);
		779
		780	if (!durationInSeconds && !useAnchor) {
		781	setPageScaleFactor(newScale, clampedPoint);
		782	return;
		783	}
		784
		785	m_layerTreeView.startPageScaleAnimation(targetPosition, useAnchor, newScale, durationInSeconds);
775	}	786	}
776	#endif	787	#endif
777		788

Lines 1-3 a/Source/WebKit/chromium/ChangeLog_sec1
- a/Source/WebKit/chromium/ChangeLog +14 lines
		1	2012-07-30 Yusuf Ozuysal <yusufo@google.com>
		2
		3	[chromium]Upstream WebViewImpl:StartPageScaleAnimation changes for Chrome for Android
		4	https://bugs.webkit.org/show_bug.cgi?id=92698
		5
		6	Reviewed by NOBODY (OOPS!).
		7
		8	Enforce the maximum and minimum scroll positions after the scale has changed.
		9
		10	* src/WebViewImpl.cpp:
		11	(WebKit::WebViewImpl::startPageScaleAnimation):
		12	* src/WebViewImpl.h:
		13	(WebViewImpl):
		14
1	2012-07-30 Sheriff Bot <webkit.review.bot@gmail.com>	15	2012-07-30 Sheriff Bot <webkit.review.bot@gmail.com>
2		16
3	Unreviewed, rolling out r124025.	17	Unreviewed, rolling out r124025.