| 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 2483 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2494 continue; // FIXME: Can this happen? | 2494 continue; // FIXME: Can this happen? |
| 2495 if (HTMLFrameOwnerElement* ownerElement = child->document()->ownerElemen
t()) { | 2495 if (HTMLFrameOwnerElement* ownerElement = child->document()->ownerElemen
t()) { |
| 2496 DeprecatedScheduleStyleRecalcDuringCompositingUpdate marker(ownerEle
ment->document().lifecycle()); | 2496 DeprecatedScheduleStyleRecalcDuringCompositingUpdate marker(ownerEle
ment->document().lifecycle()); |
| 2497 ownerElement->scheduleLayerUpdate(); | 2497 ownerElement->scheduleLayerUpdate(); |
| 2498 } | 2498 } |
| 2499 } | 2499 } |
| 2500 | 2500 |
| 2501 // Compositing also affects the answer to RenderIFrame::requiresAcceleratedC
ompositing(), so | 2501 // Compositing also affects the answer to RenderIFrame::requiresAcceleratedC
ompositing(), so |
| 2502 // we need to schedule a style recalc in our parent document. | 2502 // we need to schedule a style recalc in our parent document. |
| 2503 if (HTMLFrameOwnerElement* ownerElement = m_renderView->document().ownerElem
ent()) { | 2503 if (HTMLFrameOwnerElement* ownerElement = m_renderView->document().ownerElem
ent()) { |
| 2504 ownerElement->document().renderView()->compositor()->setNeedsToRecompute
CompositingRequirements(); |
| 2504 DeprecatedScheduleStyleRecalcDuringCompositingUpdate marker(ownerElement
->document().lifecycle()); | 2505 DeprecatedScheduleStyleRecalcDuringCompositingUpdate marker(ownerElement
->document().lifecycle()); |
| 2505 ownerElement->scheduleLayerUpdate(); | 2506 ownerElement->scheduleLayerUpdate(); |
| 2506 } | 2507 } |
| 2507 } | 2508 } |
| 2508 | 2509 |
| 2509 bool RenderLayerCompositor::layerHas3DContent(const RenderLayer* layer) const | 2510 bool RenderLayerCompositor::layerHas3DContent(const RenderLayer* layer) const |
| 2510 { | 2511 { |
| 2511 const RenderStyle* style = layer->renderer()->style(); | 2512 const RenderStyle* style = layer->renderer()->style(); |
| 2512 RenderLayerStackingNode* stackingNode = const_cast<RenderLayer*>(layer)->sta
ckingNode(); | 2513 RenderLayerStackingNode* stackingNode = const_cast<RenderLayer*>(layer)->sta
ckingNode(); |
| 2513 | 2514 |
| (...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2661 } else if (graphicsLayer == m_scrollLayer.get()) { | 2662 } else if (graphicsLayer == m_scrollLayer.get()) { |
| 2662 name = "Frame Scrolling Layer"; | 2663 name = "Frame Scrolling Layer"; |
| 2663 } else { | 2664 } else { |
| 2664 ASSERT_NOT_REACHED(); | 2665 ASSERT_NOT_REACHED(); |
| 2665 } | 2666 } |
| 2666 | 2667 |
| 2667 return name; | 2668 return name; |
| 2668 } | 2669 } |
| 2669 | 2670 |
| 2670 } // namespace WebCore | 2671 } // namespace WebCore |
| OLD | NEW |