| 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 539 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 550             layerConfigChanged = true; | 550             layerConfigChanged = true; | 
| 551     } | 551     } | 
| 552 | 552 | 
| 553     // Changes to either the internal hierarchy or the mask layer have an impact | 553     // Changes to either the internal hierarchy or the mask layer have an impact | 
| 554     // on painting phases, so we need to update when either are updated. | 554     // on painting phases, so we need to update when either are updated. | 
| 555     if (layerConfigChanged || maskLayerChanged) | 555     if (layerConfigChanged || maskLayerChanged) | 
| 556         updatePaintingPhases(); | 556         updatePaintingPhases(); | 
| 557 | 557 | 
| 558     updateElementIdAndCompositorMutableProperties(); | 558     updateElementIdAndCompositorMutableProperties(); | 
| 559 | 559 | 
|  | 560     m_graphicsLayer->setHasWillChangeTransformHint(m_owningLayer.layoutObject()-
      >styleRef().hasWillChangeTransformHint()); | 
|  | 561 | 
| 560     return layerConfigChanged; | 562     return layerConfigChanged; | 
| 561 } | 563 } | 
| 562 | 564 | 
| 563 static IntRect clipBox(LayoutBox* layoutObject) | 565 static IntRect clipBox(LayoutBox* layoutObject) | 
| 564 { | 566 { | 
| 565     LayoutRect result = LayoutRect(LayoutRect::infiniteIntRect()); | 567     LayoutRect result = LayoutRect(LayoutRect::infiniteIntRect()); | 
| 566     if (layoutObject->hasOverflowClip() || layoutObject->style()->containsPaint(
      )) | 568     if (layoutObject->hasOverflowClip() || layoutObject->style()->containsPaint(
      )) | 
| 567         result = layoutObject->overflowClipRect(LayoutPoint()); | 569         result = layoutObject->overflowClipRect(LayoutPoint()); | 
| 568 | 570 | 
| 569     if (layoutObject->hasClip()) | 571     if (layoutObject->hasClip()) | 
| (...skipping 2010 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 2580     } else if (graphicsLayer == m_scrollingContentsLayer.get()) { | 2582     } else if (graphicsLayer == m_scrollingContentsLayer.get()) { | 
| 2581         name = "Scrolling Contents Layer"; | 2583         name = "Scrolling Contents Layer"; | 
| 2582     } else { | 2584     } else { | 
| 2583         ASSERT_NOT_REACHED(); | 2585         ASSERT_NOT_REACHED(); | 
| 2584     } | 2586     } | 
| 2585 | 2587 | 
| 2586     return name; | 2588     return name; | 
| 2587 } | 2589 } | 
| 2588 | 2590 | 
| 2589 } // namespace blink | 2591 } // namespace blink | 
| OLD | NEW | 
|---|