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 1555 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1566 if (m_overflowControlsHostLayer) | 1566 if (m_overflowControlsHostLayer) |
1567 return m_overflowControlsHostLayer.get(); | 1567 return m_overflowControlsHostLayer.get(); |
1568 return m_rootContentLayer.get(); | 1568 return m_rootContentLayer.get(); |
1569 } | 1569 } |
1570 | 1570 |
1571 GraphicsLayer* RenderLayerCompositor::scrollLayer() const | 1571 GraphicsLayer* RenderLayerCompositor::scrollLayer() const |
1572 { | 1572 { |
1573 return m_scrollLayer.get(); | 1573 return m_scrollLayer.get(); |
1574 } | 1574 } |
1575 | 1575 |
| 1576 GraphicsLayer* RenderLayerCompositor::containerLayer() const |
| 1577 { |
| 1578 return m_containerLayer.get(); |
| 1579 } |
| 1580 |
1576 void RenderLayerCompositor::setIsInWindow(bool isInWindow) | 1581 void RenderLayerCompositor::setIsInWindow(bool isInWindow) |
1577 { | 1582 { |
1578 if (!inCompositingMode()) | 1583 if (!inCompositingMode()) |
1579 return; | 1584 return; |
1580 | 1585 |
1581 if (isInWindow) { | 1586 if (isInWindow) { |
1582 if (m_rootLayerAttachment != RootLayerUnattached) | 1587 if (m_rootLayerAttachment != RootLayerUnattached) |
1583 return; | 1588 return; |
1584 | 1589 |
1585 RootLayerAttachment attachment = isMainFrame() ? RootLayerAttachedViaChr
omeClient : RootLayerAttachedViaEnclosingFrame; | 1590 RootLayerAttachment attachment = isMainFrame() ? RootLayerAttachedViaChr
omeClient : RootLayerAttachedViaEnclosingFrame; |
(...skipping 1054 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2640 } else if (graphicsLayer == m_scrollLayer.get()) { | 2645 } else if (graphicsLayer == m_scrollLayer.get()) { |
2641 name = "Frame Scrolling Layer"; | 2646 name = "Frame Scrolling Layer"; |
2642 } else { | 2647 } else { |
2643 ASSERT_NOT_REACHED(); | 2648 ASSERT_NOT_REACHED(); |
2644 } | 2649 } |
2645 | 2650 |
2646 return name; | 2651 return name; |
2647 } | 2652 } |
2648 | 2653 |
2649 } // namespace WebCore | 2654 } // namespace WebCore |
OLD | NEW |