mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-18 07:45:30 +00:00
Bug 1514737 - Update webrender to commit 7f2d2ea79e65d49f0da2030e6033761c38c1e296 (WR PR #3408). r=kats
https://github.com/servo/webrender/pull/3408 Differential Revision: https://phabricator.services.mozilla.com/D14736 --HG-- extra : moz-landing-system : lando
This commit is contained in:
WR Updater Bot
parent
3d72b39c29
commit
c26f41601c
@ -1 +1 @@
|
||||
ff9d6b5bf1b72258e061bd661c90708589ecae3e
|
||||
7f2d2ea79e65d49f0da2030e6033761c38c1e296
|
||||
|
||||
8
gfx/wr/Cargo.lock
generated
8
gfx/wr/Cargo.lock
generated
@ -450,7 +450,7 @@ version = "0.4.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
dependencies = [
|
||||
"libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"servo-freetype-sys 4.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"servo-freetype-sys 4.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@ -1229,12 +1229,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
dependencies = [
|
||||
"expat-sys 2.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"pkg-config 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"servo-freetype-sys 4.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"servo-freetype-sys 4.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "servo-freetype-sys"
|
||||
version = "4.0.3"
|
||||
version = "4.0.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
dependencies = [
|
||||
"cmake 0.1.31 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
@ -1901,7 +1901,7 @@ dependencies = [
|
||||
"checksum serde_json 1.0.17 (registry+https://github.com/rust-lang/crates.io-index)" = "f3ad6d546e765177cf3dded3c2e424a8040f870083a0e64064746b958ece9cb1"
|
||||
"checksum servo-fontconfig 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a088f8d775a5c5314aae09bd77340bc9c67d72b9a45258be34c83548b4814cd9"
|
||||
"checksum servo-fontconfig-sys 4.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "38b494f03009ee81914b0e7d387ad7c145cafcd69747c2ec89b0e17bb94f303a"
|
||||
"checksum servo-freetype-sys 4.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "9232032c2e85118c0282c6562c84cab12316e655491ba0a5d1905b2320060d1b"
|
||||
"checksum servo-freetype-sys 4.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "2c4ccb6d0d32d277d3ef7dea86203d8210945eb7a45fba89dd445b3595dd0dfc"
|
||||
"checksum sha1 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "cc30b1e1e8c40c121ca33b86c23308a090d19974ef001b4bf6e61fd1a0fb095c"
|
||||
"checksum sha2 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9eb6be24e4c23a84d7184280d2722f7f2731fcdd4a9d886efbfe4413e4847ea0"
|
||||
"checksum shared_library 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8254bf098ce4d8d7cc7cc6de438c5488adc5297e5b7ffef88816c0a91bd289c1"
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
before_test:
|
||||
- ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/set-screenresolution.ps1'))
|
||||
- ps: iex (Get-Content -Raw ci-scripts\set-screenresolution.ps1)
|
||||
- ps: Set-ScreenResolution 1920 1080
|
||||
|
||||
environment:
|
||||
|
||||
124
gfx/wr/ci-scripts/set-screenresolution.ps1
Normal file
124
gfx/wr/ci-scripts/set-screenresolution.ps1
Normal file
@ -0,0 +1,124 @@
|
||||
# http://blogs.technet.com/b/heyscriptingguy/archive/2010/07/07/hey-scripting-guy-how-can-i-change-my-desktop-monitor-resolution-via-windows-powershell.aspx
|
||||
|
||||
Function Set-ScreenResolution {
|
||||
param (
|
||||
[Parameter(Mandatory=$true,
|
||||
Position = 0)]
|
||||
[int]
|
||||
$Width,
|
||||
[Parameter(Mandatory=$true,
|
||||
Position = 1)]
|
||||
[int]
|
||||
$Height
|
||||
)
|
||||
$pinvokeCode = @"
|
||||
using System;
|
||||
using System.Runtime.InteropServices;
|
||||
namespace Resolution
|
||||
{
|
||||
[StructLayout(LayoutKind.Sequential)]
|
||||
public struct DEVMODE1
|
||||
{
|
||||
[MarshalAs(UnmanagedType.ByValTStr, SizeConst = 32)]
|
||||
public string dmDeviceName;
|
||||
public short dmSpecVersion;
|
||||
public short dmDriverVersion;
|
||||
public short dmSize;
|
||||
public short dmDriverExtra;
|
||||
public int dmFields;
|
||||
public short dmOrientation;
|
||||
public short dmPaperSize;
|
||||
public short dmPaperLength;
|
||||
public short dmPaperWidth;
|
||||
public short dmScale;
|
||||
public short dmCopies;
|
||||
public short dmDefaultSource;
|
||||
public short dmPrintQuality;
|
||||
public short dmColor;
|
||||
public short dmDuplex;
|
||||
public short dmYResolution;
|
||||
public short dmTTOption;
|
||||
public short dmCollate;
|
||||
[MarshalAs(UnmanagedType.ByValTStr, SizeConst = 32)]
|
||||
public string dmFormName;
|
||||
public short dmLogPixels;
|
||||
public short dmBitsPerPel;
|
||||
public int dmPelsWidth;
|
||||
public int dmPelsHeight;
|
||||
public int dmDisplayFlags;
|
||||
public int dmDisplayFrequency;
|
||||
public int dmICMMethod;
|
||||
public int dmICMIntent;
|
||||
public int dmMediaType;
|
||||
public int dmDitherType;
|
||||
public int dmReserved1;
|
||||
public int dmReserved2;
|
||||
public int dmPanningWidth;
|
||||
public int dmPanningHeight;
|
||||
};
|
||||
class User_32
|
||||
{
|
||||
[DllImport("user32.dll")]
|
||||
public static extern int EnumDisplaySettings(string deviceName, int modeNum, ref DEVMODE1 devMode);
|
||||
[DllImport("user32.dll")]
|
||||
public static extern int ChangeDisplaySettings(ref DEVMODE1 devMode, int flags);
|
||||
public const int ENUM_CURRENT_SETTINGS = -1;
|
||||
public const int CDS_UPDATEREGISTRY = 0x01;
|
||||
public const int CDS_TEST = 0x02;
|
||||
public const int DISP_CHANGE_SUCCESSFUL = 0;
|
||||
public const int DISP_CHANGE_RESTART = 1;
|
||||
public const int DISP_CHANGE_FAILED = -1;
|
||||
}
|
||||
public class PrmaryScreenResolution
|
||||
{
|
||||
static public string ChangeResolution(int width, int height)
|
||||
{
|
||||
DEVMODE1 dm = GetDevMode1();
|
||||
if (0 != User_32.EnumDisplaySettings(null, User_32.ENUM_CURRENT_SETTINGS, ref dm))
|
||||
{
|
||||
dm.dmPelsWidth = width;
|
||||
dm.dmPelsHeight = height;
|
||||
int iRet = User_32.ChangeDisplaySettings(ref dm, User_32.CDS_TEST);
|
||||
if (iRet == User_32.DISP_CHANGE_FAILED)
|
||||
{
|
||||
return "Unable To Process Your Request. Sorry For This Inconvenience.";
|
||||
}
|
||||
else
|
||||
{
|
||||
iRet = User_32.ChangeDisplaySettings(ref dm, User_32.CDS_UPDATEREGISTRY);
|
||||
switch (iRet)
|
||||
{
|
||||
case User_32.DISP_CHANGE_SUCCESSFUL:
|
||||
{
|
||||
return "Success";
|
||||
}
|
||||
case User_32.DISP_CHANGE_RESTART:
|
||||
{
|
||||
return "You Need To Reboot For The Change To Happen.\n If You Feel Any Problem After Rebooting Your Machine\nThen Try To Change Resolution In Safe Mode.";
|
||||
}
|
||||
default:
|
||||
{
|
||||
return "Failed To Change The Resolution";
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
return "Failed To Change The Resolution.";
|
||||
}
|
||||
}
|
||||
private static DEVMODE1 GetDevMode1()
|
||||
{
|
||||
DEVMODE1 dm = new DEVMODE1();
|
||||
dm.dmDeviceName = new String(new char[32]);
|
||||
dm.dmFormName = new String(new char[32]);
|
||||
dm.dmSize = (short)Marshal.SizeOf(dm);
|
||||
return dm;
|
||||
}
|
||||
}
|
||||
}
|
||||
"@
|
||||
Add-Type $pinvokeCode -ErrorAction SilentlyContinue
|
||||
[Resolution.PrmaryScreenResolution]::ChangeResolution($width,$height)
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user