Bug 1510363 - backout accidentally checked in file. r=jya
authorJohn Lin <jolin@mozilla.com>
Wed, 28 Nov 2018 17:50:32 +0000
changeset 504985 3b37632be987ce0ae9df8354eaa46ce91c73c18a
parent 504984 f6632f5349d67c87d41aab7b07577abd8cc58a48
child 504986 393f02fb1ad734a1f37a2c33ac29050a3130cb23
push id10290
push userffxbld-merge
push dateMon, 03 Dec 2018 16:23:23 +0000
treeherdermozilla-beta@700bed2445e6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjya
bugs1510363
milestone65.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1510363 - backout accidentally checked in file. r=jya And add patterns to .gitignore to prevent future occurence. Differential Revision: https://phabricator.services.mozilla.com/D13108
.gitignore
dom/media/platforms/apple/AppleDecoderModule.cpp.rej
--- a/.gitignore
+++ b/.gitignore
@@ -147,8 +147,12 @@ lextab.py
 
 # tup database
 /.tup
 
 # Ignore Visual Studio Code workspace files.
 .vscode/
 !.vscode/extensions.json
 !.vscode/tasks.json
+
+# Ignore temp files created by patch command.
+*.orig
+*.rej
deleted file mode 100644
--- a/dom/media/platforms/apple/AppleDecoderModule.cpp.rej
+++ /dev/null
@@ -1,12 +0,0 @@
-diff a/dom/media/platforms/apple/AppleDecoderModule.cpp b/dom/media/platforms/apple/AppleDecoderModule.cpp	(rejected hunks)
-@@ -30,8 +30,8 @@ void AppleDecoderModule::Init() {
-   // Ensure IOSurface framework is loaded.
-   MacIOSurfaceLib::LoadLibrary();
- 
--  sCanUseHardwareVideoDecoder = MacIOSurfaceLib::isInit() &&
--      gfx::gfxVars::CanUseHardwareVideoDecoding();
-+  sCanUseHardwareVideoDecoder =
-+      MacIOSurfaceLib::isInit() && gfx::gfxVars::CanUseHardwareVideoDecoding();
- 
-   sInitialized = true;
- }