Skip to content
This repository has been archived by the owner on Nov 3, 2021. It is now read-only.

Commit

Permalink
Merge pull request #17976 from wilsonpage/bug/991924
Browse files Browse the repository at this point in the history
Bug 991924 - [Camera][Buri] Performance regression when selecting shutter button (camera and video)
  • Loading branch information
wilsonpage authored and rvandermeulen committed Apr 9, 2014
1 parent 5b19a87 commit a3ff607
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 6 deletions.
23 changes: 18 additions & 5 deletions apps/camera/style/controls.css
Expand Up @@ -63,7 +63,6 @@

.controls-button {
position: relative;
box-sizing: content-box;
display: block;
height: 5.4rem;
width: 5.4rem;
Expand All @@ -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;
}

Expand Down Expand Up @@ -155,7 +154,6 @@

.mode-switch {
position: relative;
box-sizing: content-box;
display: block;
font-size: 2.4rem;
width: 7.6rem;
Expand All @@ -165,6 +163,7 @@
margin-left: 1.8rem;
overflow: hidden;
visibility: hidden; /* 1 */
box-sizing: content-box;
}

/**
Expand Down Expand Up @@ -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;
}

Expand Down Expand Up @@ -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;
}
Expand Down
6 changes: 5 additions & 1 deletion apps/camera/style/viewfinder.css
Expand Up @@ -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 {
Expand All @@ -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;
}

Expand Down

0 comments on commit a3ff607

Please sign in to comment.