merge b2g-inbound to mozilla-central
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Thu, 28 Nov 2013 11:52:00 +0100
changeset 172563 3c44c1f43a677806a92a32ea8c88eb6efb7e44ce
parent 172552 cdca43b7657d382f03670d0b22847cb1903b0432 (current diff)
parent 172562 e2ab97a4923dea122827d26df8c8a1719cc05a2b (diff)
child 172590 3ccec665a6aa1a0a44a12f42c144aa9fcda3dadf
push id3224
push userlsblakk@mozilla.com
push dateTue, 04 Feb 2014 01:06:49 +0000
treeherdermozilla-beta@60c04d0987f1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone28.0a1
first release with
nightly linux32
3c44c1f43a67 / 28.0a1 / 20131128030201 / files
nightly linux64
3c44c1f43a67 / 28.0a1 / 20131128030201 / files
nightly mac
3c44c1f43a67 / 28.0a1 / 20131128030201 / files
nightly win32
3c44c1f43a67 / 28.0a1 / 20131128030201 / files
nightly win64
3c44c1f43a67 / 28.0a1 / 20131128030201 / files
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
merge b2g-inbound to mozilla-central
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -1,4 +1,4 @@
 {
-    "revision": "74ed51578aa6d69a994d88be8d97f3b136288cd7", 
+    "revision": "3fe38577e17209728a54b14624143dbf99ade2df", 
     "repo_path": "/integration/gaia-central"
 }
--- a/layout/base/nsDisplayList.cpp
+++ b/layout/base/nsDisplayList.cpp
@@ -2867,16 +2867,19 @@ RequiredLayerStateForChildrenInternal(ns
       result = LAYER_ACTIVE;
     }
 
     LayerState state = i->GetLayerState(aBuilder, aManager, aParameters);
     if ((state == LAYER_ACTIVE || state == LAYER_ACTIVE_FORCE) &&
         state > result) {
       result = state;
     }
+    if (state == LAYER_ACTIVE_EMPTY && state > result) {
+      result = LAYER_ACTIVE_FORCE;
+    }
     if (state == LAYER_NONE) {
       nsDisplayList* list = i->GetSameCoordinateSystemChildren();
       if (list) {
         LayerState childState =
           RequiredLayerStateForChildrenInternal(aBuilder, aManager, aParameters, *list,
               aAnimatedGeometryRoot);
         if (childState > result) {
           result = childState;