| 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 149 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 160 : m_owningLayer(layer) | 160 : m_owningLayer(layer) |
| 161 , m_animationProvider(adoptPtr(new WebAnimationProvider)) | 161 , m_animationProvider(adoptPtr(new WebAnimationProvider)) |
| 162 , m_artificiallyInflatedBounds(false) | 162 , m_artificiallyInflatedBounds(false) |
| 163 , m_boundsConstrainedByClipping(false) | 163 , m_boundsConstrainedByClipping(false) |
| 164 , m_isMainFrameRenderViewLayer(false) | 164 , m_isMainFrameRenderViewLayer(false) |
| 165 , m_requiresOwnBackingStoreForIntrinsicReasons(true) | 165 , m_requiresOwnBackingStoreForIntrinsicReasons(true) |
| 166 , m_requiresOwnBackingStoreForAncestorReasons(true) | 166 , m_requiresOwnBackingStoreForAncestorReasons(true) |
| 167 , m_canCompositeFilters(false) | 167 , m_canCompositeFilters(false) |
| 168 , m_backgroundLayerPaintsFixedRootBackground(false) | 168 , m_backgroundLayerPaintsFixedRootBackground(false) |
| 169 { | 169 { |
| 170 if (layer->isRootLayer()) { | 170 if (layer->isRootLayer() && renderer()->frame()->isMainFrame()) |
| 171 Frame& frame = toRenderView(renderer())->frameView()->frame(); | 171 m_isMainFrameRenderViewLayer = true; |
| 172 Page* page = frame.page(); | |
| 173 if (page && page->mainFrame() == &frame) { | |
| 174 m_isMainFrameRenderViewLayer = true; | |
| 175 } | |
| 176 } | |
| 177 | 172 |
| 178 createPrimaryGraphicsLayer(); | 173 createPrimaryGraphicsLayer(); |
| 179 } | 174 } |
| 180 | 175 |
| 181 CompositedLayerMapping::~CompositedLayerMapping() | 176 CompositedLayerMapping::~CompositedLayerMapping() |
| 182 { | 177 { |
| 183 updateClippingLayers(false, false); | 178 updateClippingLayers(false, false); |
| 184 updateOverflowControlsLayers(false, false, false); | 179 updateOverflowControlsLayers(false, false, false); |
| 185 updateForegroundLayer(false); | 180 updateForegroundLayer(false); |
| 186 updateBackgroundLayer(false); | 181 updateBackgroundLayer(false); |
| (...skipping 1838 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2025 } else if (graphicsLayer == m_scrollingContentsLayer.get()) { | 2020 } else if (graphicsLayer == m_scrollingContentsLayer.get()) { |
| 2026 name = "Scrolling Contents Layer"; | 2021 name = "Scrolling Contents Layer"; |
| 2027 } else { | 2022 } else { |
| 2028 ASSERT_NOT_REACHED(); | 2023 ASSERT_NOT_REACHED(); |
| 2029 } | 2024 } |
| 2030 | 2025 |
| 2031 return name; | 2026 return name; |
| 2032 } | 2027 } |
| 2033 | 2028 |
| 2034 } // namespace WebCore | 2029 } // namespace WebCore |
| OLD | NEW |