| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2009, 2010 Apple Inc. All rights reserved. | 2 * Copyright (C) 2009, 2010 Apple Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
| 8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
| 9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
| 10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
| (...skipping 1284 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1295 { | 1295 { |
| 1296 if (m_containerLayer) | 1296 if (m_containerLayer) |
| 1297 updateOverflowControlsLayers(); | 1297 updateOverflowControlsLayers(); |
| 1298 } | 1298 } |
| 1299 | 1299 |
| 1300 void RenderLayerCompositor::rootFixedBackgroundsChanged() | 1300 void RenderLayerCompositor::rootFixedBackgroundsChanged() |
| 1301 { | 1301 { |
| 1302 if (!supportsFixedRootBackgroundCompositing()) | 1302 if (!supportsFixedRootBackgroundCompositing()) |
| 1303 return; | 1303 return; |
| 1304 | 1304 |
| 1305 // crbug.com/343132. |
| 1306 DisableCompositingQueryAsserts disabler; |
| 1307 |
| 1305 // To avoid having to make the fixed root background layer fixed positioned
to | 1308 // To avoid having to make the fixed root background layer fixed positioned
to |
| 1306 // stay put, we position it in the layer tree as follows: | 1309 // stay put, we position it in the layer tree as follows: |
| 1307 // | 1310 // |
| 1308 // + Overflow controls host | 1311 // + Overflow controls host |
| 1309 // + LocalFrame clip | 1312 // + LocalFrame clip |
| 1310 // + (Fixed root background) <-- Here. | 1313 // + (Fixed root background) <-- Here. |
| 1311 // + LocalFrame scroll | 1314 // + LocalFrame scroll |
| 1312 // + Root content layer | 1315 // + Root content layer |
| 1313 // + Scrollbars | 1316 // + Scrollbars |
| 1314 // | 1317 // |
| (...skipping 916 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2231 } else if (graphicsLayer == m_scrollLayer.get()) { | 2234 } else if (graphicsLayer == m_scrollLayer.get()) { |
| 2232 name = "LocalFrame Scrolling Layer"; | 2235 name = "LocalFrame Scrolling Layer"; |
| 2233 } else { | 2236 } else { |
| 2234 ASSERT_NOT_REACHED(); | 2237 ASSERT_NOT_REACHED(); |
| 2235 } | 2238 } |
| 2236 | 2239 |
| 2237 return name; | 2240 return name; |
| 2238 } | 2241 } |
| 2239 | 2242 |
| 2240 } // namespace WebCore | 2243 } // namespace WebCore |
| OLD | NEW |