| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2010 Google Inc. All rights reserved. | 2 * Copyright (C) 2010 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * 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 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 115 | 115 |
| 116 static void registerContentsLayer(WebKit::WebLayer*); | 116 static void registerContentsLayer(WebKit::WebLayer*); |
| 117 static void unregisterContentsLayer(WebKit::WebLayer*); | 117 static void unregisterContentsLayer(WebKit::WebLayer*); |
| 118 | 118 |
| 119 virtual void setContentsToImage(Image*) OVERRIDE; | 119 virtual void setContentsToImage(Image*) OVERRIDE; |
| 120 virtual void setContentsToMedia(PlatformLayer*) OVERRIDE; | 120 virtual void setContentsToMedia(PlatformLayer*) OVERRIDE; |
| 121 virtual void setContentsToCanvas(PlatformLayer*) OVERRIDE; | 121 virtual void setContentsToCanvas(PlatformLayer*) OVERRIDE; |
| 122 virtual void setContentsToSolidColor(const Color&) OVERRIDE; | 122 virtual void setContentsToSolidColor(const Color&) OVERRIDE; |
| 123 virtual bool hasContentsLayer() const { return m_contentsLayer; } | 123 virtual bool hasContentsLayer() const { return m_contentsLayer; } |
| 124 | 124 |
| 125 virtual bool addAnimation(const KeyframeValueList&, const IntSize& boxSize,
const CSSAnimationData*, const String&, double timeOffset); | 125 virtual bool addAnimation(const KeyframeValueList&, const IntSize& boxSize,
const StyleAnimationData*, const String&, double timeOffset); |
| 126 virtual void pauseAnimation(const String& animationName, double timeOffset); | 126 virtual void pauseAnimation(const String& animationName, double timeOffset); |
| 127 virtual void removeAnimation(const String& animationName); | 127 virtual void removeAnimation(const String& animationName); |
| 128 virtual void suspendAnimations(double wallClockTime); | 128 virtual void suspendAnimations(double wallClockTime); |
| 129 virtual void resumeAnimations(); | 129 virtual void resumeAnimations(); |
| 130 | 130 |
| 131 void setLinkHighlight(LinkHighlightClient*); | 131 void setLinkHighlight(LinkHighlightClient*); |
| 132 // Next function for testing purposes. | 132 // Next function for testing purposes. |
| 133 LinkHighlightClient* linkHighlight() { return m_linkHighlight; } | 133 LinkHighlightClient* linkHighlight() { return m_linkHighlight; } |
| 134 | 134 |
| 135 virtual WebKit::WebLayer* platformLayer() const; | 135 virtual WebKit::WebLayer* platformLayer() const; |
| (...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 210 | 210 |
| 211 typedef HashMap<String, int> AnimationIdMap; | 211 typedef HashMap<String, int> AnimationIdMap; |
| 212 AnimationIdMap m_animationIdMap; | 212 AnimationIdMap m_animationIdMap; |
| 213 | 213 |
| 214 ScrollableArea* m_scrollableArea; | 214 ScrollableArea* m_scrollableArea; |
| 215 }; | 215 }; |
| 216 | 216 |
| 217 } // namespace WebCore | 217 } // namespace WebCore |
| 218 | 218 |
| 219 #endif | 219 #endif |
| OLD | NEW |