Chromium Code Reviews| 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 284 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 295 // GraphicsContextPainter implementation. | 295 // GraphicsContextPainter implementation. |
| 296 virtual void paint(GraphicsContext&, const IntRect& clip) OVERRIDE; | 296 virtual void paint(GraphicsContext&, const IntRect& clip) OVERRIDE; |
| 297 | 297 |
| 298 // WebAnimationDelegate implementation. | 298 // WebAnimationDelegate implementation. |
| 299 virtual void notifyAnimationStarted(double wallClockTime, double monotonicTi me, blink::WebAnimation::TargetProperty) OVERRIDE; | 299 virtual void notifyAnimationStarted(double wallClockTime, double monotonicTi me, blink::WebAnimation::TargetProperty) OVERRIDE; |
| 300 virtual void notifyAnimationFinished(double wallClockTime, double monotonicT ime, blink::WebAnimation::TargetProperty) OVERRIDE; | 300 virtual void notifyAnimationFinished(double wallClockTime, double monotonicT ime, blink::WebAnimation::TargetProperty) OVERRIDE; |
| 301 | 301 |
| 302 // WebLayerScrollClient implementation. | 302 // WebLayerScrollClient implementation. |
| 303 virtual void didScroll() OVERRIDE; | 303 virtual void didScroll() OVERRIDE; |
| 304 | 304 |
| 305 // Exposed for use in PinchViewports.cpp. | |
|
enne (OOO)
2014/01/14 22:43:55
comment nit: I think this is a little over-specifi
jamesr
2014/01/14 22:48:58
yeah, it doesn't make sense for a comment in /plat
wjmaclean
2014/01/14 23:55:29
Based on James' other comment, I have removed this
| |
| 306 virtual blink::WebLayer* contentsLayer() const { return m_contentsLayer; } | |
| 307 | |
| 305 protected: | 308 protected: |
| 306 explicit GraphicsLayer(GraphicsLayerClient*); | 309 explicit GraphicsLayer(GraphicsLayerClient*); |
| 307 // GraphicsLayerFactoryChromium that wants to create a GraphicsLayer need to be friends. | 310 // GraphicsLayerFactoryChromium that wants to create a GraphicsLayer need to be friends. |
| 308 friend class blink::GraphicsLayerFactoryChromium; | 311 friend class blink::GraphicsLayerFactoryChromium; |
| 309 | 312 |
| 310 // Exposed for tests. | |
| 311 virtual blink::WebLayer* contentsLayer() const { return m_contentsLayer; } | |
| 312 | |
| 313 private: | 313 private: |
| 314 // Adds a child without calling updateChildList(), so that adding children | 314 // Adds a child without calling updateChildList(), so that adding children |
| 315 // can be batched before updating. | 315 // can be batched before updating. |
| 316 void addChildInternal(GraphicsLayer*); | 316 void addChildInternal(GraphicsLayer*); |
| 317 | 317 |
| 318 // This method is used by platform GraphicsLayer classes to clear the filter s | 318 // This method is used by platform GraphicsLayer classes to clear the filter s |
| 319 // when compositing is not done in hardware. It is not virtual, so the calle r | 319 // when compositing is not done in hardware. It is not virtual, so the calle r |
| 320 // needs to notifiy the change to the platform layer as needed. | 320 // needs to notifiy the change to the platform layer as needed. |
| 321 void clearFilters() { m_filters.clear(); } | 321 void clearFilters() { m_filters.clear(); } |
| 322 | 322 |
| (...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 409 | 409 |
| 410 | 410 |
| 411 } // namespace WebCore | 411 } // namespace WebCore |
| 412 | 412 |
| 413 #ifndef NDEBUG | 413 #ifndef NDEBUG |
| 414 // Outside the WebCore namespace for ease of invocation from gdb. | 414 // Outside the WebCore namespace for ease of invocation from gdb. |
| 415 void showGraphicsLayerTree(const WebCore::GraphicsLayer* layer); | 415 void showGraphicsLayerTree(const WebCore::GraphicsLayer* layer); |
| 416 #endif | 416 #endif |
| 417 | 417 |
| 418 #endif // GraphicsLayer_h | 418 #endif // GraphicsLayer_h |
| OLD | NEW |