| 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 2243 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2254 m_rootLayerAttachment = RootLayerUnattached; | 2254 m_rootLayerAttachment = RootLayerUnattached; |
| 2255 } | 2255 } |
| 2256 | 2256 |
| 2257 void RenderLayerCompositor::updateRootLayerAttachment() | 2257 void RenderLayerCompositor::updateRootLayerAttachment() |
| 2258 { | 2258 { |
| 2259 ensureRootLayer(); | 2259 ensureRootLayer(); |
| 2260 } | 2260 } |
| 2261 | 2261 |
| 2262 bool RenderLayerCompositor::isMainFrame() const | 2262 bool RenderLayerCompositor::isMainFrame() const |
| 2263 { | 2263 { |
| 2264 // FIXME: Frame::isMainFrame() is probably better. |
| 2264 return !m_renderView->document().ownerElement(); | 2265 return !m_renderView->document().ownerElement(); |
| 2265 } | 2266 } |
| 2266 | 2267 |
| 2267 // IFrames are special, because we hook compositing layers together across ifram
e boundaries | 2268 // IFrames are special, because we hook compositing layers together across ifram
e boundaries |
| 2268 // when both parent and iframe content are composited. So when this frame become
s composited, we have | 2269 // when both parent and iframe content are composited. So when this frame become
s composited, we have |
| 2269 // to use a synthetic style change to get the iframes into RenderLayers in order
to allow them to composite. | 2270 // to use a synthetic style change to get the iframes into RenderLayers in order
to allow them to composite. |
| 2270 void RenderLayerCompositor::notifyIFramesOfCompositingChange() | 2271 void RenderLayerCompositor::notifyIFramesOfCompositingChange() |
| 2271 { | 2272 { |
| 2272 if (!m_renderView->frameView()) | 2273 if (!m_renderView->frameView()) |
| 2273 return; | 2274 return; |
| (...skipping 174 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2448 } else if (graphicsLayer == m_scrollLayer.get()) { | 2449 } else if (graphicsLayer == m_scrollLayer.get()) { |
| 2449 name = "Frame Scrolling Layer"; | 2450 name = "Frame Scrolling Layer"; |
| 2450 } else { | 2451 } else { |
| 2451 ASSERT_NOT_REACHED(); | 2452 ASSERT_NOT_REACHED(); |
| 2452 } | 2453 } |
| 2453 | 2454 |
| 2454 return name; | 2455 return name; |
| 2455 } | 2456 } |
| 2456 | 2457 |
| 2457 } // namespace WebCore | 2458 } // namespace WebCore |
| OLD | NEW |