wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1163572 - Have ChromeProcessController also handle root-frame repaint requests. r=botond

Browse Source 
Original patch by Danilo Cesar Lemes de Paula <danilo.cesar@collabora.co.uk>.
This commit is contained in:
Kartikaya Gupta 2015-06-15 14:39:06 -04:00
parent e2e33e1957
commit 8cd41536e9
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dom/ipc/TabChild.cpp
View File

@ -423,6 +423,7 @@ TabChildBase::HandlePossibleViewportChange(const ScreenIntSize& aOldScreenSize)
defaultZoom <= viewportInfo.GetMaxZoom());
metrics.SetZoom(CSSToParentLayerScale2D(ConvertScaleForRoot(defaultZoom)));
metrics.SetPresShellId(presShellId);
metrics.SetScrollId(viewId);
}

2
gfx/layers/apz/util/APZCCallbackHelper.cpp
View File

@ -185,7 +185,7 @@ APZCCallbackHelper::UpdateRootFrame(FrameMetrics& aMetrics)
}
nsCOMPtr<nsIPresShell> shell = GetPresShell(content);
if (!shell) {
if (!shell || aMetrics.GetPresShellId() != shell->GetPresShellId()) {
return;
}

12
gfx/layers/apz/util/ChromeProcessController.cpp
View File

@ -75,10 +75,14 @@ ChromeProcessController::RequestContentRepaint(const FrameMetrics& aFrameMetrics
return;
}
nsCOMPtr<nsIContent> targetContent = nsLayoutUtils::FindContentFor(aFrameMetrics.GetScrollId());
if (targetContent) {
FrameMetrics metrics = aFrameMetrics;
APZCCallbackHelper::UpdateSubFrame(targetContent, metrics);
FrameMetrics metrics = aFrameMetrics;
if (metrics.IsRootContent()) {
APZCCallbackHelper::UpdateRootFrame(metrics);
} else {
nsCOMPtr<nsIContent> targetContent = nsLayoutUtils::FindContentFor(aFrameMetrics.GetScrollId());
if (targetContent) {
APZCCallbackHelper::UpdateSubFrame(targetContent, metrics);
}
}
}