| 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 518 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 529 } | 529 } |
| 530 } else if (layoutObject->isVideo()) { | 530 } else if (layoutObject->isVideo()) { |
| 531 HTMLMediaElement* mediaElement = toHTMLMediaElement(layoutObject->node()
); | 531 HTMLMediaElement* mediaElement = toHTMLMediaElement(layoutObject->node()
); |
| 532 m_graphicsLayer->setContentsToPlatformLayer(mediaElement->platformLayer(
)); | 532 m_graphicsLayer->setContentsToPlatformLayer(mediaElement->platformLayer(
)); |
| 533 } else if (isAcceleratedCanvas(layoutObject)) { | 533 } else if (isAcceleratedCanvas(layoutObject)) { |
| 534 HTMLCanvasElement* canvas = toHTMLCanvasElement(layoutObject->node()); | 534 HTMLCanvasElement* canvas = toHTMLCanvasElement(layoutObject->node()); |
| 535 if (CanvasRenderingContext* context = canvas->renderingContext()) | 535 if (CanvasRenderingContext* context = canvas->renderingContext()) |
| 536 m_graphicsLayer->setContentsToPlatformLayer(context->platformLayer()
); | 536 m_graphicsLayer->setContentsToPlatformLayer(context->platformLayer()
); |
| 537 layerConfigChanged = true; | 537 layerConfigChanged = true; |
| 538 } | 538 } |
| 539 if (layoutObject->isLayoutPart()) | 539 if (layoutObject->isLayoutPart()) { |
| 540 layerConfigChanged = DeprecatedPaintLayerCompositor::parentFrameContentL
ayers(toLayoutPart(layoutObject)); | 540 if (DeprecatedPaintLayerCompositor::parentFrameContentLayers(toLayoutPar
t(layoutObject))) |
| 541 layerConfigChanged = true; |
| 542 } |
| 541 | 543 |
| 542 // Changes to either the internal hierarchy or the mask layer have an impact | 544 // Changes to either the internal hierarchy or the mask layer have an impact |
| 543 // on painting phases, so we need to update when either are updated. | 545 // on painting phases, so we need to update when either are updated. |
| 544 if (layerConfigChanged || maskLayerChanged) | 546 if (layerConfigChanged || maskLayerChanged) |
| 545 updatePaintingPhases(); | 547 updatePaintingPhases(); |
| 546 | 548 |
| 547 return layerConfigChanged; | 549 return layerConfigChanged; |
| 548 } | 550 } |
| 549 | 551 |
| 550 static IntRect clipBox(LayoutBox* layoutObject) | 552 static IntRect clipBox(LayoutBox* layoutObject) |
| (...skipping 1791 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2342 } else if (graphicsLayer == m_scrollingBlockSelectionLayer.get()) { | 2344 } else if (graphicsLayer == m_scrollingBlockSelectionLayer.get()) { |
| 2343 name = "Scrolling Block Selection Layer"; | 2345 name = "Scrolling Block Selection Layer"; |
| 2344 } else { | 2346 } else { |
| 2345 ASSERT_NOT_REACHED(); | 2347 ASSERT_NOT_REACHED(); |
| 2346 } | 2348 } |
| 2347 | 2349 |
| 2348 return name; | 2350 return name; |
| 2349 } | 2351 } |
| 2350 | 2352 |
| 2351 } // namespace blink | 2353 } // namespace blink |
| OLD | NEW |