| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2009 Apple Inc. All rights reserved. | 2 * Copyright (C) 2009 Apple Inc. All rights reserved. |
| 3 * Copyright (C) 2013 Intel Corporation. All rights reserved. | 3 * Copyright (C) 2013 Intel Corporation. All rights reserved. |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions | 6 * modification, are permitted provided that the following conditions |
| 7 * are met: | 7 * are met: |
| 8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
| (...skipping 251 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 262 WebLayer* contentsLayer() const { return m_contentsLayer; } | 262 WebLayer* contentsLayer() const { return m_contentsLayer; } |
| 263 | 263 |
| 264 static void setDrawDebugRedFillForTesting(bool); | 264 static void setDrawDebugRedFillForTesting(bool); |
| 265 ContentLayerDelegate* contentLayerDelegateForTesting() const { return m_cont
entLayerDelegate.get(); } | 265 ContentLayerDelegate* contentLayerDelegateForTesting() const { return m_cont
entLayerDelegate.get(); } |
| 266 | 266 |
| 267 DisplayItemClient displayItemClient() const { return toDisplayItemClient(thi
s); } | 267 DisplayItemClient displayItemClient() const { return toDisplayItemClient(thi
s); } |
| 268 String debugName() const { return m_client->debugName(this); } | 268 String debugName() const { return m_client->debugName(this); } |
| 269 | 269 |
| 270 protected: | 270 protected: |
| 271 String debugName(cc::Layer*) const; | 271 String debugName(cc::Layer*) const; |
| 272 bool shouldFlattenTransform() const { return m_shouldFlattenTransform; } |
| 272 | 273 |
| 273 explicit GraphicsLayer(GraphicsLayerClient*); | 274 explicit GraphicsLayer(GraphicsLayerClient*); |
| 274 // GraphicsLayerFactoryChromium that wants to create a GraphicsLayer need to
be friends. | 275 // GraphicsLayerFactoryChromium that wants to create a GraphicsLayer need to
be friends. |
| 275 friend class GraphicsLayerFactoryChromium; | 276 friend class GraphicsLayerFactoryChromium; |
| 276 // for testing | 277 // for testing |
| 277 friend class CompositedLayerMappingTest; | 278 friend class CompositedLayerMappingTest; |
| 278 friend class FakeGraphicsLayerFactory; | 279 friend class FakeGraphicsLayerFactory; |
| 280 friend class CompositedLayerMappingTest; |
| 279 | 281 |
| 280 private: | 282 private: |
| 281 // Adds a child without calling updateChildList(), so that adding children | 283 // Adds a child without calling updateChildList(), so that adding children |
| 282 // can be batched before updating. | 284 // can be batched before updating. |
| 283 void addChildInternal(GraphicsLayer*); | 285 void addChildInternal(GraphicsLayer*); |
| 284 | 286 |
| 285 #if ENABLE(ASSERT) | 287 #if ENABLE(ASSERT) |
| 286 bool hasAncestor(GraphicsLayer*) const; | 288 bool hasAncestor(GraphicsLayer*) const; |
| 287 #endif | 289 #endif |
| 288 | 290 |
| (...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 378 }; | 380 }; |
| 379 | 381 |
| 380 } // namespace blink | 382 } // namespace blink |
| 381 | 383 |
| 382 #ifndef NDEBUG | 384 #ifndef NDEBUG |
| 383 // Outside the blink namespace for ease of invocation from gdb. | 385 // Outside the blink namespace for ease of invocation from gdb. |
| 384 void PLATFORM_EXPORT showGraphicsLayerTree(const blink::GraphicsLayer*); | 386 void PLATFORM_EXPORT showGraphicsLayerTree(const blink::GraphicsLayer*); |
| 385 #endif | 387 #endif |
| 386 | 388 |
| 387 #endif // GraphicsLayer_h | 389 #endif // GraphicsLayer_h |
| OLD | NEW |