| 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 353 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 364 // We don't have ownership of m_contentsLayer, but we do want to know if a g
iven layer is the | 364 // We don't have ownership of m_contentsLayer, but we do want to know if a g
iven layer is the |
| 365 // same as our current layer in setContentsTo(). Since m_contentsLayer may b
e deleted at this point, | 365 // same as our current layer in setContentsTo(). Since m_contentsLayer may b
e deleted at this point, |
| 366 // we stash an ID away when we know m_contentsLayer is alive and use that fo
r comparisons from that point | 366 // we stash an ID away when we know m_contentsLayer is alive and use that fo
r comparisons from that point |
| 367 // on. | 367 // on. |
| 368 int m_contentsLayerId; | 368 int m_contentsLayerId; |
| 369 | 369 |
| 370 Vector<LinkHighlight*> m_linkHighlights; | 370 Vector<LinkHighlight*> m_linkHighlights; |
| 371 | 371 |
| 372 OwnPtr<ContentLayerDelegate> m_contentLayerDelegate; | 372 OwnPtr<ContentLayerDelegate> m_contentLayerDelegate; |
| 373 | 373 |
| 374 RawPtrWillBeWeakPersistent<ScrollableArea> m_scrollableArea; | 374 WeakPersistent<ScrollableArea> m_scrollableArea; |
| 375 GraphicsLayerDebugInfo m_debugInfo; | 375 GraphicsLayerDebugInfo m_debugInfo; |
| 376 int m_3dRenderingContext; | 376 int m_3dRenderingContext; |
| 377 | 377 |
| 378 OwnPtr<PaintController> m_paintController; | 378 OwnPtr<PaintController> m_paintController; |
| 379 | 379 |
| 380 IntRect m_previousInterestRect; | 380 IntRect m_previousInterestRect; |
| 381 }; | 381 }; |
| 382 | 382 |
| 383 } // namespace blink | 383 } // namespace blink |
| 384 | 384 |
| 385 #ifndef NDEBUG | 385 #ifndef NDEBUG |
| 386 // Outside the blink namespace for ease of invocation from gdb. | 386 // Outside the blink namespace for ease of invocation from gdb. |
| 387 void PLATFORM_EXPORT showGraphicsLayerTree(const blink::GraphicsLayer*); | 387 void PLATFORM_EXPORT showGraphicsLayerTree(const blink::GraphicsLayer*); |
| 388 #endif | 388 #endif |
| 389 | 389 |
| 390 #endif // GraphicsLayer_h | 390 #endif // GraphicsLayer_h |
| OLD | NEW |