OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2010 Google Inc. All rights reserved. | 2 * Copyright (C) 2010 Google Inc. All rights reserved. |
3 * Copyright (C) 2009 Apple Inc. All rights reserved. | 3 * Copyright (C) 2009 Apple Inc. 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 are | 6 * modification, are permitted provided that the following conditions are |
7 * met: | 7 * met: |
8 * | 8 * |
9 * * Redistributions of source code must retain the above copyright | 9 * * Redistributions of source code must retain the above copyright |
10 * notice, this list of conditions and the following disclaimer. | 10 * notice, this list of conditions and the following disclaimer. |
(...skipping 25 matching lines...) Expand all Loading... |
36 * Ideally the common code (mostly the code that keeps track of the layer hierar
chy) | 36 * Ideally the common code (mostly the code that keeps track of the layer hierar
chy) |
37 * should be kept separate and shared between platforms. It would be a well wort
hwhile | 37 * should be kept separate and shared between platforms. It would be a well wort
hwhile |
38 * effort once the Windows implementation (binaries and headers) of CoreAnimatio
n is | 38 * effort once the Windows implementation (binaries and headers) of CoreAnimatio
n is |
39 * checked in to the WebKit repository. Until then only Apple can make this happ
en. | 39 * checked in to the WebKit repository. Until then only Apple can make this happ
en. |
40 */ | 40 */ |
41 | 41 |
42 #include "config.h" | 42 #include "config.h" |
43 | 43 |
44 #include "core/platform/graphics/chromium/GraphicsLayerChromium.h" | 44 #include "core/platform/graphics/chromium/GraphicsLayerChromium.h" |
45 | 45 |
46 #include "SkImageFilter.h" | |
47 #include "SkMatrix44.h" | |
48 #include "core/platform/FloatConversion.h" | |
49 #include "core/platform/PlatformMemoryInstrumentation.h" | |
50 #include "core/platform/ScrollableArea.h" | 46 #include "core/platform/ScrollableArea.h" |
51 #include "core/platform/graphics/FloatRect.h" | |
52 #include "core/platform/graphics/GraphicsContext.h" | |
53 #include "core/platform/graphics/GraphicsLayerFactory.h" | 47 #include "core/platform/graphics/GraphicsLayerFactory.h" |
54 #include "core/platform/graphics/Image.h" | |
55 #include "core/platform/graphics/chromium/AnimationTranslationUtil.h" | |
56 #include "core/platform/graphics/chromium/TransformSkMatrix44Conversions.h" | |
57 #include "core/platform/graphics/filters/SkiaImageFilterBuilder.h" | |
58 #include "core/platform/graphics/skia/NativeImageSkia.h" | |
59 #include <public/Platform.h> | 48 #include <public/Platform.h> |
60 #include <public/WebAnimation.h> | 49 #include <public/WebAnimation.h> |
61 #include <public/WebCompositorSupport.h> | 50 #include <public/WebCompositorSupport.h> |
62 #include <public/WebContentLayer.h> | 51 #include <public/WebContentLayer.h> |
63 #include <public/WebFilterOperation.h> | 52 #include <public/WebFilterOperation.h> |
64 #include <public/WebFilterOperations.h> | 53 #include <public/WebFilterOperations.h> |
65 #include <public/WebFloatPoint.h> | 54 #include <public/WebFloatPoint.h> |
66 #include <public/WebFloatRect.h> | 55 #include <public/WebFloatRect.h> |
67 #include <public/WebImageLayer.h> | 56 #include <public/WebImageLayer.h> |
68 #include <public/WebSize.h> | 57 #include <public/WebSize.h> |
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
127 if (m_scrollableArea) | 116 if (m_scrollableArea) |
128 m_scrollableArea->scrollToOffsetWithoutAnimation(m_scrollableArea->minim
umScrollPosition() + toIntSize(m_layer->layer()->scrollPosition())); | 117 m_scrollableArea->scrollToOffsetWithoutAnimation(m_scrollableArea->minim
umScrollPosition() + toIntSize(m_layer->layer()->scrollPosition())); |
129 } | 118 } |
130 | 119 |
131 void GraphicsLayerChromium::setAnimationDelegateForLayer(WebKit::WebLayer* layer
) | 120 void GraphicsLayerChromium::setAnimationDelegateForLayer(WebKit::WebLayer* layer
) |
132 { | 121 { |
133 layer->setAnimationDelegate(this); | 122 layer->setAnimationDelegate(this); |
134 } | 123 } |
135 | 124 |
136 } // namespace WebCore | 125 } // namespace WebCore |
OLD | NEW |