Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (C) 2009, 2010, 2011 Apple Inc. All rights reserved. | 2 * Copyright (C) 2009, 2010, 2011 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 458 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 469 | 469 |
| 470 if (updateOverflowControlsLayers(requiresHorizontalScrollbarLayer(), require sVerticalScrollbarLayer(), requiresScrollCornerLayer())) | 470 if (updateOverflowControlsLayers(requiresHorizontalScrollbarLayer(), require sVerticalScrollbarLayer(), requiresScrollCornerLayer())) |
| 471 layerConfigChanged = true; | 471 layerConfigChanged = true; |
| 472 | 472 |
| 473 if (updateScrollingLayers(m_owningLayer.needsCompositedScrolling())) | 473 if (updateScrollingLayers(m_owningLayer.needsCompositedScrolling())) |
| 474 layerConfigChanged = true; | 474 layerConfigChanged = true; |
| 475 | 475 |
| 476 bool hasPerspective = false; | 476 bool hasPerspective = false; |
| 477 if (RenderStyle* style = renderer->style()) | 477 if (RenderStyle* style = renderer->style()) |
| 478 hasPerspective = style->hasPerspective(); | 478 hasPerspective = style->hasPerspective(); |
| 479 bool needsChildTransformLayer = hasPerspective && (layerForChildrenTransform () == m_childTransformLayer.get()); | 479 bool needsChildTransformLayer = hasPerspective && (layerForChildrenTransform () == m_childTransformLayer.get()) && renderer->isBox(); |
|
Julien - ping for review
2014/04/17 00:02:38
Wouldn't it make more sense not to have a RenderLa
Ian Vollick
2014/04/17 01:31:03
I don't think that's possible here. You couldn't b
| |
| 480 if (updateChildTransformLayer(needsChildTransformLayer)) | 480 if (updateChildTransformLayer(needsChildTransformLayer)) |
| 481 layerConfigChanged = true; | 481 layerConfigChanged = true; |
| 482 | 482 |
| 483 updateScrollParent(scrollParent); | 483 updateScrollParent(scrollParent); |
| 484 updateClipParent(m_owningLayer.clipParent()); | 484 updateClipParent(m_owningLayer.clipParent()); |
| 485 | 485 |
| 486 if (updateSquashingLayers(!m_squashedLayers.isEmpty())) | 486 if (updateSquashingLayers(!m_squashedLayers.isEmpty())) |
| 487 layerConfigChanged = true; | 487 layerConfigChanged = true; |
| 488 | 488 |
| 489 if (layerConfigChanged) | 489 if (layerConfigChanged) |
| (...skipping 1667 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2157 } else if (graphicsLayer == m_scrollingContentsLayer.get()) { | 2157 } else if (graphicsLayer == m_scrollingContentsLayer.get()) { |
| 2158 name = "Scrolling Contents Layer"; | 2158 name = "Scrolling Contents Layer"; |
| 2159 } else { | 2159 } else { |
| 2160 ASSERT_NOT_REACHED(); | 2160 ASSERT_NOT_REACHED(); |
| 2161 } | 2161 } |
| 2162 | 2162 |
| 2163 return name; | 2163 return name; |
| 2164 } | 2164 } |
| 2165 | 2165 |
| 2166 } // namespace WebCore | 2166 } // namespace WebCore |
| OLD | NEW |