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 1112345 - Tab streaming should scroll stream with layers and not offsets r=snorp

Browse Source
This commit is contained in:
Brad Lassey 2014-12-16 17:43:23 -05:00
parent 04ed071996
commit a97143c1ac
1 changed files with 11 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
dom/media/webrtc/MediaEngineTabVideoSource.cpp
View File

@ -219,7 +219,6 @@ MediaEngineTabVideoSource::Draw() {
IntSize size(mBufW, mBufH);
nsresult rv;
float scale = 1.0;
nsCOMPtr<nsPIDOMWindow> win = do_QueryInterface(mWindow);
@ -240,25 +239,14 @@ MediaEngineTabVideoSource::Draw() {
return;
}
float left, top, width, height;
rect->GetLeft(&left);
rect->GetTop(&top);
float width, height;
rect->GetWidth(&width);
rect->GetHeight(&height);
if (mScrollWithPage) {
nsPoint point;
utils->GetScrollXY(false, &point.x, &point.y);
left += point.x;
top += point.y;
}
if (width == 0 || height == 0) {
return;
}
int32_t srcX = left;
int32_t srcY = top;
int32_t srcW;
int32_t srcH;
@ -279,14 +267,15 @@ MediaEngineTabVideoSource::Draw() {
if (!presContext) {
return;
}
nscolor bgColor = NS_RGB(255, 255, 255);
nsCOMPtr<nsIPresShell> presShell = presContext->PresShell();
uint32_t renderDocFlags = (nsIPresShell::RENDER_IGNORE_VIEWPORT_SCROLLING |
nsIPresShell::RENDER_DOCUMENT_RELATIVE);
nsRect r(nsPresContext::CSSPixelsToAppUnits(srcX / scale),
nsPresContext::CSSPixelsToAppUnits(srcY / scale),
nsPresContext::CSSPixelsToAppUnits(srcW / scale),
nsPresContext::CSSPixelsToAppUnits(srcH / scale));
uint32_t renderDocFlags = nsIPresShell::RENDER_DOCUMENT_RELATIVE;
if (!mScrollWithPage) {
renderDocFlags |= nsIPresShell::RENDER_IGNORE_VIEWPORT_SCROLLING;
}
nsRect r(0, 0, nsPresContext::CSSPixelsToAppUnits((float)srcW),
nsPresContext::CSSPixelsToAppUnits((float)srcH));
gfxImageFormat format = gfxImageFormat::RGB24;
uint32_t stride = gfxASurface::FormatStrideForWidth(format, size.width);
@ -302,9 +291,9 @@ MediaEngineTabVideoSource::Draw() {
return;
}
nsRefPtr<gfxContext> context = new gfxContext(dt);
context->SetMatrix(
context->CurrentMatrix().Scale(scale * size.width / srcW,
scale * size.height / srcH));
context->SetMatrix(context->CurrentMatrix().Scale((float)size.width/srcW,
(float)size.height/srcH));
rv = presShell->RenderDocument(r, renderDocFlags, bgColor, context);
NS_ENSURE_SUCCESS_VOID(rv);