| 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 334 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 345 // We don't have ownership of m_contentsLayer, but we do want to know if a g
iven layer is the | 345 // We don't have ownership of m_contentsLayer, but we do want to know if a g
iven layer is the |
| 346 // same as our current layer in setContentsTo(). Since m_contentsLayer may b
e deleted at this point, | 346 // same as our current layer in setContentsTo(). Since m_contentsLayer may b
e deleted at this point, |
| 347 // we stash an ID away when we know m_contentsLayer is alive and use that fo
r comparisons from that point | 347 // we stash an ID away when we know m_contentsLayer is alive and use that fo
r comparisons from that point |
| 348 // on. | 348 // on. |
| 349 int m_contentsLayerId; | 349 int m_contentsLayerId; |
| 350 | 350 |
| 351 Vector<LinkHighlight*> m_linkHighlights; | 351 Vector<LinkHighlight*> m_linkHighlights; |
| 352 | 352 |
| 353 OwnPtr<ContentLayerDelegate> m_contentLayerDelegate; | 353 OwnPtr<ContentLayerDelegate> m_contentLayerDelegate; |
| 354 | 354 |
| 355 RawPtrWillBeWeakPersistent<ScrollableArea> m_scrollableArea; | 355 WeakPersistent<ScrollableArea> m_scrollableArea; |
| 356 GraphicsLayerDebugInfo m_debugInfo; | 356 GraphicsLayerDebugInfo m_debugInfo; |
| 357 int m_3dRenderingContext; | 357 int m_3dRenderingContext; |
| 358 | 358 |
| 359 OwnPtr<PaintController> m_paintController; | 359 OwnPtr<PaintController> m_paintController; |
| 360 | 360 |
| 361 IntRect m_previousInterestRect; | 361 IntRect m_previousInterestRect; |
| 362 }; | 362 }; |
| 363 | 363 |
| 364 } // namespace blink | 364 } // namespace blink |
| 365 | 365 |
| 366 #ifndef NDEBUG | 366 #ifndef NDEBUG |
| 367 // Outside the blink namespace for ease of invocation from gdb. | 367 // Outside the blink namespace for ease of invocation from gdb. |
| 368 void PLATFORM_EXPORT showGraphicsLayerTree(const blink::GraphicsLayer*); | 368 void PLATFORM_EXPORT showGraphicsLayerTree(const blink::GraphicsLayer*); |
| 369 #endif | 369 #endif |
| 370 | 370 |
| 371 #endif // GraphicsLayer_h | 371 #endif // GraphicsLayer_h |
| OLD | NEW |