| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2009 Apple Inc. All rights reserved. | 2 * Copyright (C) 2009 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 172 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 183 bool canBeComposited(const RenderLayer*) const; | 183 bool canBeComposited(const RenderLayer*) const; |
| 184 | 184 |
| 185 // FIXME: Move allocateOrClearCompositedLayerMapping to CompositingLayerAssi
gner once we've fixed | 185 // FIXME: Move allocateOrClearCompositedLayerMapping to CompositingLayerAssi
gner once we've fixed |
| 186 // the compositing chicken/egg issues. | 186 // the compositing chicken/egg issues. |
| 187 bool allocateOrClearCompositedLayerMapping(RenderLayer*, CompositingStateTra
nsitionType compositedLayerUpdate); | 187 bool allocateOrClearCompositedLayerMapping(RenderLayer*, CompositingStateTra
nsitionType compositedLayerUpdate); |
| 188 | 188 |
| 189 void updateDirectCompositingReasons(RenderLayer*); | 189 void updateDirectCompositingReasons(RenderLayer*); |
| 190 | 190 |
| 191 void setOverlayLayer(GraphicsLayer*); | 191 void setOverlayLayer(GraphicsLayer*); |
| 192 | 192 |
| 193 bool inOverlayFullscreenVideo() const { return m_inOverlayFullscreenVideo; } |
| 194 |
| 193 private: | 195 private: |
| 194 class OverlapMap; | 196 class OverlapMap; |
| 195 | 197 |
| 196 #if ASSERT_ENABLED | 198 #if ASSERT_ENABLED |
| 197 void assertNoUnresolvedDirtyBits(); | 199 void assertNoUnresolvedDirtyBits(); |
| 198 #endif | 200 #endif |
| 199 | 201 |
| 200 // Make updates to the layer based on viewport-constrained properties such a
s position:fixed. This can in turn affect | 202 // Make updates to the layer based on viewport-constrained properties such a
s position:fixed. This can in turn affect |
| 201 // compositing. | 203 // compositing. |
| 202 bool updateLayerIfViewportConstrained(RenderLayer*); | 204 bool updateLayerIfViewportConstrained(RenderLayer*); |
| (...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 277 // Enclosing layer for overflow controls and the clipping layer | 279 // Enclosing layer for overflow controls and the clipping layer |
| 278 OwnPtr<GraphicsLayer> m_overflowControlsHostLayer; | 280 OwnPtr<GraphicsLayer> m_overflowControlsHostLayer; |
| 279 | 281 |
| 280 // Layers for overflow controls | 282 // Layers for overflow controls |
| 281 OwnPtr<GraphicsLayer> m_layerForHorizontalScrollbar; | 283 OwnPtr<GraphicsLayer> m_layerForHorizontalScrollbar; |
| 282 OwnPtr<GraphicsLayer> m_layerForVerticalScrollbar; | 284 OwnPtr<GraphicsLayer> m_layerForVerticalScrollbar; |
| 283 OwnPtr<GraphicsLayer> m_layerForScrollCorner; | 285 OwnPtr<GraphicsLayer> m_layerForScrollCorner; |
| 284 #if USE(RUBBER_BANDING) | 286 #if USE(RUBBER_BANDING) |
| 285 OwnPtr<GraphicsLayer> m_layerForOverhangShadow; | 287 OwnPtr<GraphicsLayer> m_layerForOverhangShadow; |
| 286 #endif | 288 #endif |
| 289 |
| 290 bool m_inOverlayFullscreenVideo; |
| 287 }; | 291 }; |
| 288 | 292 |
| 289 } // namespace WebCore | 293 } // namespace WebCore |
| 290 | 294 |
| 291 #endif // RenderLayerCompositor_h | 295 #endif // RenderLayerCompositor_h |
| OLD | NEW |