Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Fix jumping scroll decorators
  • Loading branch information
rojkov committed Feb 19, 2014
1 parent 2a257b8 commit 45931a4
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
2 changes: 1 addition & 1 deletion embedding/embedlite/embedthread/EmbedContentController.cpp
Expand Up @@ -113,7 +113,7 @@ void EmbedContentController::SendAsyncScrollDOMEvent(bool aIsRoot,
aScrollableSize.width, aScrollableSize.height);
gfxRect rect(aContentRect.x, aContentRect.y, aContentRect.width, aContentRect.height);
gfxSize size(aScrollableSize.width, aScrollableSize.height);
if (!GetListener()->SendAsyncScrollDOMEvent(rect, size)) {
if (aIsRoot && !GetListener()->SendAsyncScrollDOMEvent(rect, size)) {
unused << mRenderFrame->SendAsyncScrollDOMEvent(rect, size);
}
}
Expand Down
4 changes: 3 additions & 1 deletion gfx/layers/ipc/AsyncPanZoomController.cpp
Expand Up @@ -2012,7 +2012,9 @@ void AsyncPanZoomController::SendAsyncScrollEvent() {
}

controller->SendAsyncScrollDOMEvent(isRoot, contentRect, scrollableSize);
controller->ScrollUpdate(scrollOffset, resolution.scale);
if (isRoot) {
controller->ScrollUpdate(scrollOffset, resolution.scale);
}
}

bool AsyncPanZoomController::Matches(const ScrollableLayerGuid& aGuid)
Expand Down

0 comments on commit 45931a4

Please sign in to comment.