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 539 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
550 return; | 550 return; |
551 ASSERT(compositedAncestor->compositingState() == PaintsIntoOwnBacking || com
positedAncestor->compositingState() == PaintsIntoGroupedBacking); | 551 ASSERT(compositedAncestor->compositingState() == PaintsIntoOwnBacking || com
positedAncestor->compositingState() == PaintsIntoGroupedBacking); |
552 | 552 |
553 LayoutPoint offset; | 553 LayoutPoint offset; |
554 layer->convertToLayerCoords(compositedAncestor, offset); | 554 layer->convertToLayerCoords(compositedAncestor, offset); |
555 LayoutRect repaintRect = rect; | 555 LayoutRect repaintRect = rect; |
556 repaintRect.moveBy(offset); | 556 repaintRect.moveBy(offset); |
557 compositedAncestor->repainter().setBackingNeedsRepaintInRect(repaintRect); | 557 compositedAncestor->repainter().setBackingNeedsRepaintInRect(repaintRect); |
558 } | 558 } |
559 | 559 |
560 void RenderLayerCompositor::layerWillBeRemoved(RenderLayer* parent, RenderLayer*
child) | |
561 { | |
562 if (!child->hasCompositedLayerMapping() || parent->renderer()->documentBeing
Destroyed()) | |
563 return; | |
564 | |
565 { | |
566 // FIXME: This is called from within RenderLayer::removeChild, which is
called from RenderObject::RemoveChild. | |
567 // There's no guarantee that compositor state is up to date. | |
568 DisableCompositingQueryAsserts disabler; | |
569 repaintInCompositedAncestor(child, child->compositedLayerMapping()->comp
ositedBounds()); | |
570 } | |
571 | |
572 setNeedsCompositingUpdate(CompositingUpdateRebuildTree); | |
573 } | |
574 | |
575 void RenderLayerCompositor::frameViewDidChangeLocation(const IntPoint& contentsO
ffset) | 560 void RenderLayerCompositor::frameViewDidChangeLocation(const IntPoint& contentsO
ffset) |
576 { | 561 { |
577 if (m_overflowControlsHostLayer) | 562 if (m_overflowControlsHostLayer) |
578 m_overflowControlsHostLayer->setPosition(contentsOffset); | 563 m_overflowControlsHostLayer->setPosition(contentsOffset); |
579 } | 564 } |
580 | 565 |
581 void RenderLayerCompositor::frameViewDidChangeSize() | 566 void RenderLayerCompositor::frameViewDidChangeSize() |
582 { | 567 { |
583 if (m_containerLayer) { | 568 if (m_containerLayer) { |
584 FrameView* frameView = m_renderView.frameView(); | 569 FrameView* frameView = m_renderView.frameView(); |
(...skipping 725 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1310 } else if (graphicsLayer == m_scrollLayer.get()) { | 1295 } else if (graphicsLayer == m_scrollLayer.get()) { |
1311 name = "LocalFrame Scrolling Layer"; | 1296 name = "LocalFrame Scrolling Layer"; |
1312 } else { | 1297 } else { |
1313 ASSERT_NOT_REACHED(); | 1298 ASSERT_NOT_REACHED(); |
1314 } | 1299 } |
1315 | 1300 |
1316 return name; | 1301 return name; |
1317 } | 1302 } |
1318 | 1303 |
1319 } // namespace WebCore | 1304 } // namespace WebCore |
OLD | NEW |