From a3ff60782a9b94d4eba59bb65ac7c3aa800b6629 Mon Sep 17 00:00:00 2001
From: Wilson Page <wilsonpage@me.com>
Date: Mon, 7 Apr 2014 23:07:44 +0100
Subject: [PATCH] Merge pull request #17976 from wilsonpage/bug/991924

Bug 991924 - [Camera][Buri] Performance regression when selecting shutter button (camera and video)
---
 apps/camera/style/controls.css   | 23 ++++++++++++++++++-----
 apps/camera/style/viewfinder.css |  6 +++++-
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/apps/camera/style/controls.css b/apps/camera/style/controls.css
index 7ab1390c94df..c828f9d202df 100755
--- a/apps/camera/style/controls.css
+++ b/apps/camera/style/controls.css
@@ -63,7 +63,6 @@
 
 .controls-button {
   position: relative;
-  box-sizing: content-box;
   display: block;
   height: 5.4rem;
   width: 5.4rem;
@@ -76,7 +75,7 @@
   background-color: rgba(0,0,0,0.4);
   background-clip: padding-box;
   border: solid 1.8rem transparent;
-  -moz-box-sizing: content-box;
+  box-sizing: content-box;
   color: #fff;
 }
 
@@ -155,7 +154,6 @@
 
 .mode-switch {
   position: relative;
-  box-sizing: content-box;
   display: block;
   font-size: 2.4rem;
   width: 7.6rem;
@@ -165,6 +163,7 @@
   margin-left: 1.8rem;
   overflow: hidden;
   visibility: hidden; /* 1 */
+  box-sizing: content-box;
 }
 
 /**
@@ -210,13 +209,20 @@
 /** Selected Mode
  ---------------------------------------------------------*/
 
+/**
+ * 1. Disabled `will-change` due to performance
+ *    issues on Hamachi. Leaving in place so that
+ *    we can re-introduce as a later date to improve
+ *    frame-rate on more capable devices.
+ */
+
 .mode-switch .selected-mode {
   position: relative;
   width: 3.6rem;
   height: 3.6rem;
   border-radius: 50%;
   background: #EEE;
-  will-change: transform;
+  /*will-change: transform;*/ /* 1 */
   transition: transform 140ms;
 }
 
@@ -285,9 +291,16 @@
 /** Inner Circle
  ---------------------------------------------------------*/
 
+/**
+ * 1. Disabled `will-change` due to performance
+ *    issues on Hamachi. Leaving in place so that
+ *    we can re-introduce as a later date to improve
+ *    frame-rate on more capable devices.
+ */
+
 .capture-button .inner-circle {
   background-color: white;
-  will-change: transform;
+  /*will-change: transform;*/ /* 1 */
   transform: scale(0.76);
   transition: transform 150ms ease-in;
 }
diff --git a/apps/camera/style/viewfinder.css b/apps/camera/style/viewfinder.css
index 4bc8935938c5..5e2634880686 100644
--- a/apps/camera/style/viewfinder.css
+++ b/apps/camera/style/viewfinder.css
@@ -2,6 +2,10 @@
 /**
  * 1. PERF: Don't transition to 0 to
  *    avoid composite layer being discarded.
+ * 2. Disabled `will-change` due to performance
+ *    issues on Hamachi. Leaving in place so that
+ *    we can re-introduce as a later date to improve
+ *    frame-rate on more capable devices.
  */
 
 .viewfinder {
@@ -14,7 +18,7 @@
   justify-content: center;
   overflow: hidden;
   opacity: 0.001; /* 1 */
-  will-change: opacity;
+  /*will-change: opacity;*/ /* 2 */
   transition: opacity 200ms ease-in-out;
 }