Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-08 10:44:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1304637 - Move back to using window display for basic composition paths. r=lsalzman

Browse Source 
MozReview-Commit-ID: CutLou4qJi
This commit is contained in:
Ryan Hunt 2016-10-27 14:39:59 -04:00
parent 04eecc22e1
commit ad202d92b4
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
widget/gtk/X11CompositorWidget.cpp
View File

@ -21,7 +21,7 @@ X11CompositorWidget::X11CompositorWidget(const CompositorWidgetInitData& aInitDa
// If we have a nsWindow, then grab the already existing display connection
// If we don't, then use the init data to connect to the display
if (aWindow) {
mXDisplay = (Display*)aWindow->GetNativeData(NS_NATIVE_COMPOSITOR_DISPLAY);
mXDisplay = aWindow->XDisplay();
} else {
mXDisplay = XOpenDisplay(aInitData.XDisplayString().get());
}

5
widget/gtk/nsWindow.cpp
View File

@ -7023,12 +7023,9 @@ nsWindow::RoundsWidgetCoordinatesTo()
void nsWindow::GetCompositorWidgetInitData(mozilla::widget::CompositorWidgetInitData* aInitData)
{
#ifdef MOZ_X11
Display* xDisplay = (Display*)GetNativeData(NS_NATIVE_COMPOSITOR_DISPLAY);
char* xDisplayString = XDisplayString(xDisplay);
*aInitData = mozilla::widget::CompositorWidgetInitData(
mXWindow,
nsCString(xDisplayString),
nsCString(XDisplayString(mXDisplay)),
GetClientSize());
#endif
}

3
widget/gtk/nsWindow.h
View File

@ -346,6 +346,9 @@ public:
nsIObserver* aObserver) override;
#endif
#ifdef MOZ_X11
Display* XDisplay() { return mXDisplay; }
#endif
virtual void GetCompositorWidgetInitData(mozilla::widget::CompositorWidgetInitData* aInitData) override;
// HiDPI scale conversion