| 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 247 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 258 } | 258 } |
| 259 void clearNeedsGraphicsLayerUpdate() { | 259 void clearNeedsGraphicsLayerUpdate() { |
| 260 m_pendingUpdateScope = GraphicsLayerUpdateNone; | 260 m_pendingUpdateScope = GraphicsLayerUpdateNone; |
| 261 } | 261 } |
| 262 | 262 |
| 263 GraphicsLayerUpdater::UpdateType updateTypeForChildren( | 263 GraphicsLayerUpdater::UpdateType updateTypeForChildren( |
| 264 GraphicsLayerUpdater::UpdateType) const; | 264 GraphicsLayerUpdater::UpdateType) const; |
| 265 | 265 |
| 266 #if DCHECK_IS_ON() | 266 #if DCHECK_IS_ON() |
| 267 void assertNeedsToUpdateGraphicsLayerBitsCleared() { | 267 void assertNeedsToUpdateGraphicsLayerBitsCleared() { |
| 268 ASSERT(m_pendingUpdateScope == GraphicsLayerUpdateNone); | 268 DCHECK_EQ(m_pendingUpdateScope, |
| 269 static_cast<unsigned>(GraphicsLayerUpdateNone)); |
| 269 } | 270 } |
| 270 #endif | 271 #endif |
| 271 | 272 |
| 272 String debugName(const GraphicsLayer*) const override; | 273 String debugName(const GraphicsLayer*) const override; |
| 273 | 274 |
| 274 LayoutSize contentOffsetInCompositingLayer() const; | 275 LayoutSize contentOffsetInCompositingLayer() const; |
| 275 | 276 |
| 276 LayoutPoint squashingOffsetFromTransformedAncestor() { | 277 LayoutPoint squashingOffsetFromTransformedAncestor() { |
| 277 return m_squashingLayerOffsetFromTransformedAncestor; | 278 return m_squashingLayerOffsetFromTransformedAncestor; |
| 278 } | 279 } |
| (...skipping 422 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 701 unsigned m_backgroundPaintsOntoGraphicsLayer : 1; | 702 unsigned m_backgroundPaintsOntoGraphicsLayer : 1; |
| 702 | 703 |
| 703 bool m_drawsBackgroundOntoContentLayer; | 704 bool m_drawsBackgroundOntoContentLayer; |
| 704 | 705 |
| 705 friend class CompositedLayerMappingTest; | 706 friend class CompositedLayerMappingTest; |
| 706 }; | 707 }; |
| 707 | 708 |
| 708 } // namespace blink | 709 } // namespace blink |
| 709 | 710 |
| 710 #endif // CompositedLayerMapping_h | 711 #endif // CompositedLayerMapping_h |
| OLD | NEW |