Commit 3a976b10 authored by commit-queue@webkit.org's avatar commit-queue@webkit.org
Browse files

[Qt][WK2] Minibrowser asserts on startup at...

[Qt][WK2] Minibrowser asserts on startup at QtViewportInteractionEngine::ensureContentWithinViewportBoundary()
https://bugs.webkit.org/show_bug.cgi?id=84172

Patch by Zalan Bujtas <zbujtas@gmail.com> on 2012-04-18
Reviewed by Simon Hausmann.

After the viewport computing refactor, ensureContentWithinViewportBoundary() can be called
with resumed page. QtViewportInteractionEngine::ensureContentWithinViewportBoundary()
functionality does not necessarily require the page to be suspended. It's the caller's context
that determines whether the page needs to be suspended, so it's the caller's responsibility
to enforce the ASSERT().
Remove the invalid ASSERT on m_suspendCount at QtViewportInteractionEngine::ensureContentWithinViewportBoundary()

* UIProcess/qt/QtViewportInteractionEngine.cpp:
(WebKit::QtViewportInteractionEngine::ensureContentWithinViewportBoundary):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@114496 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 975e96e5
2012-04-18 Zalan Bujtas <zbujtas@gmail.com>
[Qt][WK2] Minibrowser asserts on startup at QtViewportInteractionEngine::ensureContentWithinViewportBoundary()
https://bugs.webkit.org/show_bug.cgi?id=84172
Reviewed by Simon Hausmann.
After the viewport computing refactor, ensureContentWithinViewportBoundary() can be called
with resumed page. QtViewportInteractionEngine::ensureContentWithinViewportBoundary()
functionality does not necessarily require the page to be suspended. It's the caller's context
that determines whether the page needs to be suspended, so it's the caller's responsibility
to enforce the ASSERT().
Remove the invalid ASSERT on m_suspendCount at QtViewportInteractionEngine::ensureContentWithinViewportBoundary()
* UIProcess/qt/QtViewportInteractionEngine.cpp:
(WebKit::QtViewportInteractionEngine::ensureContentWithinViewportBoundary):
2012-04-17 Alexey Proskuryakov <ap@apple.com>
 
[Mac] USPS Shipping label prints without barcode
......@@ -397,8 +397,6 @@ void QtViewportInteractionEngine::zoomToAreaGestureEnded(const QPointF& touchPoi
bool QtViewportInteractionEngine::ensureContentWithinViewportBoundary(bool immediate)
{
ASSERT(m_suspendCount);
if (scrollAnimationActive() || scaleAnimationActive())
return false;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment