Changeset 122484 in webkit


Ignore:
Timestamp:
Jul 12, 2012 11:14:09 AM (12 years ago)
Author:
noam.rosenthal@nokia.com
Message:

Move TextureMapperAnimation and texmap/LayerTransform to platform/graphics
https://bugs.webkit.org/show_bug.cgi?id=91111

Reviewed by Kenneth Rohde Christiansen.

Source/WebCore:

TextureMapperAnimation and LayerTransform are not specific to TextureMapper, and we want
to use them for other purposes as well. Moving them to platform/graphics would make that
more explicit.

No new tests, moving files around.

  • GNUmakefile.list.am:
  • Target.pri:
  • WebCore.gypi:
  • platform/graphics/GraphicsLayerAnimation.cpp: Renamed from Source/WebCore/platform/graphics/texmap/TextureMapperAnimation.cpp.
  • platform/graphics/GraphicsLayerAnimation.h: Renamed from Source/WebCore/platform/graphics/texmap/TextureMapperAnimation.h.
  • platform/graphics/GraphicsLayerTransform.cpp: Renamed from Source/WebCore/platform/graphics/texmap/LayerTransform.cpp.
  • platform/graphics/GraphicsLayerTransform.h: Renamed from Source/WebCore/platform/graphics/texmap/LayerTransform.h.
  • platform/graphics/texmap/GraphicsLayerTextureMapper.cpp:

(WebCore::GraphicsLayerTextureMapper::addAnimation):

  • platform/graphics/texmap/GraphicsLayerTextureMapper.h:

(GraphicsLayerTextureMapper):

  • platform/graphics/texmap/TextureMapperLayer.h:

(TextureMapperLayer):
(WebCore::TextureMapperLayer::setAnimatedTransform):
(WebCore::TextureMapperLayer::setAnimatedOpacity):

Source/WebKit2:

Include the new filenames.

  • WebProcess/WebPage/LayerTreeCoordinator/WebGraphicsLayer.h:

(WebGraphicsLayer):

Location:
trunk/Source
Files:
9 edited
4 moved

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r122482 r122484  
     12012-07-12  No'am Rosenthal  <noam.rosenthal@nokia.com>
     2
     3        Move TextureMapperAnimation and texmap/LayerTransform to platform/graphics
     4        https://bugs.webkit.org/show_bug.cgi?id=91111
     5
     6        Reviewed by Kenneth Rohde Christiansen.
     7
     8        TextureMapperAnimation and LayerTransform are not specific to TextureMapper, and we want
     9        to use them for other purposes as well. Moving them to platform/graphics would make that
     10        more explicit.
     11
     12        No new tests, moving files around.
     13
     14        * GNUmakefile.list.am:
     15        * Target.pri:
     16        * WebCore.gypi:
     17        * platform/graphics/GraphicsLayerAnimation.cpp: Renamed from Source/WebCore/platform/graphics/texmap/TextureMapperAnimation.cpp.
     18        * platform/graphics/GraphicsLayerAnimation.h: Renamed from Source/WebCore/platform/graphics/texmap/TextureMapperAnimation.h.
     19        * platform/graphics/GraphicsLayerTransform.cpp: Renamed from Source/WebCore/platform/graphics/texmap/LayerTransform.cpp.
     20        * platform/graphics/GraphicsLayerTransform.h: Renamed from Source/WebCore/platform/graphics/texmap/LayerTransform.h.
     21        * platform/graphics/texmap/GraphicsLayerTextureMapper.cpp:
     22        (WebCore::GraphicsLayerTextureMapper::addAnimation):
     23        * platform/graphics/texmap/GraphicsLayerTextureMapper.h:
     24        (GraphicsLayerTextureMapper):
     25        * platform/graphics/texmap/TextureMapperLayer.h:
     26        (TextureMapperLayer):
     27        (WebCore::TextureMapperLayer::setAnimatedTransform):
     28        (WebCore::TextureMapperLayer::setAnimatedOpacity):
     29
    1302012-07-12  Vsevolod Vlasov  <vsevik@chromium.org>
    231
  • trunk/Source/WebCore/GNUmakefile.list.am

    r122445 r122484  
    61236123        Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.cpp \
    61246124        Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.h \
    6125         Source/WebCore/platform/graphics/texmap/LayerTransform.cpp \
    6126         Source/WebCore/platform/graphics/texmap/LayerTransform.h \
    6127         Source/WebCore/platform/graphics/texmap/TextureMapperAnimation.cpp \
    6128         Source/WebCore/platform/graphics/texmap/TextureMapperAnimation.h \
     6125        Source/WebCore/platform/graphics/GraphicsLayerTransform.cpp \
     6126        Source/WebCore/platform/graphics/GraphicsLayerTransform.h \
     6127        Source/WebCore/platform/graphics/GraphicsLayerAnimation.cpp \
     6128        Source/WebCore/platform/graphics/GraphicsLayerAnimation.h \
    61296129        Source/WebCore/platform/graphics/texmap/TextureMapperBackingStore.cpp \
    61306130        Source/WebCore/platform/graphics/texmap/TextureMapperBackingStore.h \
     
    61466146        Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.cpp \
    61476147        Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.h \
    6148         Source/WebCore/platform/graphics/texmap/LayerTransform.cpp \
    6149         Source/WebCore/platform/graphics/texmap/LayerTransform.h \
    6150         Source/WebCore/platform/graphics/texmap/TextureMapperAnimation.cpp \
    6151         Source/WebCore/platform/graphics/texmap/TextureMapperAnimation.h \
     6148        Source/WebCore/platform/graphics/GraphicsLayerTransform.cpp \
     6149        Source/WebCore/platform/graphics/GraphicsLayerTransform.h \
     6150        Source/WebCore/platform/graphics/GraphicsLayerAnimation.cpp \
     6151        Source/WebCore/platform/graphics/GraphicsLayerAnimation.h \
    61526152        Source/WebCore/platform/graphics/texmap/TextureMapperBackingStore.cpp \
    61536153        Source/WebCore/platform/graphics/texmap/TextureMapperBackingStore.h \
  • trunk/Source/WebCore/Target.pri

    r122462 r122484  
    11201120    platform/graphics/GraphicsContext.cpp \
    11211121    platform/graphics/GraphicsLayer.cpp \
     1122    platform/graphics/GraphicsLayerAnimation.cpp \
     1123    platform/graphics/GraphicsLayerTransform.cpp \
    11221124    platform/graphics/GraphicsTypes.cpp \
    11231125    platform/graphics/Image.cpp \
     
    22952297    platform/graphics/GraphicsContext.h \
    22962298    platform/graphics/GraphicsLayer.h \
     2299    platform/graphics/GraphicsLayerAnimation.h \
    22972300    platform/graphics/GraphicsLayerClient.h \
     2301    platform/graphics/GraphicsLayerTransform.h \
    22982302    platform/graphics/GraphicsTypes.h \
    22992303    platform/graphics/GraphicsTypes3D.h \
     
    23192323    platform/graphics/surfaces/GraphicsSurface.h \
    23202324    platform/graphics/texmap/GraphicsLayerTextureMapper.h \
    2321     platform/graphics/texmap/LayerTransform.h \
    23222325    platform/graphics/texmap/TextureMapper.h \
    2323     platform/graphics/texmap/TextureMapperAnimation.h \
    23242326    platform/graphics/texmap/TextureMapperBackingStore.h \
    23252327    platform/graphics/texmap/TextureMapperImageBuffer.h \
     
    29372939    platform/graphics/qt/StillImageQt.cpp \
    29382940    platform/graphics/texmap/GraphicsLayerTextureMapper.cpp \
    2939     platform/graphics/texmap/LayerTransform.cpp \
    29402941    platform/graphics/texmap/TextureMapper.cpp \
    2941     platform/graphics/texmap/TextureMapperAnimation.cpp \
    29422942    platform/graphics/texmap/TextureMapperBackingStore.cpp \
    29432943    platform/graphics/texmap/TextureMapperImageBuffer.cpp \
  • trunk/Source/WebCore/WebCore.gypi

    r122445 r122484  
    34933493            'platform/graphics/GraphicsContext3D.cpp',
    34943494            'platform/graphics/GraphicsLayer.cpp',
     3495            'platform/graphics/GraphicsLayerAnimation.cpp',
     3496            'platform/graphics/GraphicsLayerAnimation.h',
     3497            'platform/graphics/GraphicsLayerTransform.cpp',
     3498            'platform/graphics/GraphicsLayerTransform.h',
    34953499            'platform/graphics/GraphicsTypes.cpp',
    34963500            'platform/graphics/Image.cpp',
     
    39073911            'platform/graphics/texmap/GraphicsLayerTextureMapper.cpp',
    39083912            'platform/graphics/texmap/GraphicsLayerTextureMapper.h',
    3909             'platform/graphics/texmap/LayerTransform.cpp',
    3910             'platform/graphics/texmap/LayerTransform.h',
    39113913            'platform/graphics/texmap/TextureMapper.cpp',
    39123914            'platform/graphics/texmap/TextureMapper.h',
    3913             'platform/graphics/texmap/TextureMapperAnimation.cpp',
    3914             'platform/graphics/texmap/TextureMapperAnimation.h',
    39153915            'platform/graphics/texmap/TextureMapperBackingStore.cpp',
    39163916            'platform/graphics/texmap/TextureMapperBackingStore.h',
  • trunk/Source/WebCore/platform/graphics/GraphicsLayerAnimation.cpp

    r122483 r122484  
    1919
    2020#include "config.h"
    21 #include "TextureMapperAnimation.h"
     21#include "GraphicsLayerAnimation.h"
    2222
    2323#include "UnitBezier.h"
    2424#include <wtf/CurrentTime.h>
    2525
    26 #if USE(TEXTURE_MAPPER)
    2726namespace WebCore {
    2827
     
    146145
    147146
    148 TextureMapperAnimation::TextureMapperAnimation(const KeyframeValueList& keyframes, const IntSize& boxSize, const Animation* animation, double timeOffset, bool listsMatch)
     147GraphicsLayerAnimation::GraphicsLayerAnimation(const KeyframeValueList& keyframes, const IntSize& boxSize, const Animation* animation, double timeOffset, bool listsMatch)
    149148    : m_keyframes(keyframes)
    150149    , m_boxSize(boxSize)
     
    157156}
    158157
    159 void TextureMapperAnimation::applyInternal(TextureMapperAnimationClient* client, const AnimationValue* from, const AnimationValue* to, float progress)
     158void GraphicsLayerAnimation::applyInternal(Client* client, const AnimationValue* from, const AnimationValue* to, float progress)
    160159{
    161160    switch (m_keyframes.property()) {
    162161    case AnimatedPropertyOpacity:
    163         client->setOpacity(applyOpacityAnimation((static_cast<const FloatAnimationValue*>(from)->value()), (static_cast<const FloatAnimationValue*>(to)->value()), progress));
     162        client->setAnimatedOpacity(applyOpacityAnimation((static_cast<const FloatAnimationValue*>(from)->value()), (static_cast<const FloatAnimationValue*>(to)->value()), progress));
    164163        return;
    165164    case AnimatedPropertyWebkitTransform:
    166         client->setTransform(applyTransformAnimation(static_cast<const TransformAnimationValue*>(from)->value(), static_cast<const TransformAnimationValue*>(to)->value(), progress, m_boxSize, m_listsMatch));
     165        client->setAnimatedTransform(applyTransformAnimation(static_cast<const TransformAnimationValue*>(from)->value(), static_cast<const TransformAnimationValue*>(to)->value(), progress, m_boxSize, m_listsMatch));
    167166        return;
    168167    default:
     
    171170}
    172171
    173 bool TextureMapperAnimation::isActive() const
     172bool GraphicsLayerAnimation::isActive() const
    174173{
    175174    if (state() != StoppedState)
     
    179178}
    180179
    181 bool TextureMapperAnimations::hasActiveAnimationsOfType(AnimatedPropertyID type) const
    182 {
    183     HashMap<String, Vector<TextureMapperAnimation> >::const_iterator end = m_animations.end();
    184     for (HashMap<String, Vector<TextureMapperAnimation> >::const_iterator it = m_animations.begin(); it != end; ++it) {
    185         const Vector<TextureMapperAnimation>& animations = it->second;
     180bool GraphicsLayerAnimations::hasActiveAnimationsOfType(AnimatedPropertyID type) const
     181{
     182    HashMap<String, Vector<GraphicsLayerAnimation> >::const_iterator end = m_animations.end();
     183    for (HashMap<String, Vector<GraphicsLayerAnimation> >::const_iterator it = m_animations.begin(); it != end; ++it) {
     184        const Vector<GraphicsLayerAnimation>& animations = it->second;
    186185        for (size_t i = 0; i < animations.size(); ++i) {
    187186            if (animations[i].isActive() && animations[i].property() == type)
     
    192191}
    193192
    194 bool TextureMapperAnimations::hasRunningAnimations() const
    195 {
    196     HashMap<String, Vector<TextureMapperAnimation> >::const_iterator end = m_animations.end();
    197     for (HashMap<String, Vector<TextureMapperAnimation> >::const_iterator it = m_animations.begin(); it != end; ++it) {
    198         const Vector<TextureMapperAnimation>& animations = it->second;
     193bool GraphicsLayerAnimations::hasRunningAnimations() const
     194{
     195    HashMap<String, Vector<GraphicsLayerAnimation> >::const_iterator end = m_animations.end();
     196    for (HashMap<String, Vector<GraphicsLayerAnimation> >::const_iterator it = m_animations.begin(); it != end; ++it) {
     197        const Vector<GraphicsLayerAnimation>& animations = it->second;
    199198        for (size_t i = 0; i < animations.size(); ++i) {
    200             if (animations[i].state() == TextureMapperAnimation::PlayingState)
     199            if (animations[i].state() == GraphicsLayerAnimation::PlayingState)
    201200                return true;
    202201        }
     
    206205}
    207206
    208 void TextureMapperAnimation::apply(TextureMapperAnimationClient* client)
     207void GraphicsLayerAnimation::apply(Client* client)
    209208{
    210209    if (state() == StoppedState)
     
    245244}
    246245
    247 void TextureMapperAnimation::pause(double offset)
     246void GraphicsLayerAnimation::pause(double offset)
    248247{
    249248    // FIXME: should apply offset here.
     
    252251}
    253252
    254 void TextureMapperAnimations::add(const String& name, const TextureMapperAnimation& animation)
    255 {
    256     HashMap<String, Vector<TextureMapperAnimation> >::iterator it = m_animations.find(name);
     253void GraphicsLayerAnimations::add(const String& name, const GraphicsLayerAnimation& animation)
     254{
     255    HashMap<String, Vector<GraphicsLayerAnimation> >::iterator it = m_animations.find(name);
    257256    if (it != m_animations.end()) {
    258257        it->second.append(animation);
     
    260259    }
    261260
    262     Vector<TextureMapperAnimation> animations;
     261    Vector<GraphicsLayerAnimation> animations;
    263262    animations.append(animation);
    264263    m_animations.add(name, animations);
    265264}
    266265
    267 void TextureMapperAnimations::pause(const String& name, double offset)
    268 {
    269     HashMap<String, Vector<TextureMapperAnimation> >::iterator it = m_animations.find(name);
     266void GraphicsLayerAnimations::pause(const String& name, double offset)
     267{
     268    HashMap<String, Vector<GraphicsLayerAnimation> >::iterator it = m_animations.find(name);
    270269    if (it == m_animations.end())
    271270        return;
     
    275274}
    276275
    277 void TextureMapperAnimations::apply(TextureMapperAnimationClient* client)
    278 {
    279     HashMap<String, Vector<TextureMapperAnimation> >::iterator end = m_animations.end();
    280     for (HashMap<String, Vector<TextureMapperAnimation> >::iterator it = m_animations.begin(); it != end; ++it) {
     276void GraphicsLayerAnimations::apply(GraphicsLayerAnimation::Client* client)
     277{
     278    HashMap<String, Vector<GraphicsLayerAnimation> >::iterator end = m_animations.end();
     279    for (HashMap<String, Vector<GraphicsLayerAnimation> >::iterator it = m_animations.begin(); it != end; ++it) {
    281280        for (size_t i = 0; i < it->second.size(); ++i)
    282281            it->second[i].apply(client);
     
    285284
    286285}
    287 #endif
  • trunk/Source/WebCore/platform/graphics/GraphicsLayerAnimation.h

    r122483 r122484  
    1818 */
    1919
    20 #ifndef TextureMapperAnimation_h
    21 #define TextureMapperAnimation_h
     20#ifndef GraphicsLayerAnimation_h
     21#define GraphicsLayerAnimation_h
    2222
    2323#include "GraphicsLayer.h"
     
    2626#include <wtf/text/StringHash.h>
    2727
    28 #if USE(TEXTURE_MAPPER)
    2928namespace WebCore {
    3029
    31 class TextureMapperAnimationClient {
    32 public:
    33     virtual void setTransform(const TransformationMatrix&) = 0;
    34     virtual void setOpacity(float) = 0;
    35 };
    36 
    37 class TextureMapperAnimation {
     30class GraphicsLayerAnimation {
    3831public:
    3932    enum AnimationState { PlayingState, PausedState, StoppedState };
     33    class Client {
     34    public:
     35        virtual void setAnimatedTransform(const TransformationMatrix&) = 0;
     36        virtual void setAnimatedOpacity(float) = 0;
     37    };
    4038
    41     TextureMapperAnimation()
     39    GraphicsLayerAnimation()
    4240        : m_keyframes(AnimatedPropertyInvalid)
    4341    { }
    44     TextureMapperAnimation(const KeyframeValueList&, const IntSize&, const Animation*, double, bool);
    45     void apply(TextureMapperAnimationClient*);
     42    GraphicsLayerAnimation(const KeyframeValueList&, const IntSize&, const Animation*, double, bool);
     43    void apply(Client*);
    4644    void pause(double);
    4745    AnimationState state() const { return m_state; }
     
    5149
    5250private:
    53     void applyInternal(TextureMapperAnimationClient*, const AnimationValue* from, const AnimationValue* to, float progress);
     51    void applyInternal(Client*, const AnimationValue* from, const AnimationValue* to, float progress);
    5452    KeyframeValueList m_keyframes;
    5553    IntSize m_boxSize;
     
    6361};
    6462
    65 class TextureMapperAnimations {
     63class GraphicsLayerAnimations {
    6664public:
    67     TextureMapperAnimations() { }
     65    GraphicsLayerAnimations() { }
    6866
    69     void add(const String&, const TextureMapperAnimation&);
     67    void add(const String&, const GraphicsLayerAnimation&);
    7068    void remove(const String& name) { m_animations.remove(name); }
    7169    void pause(const String&, double);
    72     void apply(TextureMapperAnimationClient*);
     70    void apply(GraphicsLayerAnimation::Client*);
    7371    bool isEmpty() const { return m_animations.isEmpty(); }
    7472
     
    7775
    7876private:
    79     HashMap<String, Vector<TextureMapperAnimation> > m_animations;
     77    HashMap<String, Vector<GraphicsLayerAnimation> > m_animations;
    8078};
    8179
    8280}
    83 #endif // USE(TEXTURE_MAPPER)
    84 
    85 #endif // TextureMapperAnimation_h
     81#endif // GraphicsLayerAnimation_h
  • trunk/Source/WebCore/platform/graphics/GraphicsLayerTransform.cpp

    r122483 r122484  
    1919
    2020#include "config.h"
    21 #include "LayerTransform.h"
     21#include "GraphicsLayerTransform.h"
    2222
    2323namespace WebCore {
    2424
    25 LayerTransform::LayerTransform()
    26 : m_flattening(false)
    27 , m_dirty(false) // false by default since all default values would be combined as the identity matrix
    28 , m_childrenDirty(false)
     25GraphicsLayerTransform::GraphicsLayerTransform()
     26    : m_flattening(false)
     27    , m_dirty(false) // false by default since all default values would be combined as the identity matrix
     28    , m_childrenDirty(false)
    2929{
    3030}
    3131
    32 void LayerTransform::setPosition(const FloatPoint& position)
     32void GraphicsLayerTransform::setPosition(const FloatPoint& position)
    3333{
    3434    m_position = position;
     
    3636}
    3737
    38 void LayerTransform::setSize(const FloatSize& size)
     38void GraphicsLayerTransform::setSize(const FloatSize& size)
    3939{
    4040    m_size = size;
     
    4242}
    4343
    44 void LayerTransform::setAnchorPoint(const FloatPoint3D& anchorPoint)
     44void GraphicsLayerTransform::setAnchorPoint(const FloatPoint3D& anchorPoint)
    4545{
    4646    m_anchorPoint = anchorPoint;
     
    4848}
    4949
    50 void LayerTransform::setFlattening(bool flattening)
     50void GraphicsLayerTransform::setFlattening(bool flattening)
    5151{
    5252    m_flattening = flattening;
     
    5454}
    5555
    56 void LayerTransform::setLocalTransform(const TransformationMatrix& transform)
     56void GraphicsLayerTransform::setLocalTransform(const TransformationMatrix& transform)
    5757{
    5858    m_local = transform;
     
    6060}
    6161
    62 void LayerTransform::setChildrenTransform(const TransformationMatrix& transform)
     62void GraphicsLayerTransform::setChildrenTransform(const TransformationMatrix& transform)
    6363{
    6464    m_children = transform;
     
    6666}
    6767
    68 TransformationMatrix LayerTransform::combined()
     68TransformationMatrix GraphicsLayerTransform::combined()
    6969{
    7070    ASSERT(!m_dirty);
     
    7272}
    7373
    74 TransformationMatrix LayerTransform::combinedForChildren()
     74TransformationMatrix GraphicsLayerTransform::combinedForChildren()
    7575{
    7676    ASSERT(!m_dirty);
     
    8080}
    8181
    82 void LayerTransform::combineTransforms(const TransformationMatrix& parentTransform)
     82void GraphicsLayerTransform::combineTransforms(const TransformationMatrix& parentTransform)
    8383{
    8484    float originX = m_anchorPoint.x() * m_size.width();
     
    9797}
    9898
    99 void LayerTransform::combineTransformsForChildren()
     99void GraphicsLayerTransform::combineTransformsForChildren()
    100100{
    101101    ASSERT(!m_dirty);
  • trunk/Source/WebCore/platform/graphics/GraphicsLayerTransform.h

    r122483 r122484  
    1818 */
    1919
    20 #ifndef LayerTransform_h
    21 #define LayerTransform_h
     20#ifndef GraphicsLayerTransform_h
     21#define GraphicsLayerTransform_h
    2222
    2323#include "FloatPoint.h"
     
    2828namespace WebCore {
    2929
    30 class LayerTransform {
     30class GraphicsLayerTransform {
    3131public:
    32     LayerTransform();
     32    GraphicsLayerTransform();
    3333    void setPosition(const FloatPoint&);
    3434    void setSize(const FloatSize&);
     
    6060}
    6161
    62 #endif // LayerTransform_h
     62#endif // GraphicsLayerTransform_h
  • trunk/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.cpp

    r120532 r122484  
    369369        listsMatch = validateTransformOperations(valueList, hasBigRotation) >= 0;
    370370
    371     m_animations.add(keyframesName, TextureMapperAnimation(valueList, boxSize, anim, timeOffset, listsMatch));
     371    m_animations.add(keyframesName, GraphicsLayerAnimation(valueList, boxSize, anim, timeOffset, listsMatch));
    372372    notifyChange(TextureMapperLayer::AnimationChange);
    373373    m_animationStartedTimer.startOneShot(0);
  • trunk/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.h

    r122175 r122484  
    107107    TextureMapperPlatformLayer* m_contentsLayer;
    108108    FloatRect m_needsDisplayRect;
    109     TextureMapperAnimations m_animations;
     109    GraphicsLayerAnimations m_animations;
    110110    void animationStartedTimerFired(Timer<GraphicsLayerTextureMapper>*);
    111111    Timer<GraphicsLayerTextureMapper> m_animationStartedTimer;
  • trunk/Source/WebCore/platform/graphics/texmap/TextureMapperLayer.h

    r120532 r122484  
    2525#include "GraphicsContext.h"
    2626#include "GraphicsLayer.h"
     27#include "GraphicsLayerAnimation.h"
     28#include "GraphicsLayerTransform.h"
    2729#include "Image.h"
    2830#include "IntPointHash.h"
    29 #include "LayerTransform.h"
    3031#include "TextureMapper.h"
    31 #include "TextureMapperAnimation.h"
    3232#include "TextureMapperBackingStore.h"
    3333#include "Timer.h"
     
    5757};
    5858
    59 class TextureMapperLayer : public TextureMapperAnimationClient {
     59class TextureMapperLayer : public GraphicsLayerAnimation::Client {
    6060
    6161public:
     
    158158    void drawRepaintCounter(GraphicsContext*, GraphicsLayer*);
    159159
     160    // GraphicsLayerAnimation::Client
     161    void setAnimatedTransform(const TransformationMatrix& matrix) { setTransform(matrix); }
     162    void setAnimatedOpacity(float opacity) { setOpacity(opacity); }
     163
    160164    void syncAnimations();
    161165    bool isVisible() const;
     
    169173    bool shouldPaintToIntermediateSurface() const;
    170174
    171     LayerTransform m_transform;
     175    GraphicsLayerTransform m_transform;
    172176
    173177    inline FloatRect layerRect() const
     
    231235    State m_state;
    232236    TextureMapper* m_textureMapper;
    233     TextureMapperAnimations m_animations;
     237    GraphicsLayerAnimations m_animations;
    234238    IntPoint m_scrollPositionDelta;
    235239    bool m_fixedToViewport;
  • trunk/Source/WebKit2/ChangeLog

    r122478 r122484  
     12012-07-12  No'am Rosenthal  <noam.rosenthal@nokia.com>
     2
     3        Move TextureMapperAnimation and texmap/LayerTransform to platform/graphics
     4        https://bugs.webkit.org/show_bug.cgi?id=91111
     5
     6        Reviewed by Kenneth Rohde Christiansen.
     7
     8        Include the new filenames.
     9
     10        * WebProcess/WebPage/LayerTreeCoordinator/WebGraphicsLayer.h:
     11        (WebGraphicsLayer):
     12
    1132012-07-12  Adenilson Cavalcanti  <cavalcantii@gmail.com>
    214
  • trunk/Source/WebKit2/WebProcess/WebPage/LayerTreeCoordinator/WebGraphicsLayer.h

    r121221 r122484  
    2424#include "FloatPoint3D.h"
    2525#include "GraphicsLayer.h"
     26#include "GraphicsLayerTransform.h"
    2627#include "Image.h"
    2728#include "IntSize.h"
    28 #include "LayerTransform.h"
    2929#include "ShareableBitmap.h"
    3030#include "TiledBackingStore.h"
     
    166166    GraphicsLayer* m_maskTarget;
    167167    FloatRect m_needsDisplayRect;
    168     LayerTransform m_layerTransform;
     168    GraphicsLayerTransform m_layerTransform;
    169169    bool m_inUpdateMode : 1;
    170170    bool m_shouldUpdateVisibleRect: 1;
Note: See TracChangeset for help on using the changeset viewer.