Commit 739da292 authored by John Lin's avatar John Lin
Browse files

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

--HG--
extra : moz-landing-system : lando
parent 992be297

.gitignore

+4 −0
Original line number Diff line number Diff line
@@ -152,3 +152,7 @@ lextab.py 
.vscode/

!.vscode/extensions.json

!.vscode/tasks.json



# Ignore temp files created by patch command.

*.orig

*.rej

dom/media/platforms/apple/AppleDecoderModule.cpp.rej

deleted100644 → 0
+0 −12
Original line number Diff line number Diff line 
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;

 }