| 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 248 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 259 std::unique_ptr<base::trace_event::ConvertableToTraceFormat> TakeDebugInfo( | 259 std::unique_ptr<base::trace_event::ConvertableToTraceFormat> TakeDebugInfo( |
| 260 cc::Layer*) override; | 260 cc::Layer*) override; |
| 261 void didUpdateMainThreadScrollingReasons() override; | 261 void didUpdateMainThreadScrollingReasons() override; |
| 262 | 262 |
| 263 PaintController& getPaintController(); | 263 PaintController& getPaintController(); |
| 264 | 264 |
| 265 // Exposed for tests. | 265 // Exposed for tests. |
| 266 WebLayer* contentsLayer() const { return m_contentsLayer; } | 266 WebLayer* contentsLayer() const { return m_contentsLayer; } |
| 267 | 267 |
| 268 void setElementId(const CompositorElementId&); | 268 void setElementId(const CompositorElementId&); |
| 269 CompositorElementId elementId() const; |
| 270 |
| 269 void setCompositorMutableProperties(uint32_t); | 271 void setCompositorMutableProperties(uint32_t); |
| 270 | 272 |
| 271 ContentLayerDelegate* contentLayerDelegateForTesting() const { | 273 ContentLayerDelegate* contentLayerDelegateForTesting() const { |
| 272 return m_contentLayerDelegate.get(); | 274 return m_contentLayerDelegate.get(); |
| 273 } | 275 } |
| 274 | 276 |
| 275 // DisplayItemClient methods | 277 // DisplayItemClient methods |
| 276 String debugName() const final { return m_client->debugName(this); } | 278 String debugName() const final { return m_client->debugName(this); } |
| 277 LayoutRect visualRect() const override; | 279 LayoutRect visualRect() const override; |
| 278 | 280 |
| (...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 398 }; | 400 }; |
| 399 | 401 |
| 400 } // namespace blink | 402 } // namespace blink |
| 401 | 403 |
| 402 #ifndef NDEBUG | 404 #ifndef NDEBUG |
| 403 // Outside the blink namespace for ease of invocation from gdb. | 405 // Outside the blink namespace for ease of invocation from gdb. |
| 404 void PLATFORM_EXPORT showGraphicsLayerTree(const blink::GraphicsLayer*); | 406 void PLATFORM_EXPORT showGraphicsLayerTree(const blink::GraphicsLayer*); |
| 405 #endif | 407 #endif |
| 406 | 408 |
| 407 #endif // GraphicsLayer_h | 409 #endif // GraphicsLayer_h |
| OLD | NEW |