Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(65)

Side by Side Diff: Source/core/rendering/style/FillLayer.h

Issue 38573005: Web Animations CSS: Fix crash when transitioning background or mask properties (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebased Created 7 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
3 * (C) 2000 Antti Koivisto (koivisto@kde.org) 3 * (C) 2000 Antti Koivisto (koivisto@kde.org)
4 * (C) 2000 Dirk Mueller (mueller@kde.org) 4 * (C) 2000 Dirk Mueller (mueller@kde.org)
5 * Copyright (C) 2003, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. 5 * Copyright (C) 2003, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
6 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com) 6 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com)
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 return !(*this == o); 55 return !(*this == o);
56 } 56 }
57 57
58 EFillSizeType type; 58 EFillSizeType type;
59 LengthSize size; 59 LengthSize size;
60 }; 60 };
61 61
62 class FillLayer { 62 class FillLayer {
63 WTF_MAKE_FAST_ALLOCATED; 63 WTF_MAKE_FAST_ALLOCATED;
64 public: 64 public:
65 FillLayer(EFillLayerType); 65 FillLayer(EFillLayerType, bool useInitialValues = false);
66 ~FillLayer(); 66 ~FillLayer();
67 67
68 StyleImage* image() const { return m_image.get(); } 68 StyleImage* image() const { return m_image.get(); }
69 Length xPosition() const { return m_xPosition; } 69 Length xPosition() const { return m_xPosition; }
70 Length yPosition() const { return m_yPosition; } 70 Length yPosition() const { return m_yPosition; }
71 BackgroundEdgeOrigin backgroundXOrigin() const { return static_cast<Backgrou ndEdgeOrigin>(m_backgroundXOrigin); } 71 BackgroundEdgeOrigin backgroundXOrigin() const { return static_cast<Backgrou ndEdgeOrigin>(m_backgroundXOrigin); }
72 BackgroundEdgeOrigin backgroundYOrigin() const { return static_cast<Backgrou ndEdgeOrigin>(m_backgroundYOrigin); } 72 BackgroundEdgeOrigin backgroundYOrigin() const { return static_cast<Backgrou ndEdgeOrigin>(m_backgroundYOrigin); }
73 EFillAttachment attachment() const { return static_cast<EFillAttachment>(m_a ttachment); } 73 EFillAttachment attachment() const { return static_cast<EFillAttachment>(m_a ttachment); }
74 EFillBox clip() const { return static_cast<EFillBox>(m_clip); } 74 EFillBox clip() const { return static_cast<EFillBox>(m_clip); }
75 EFillBox origin() const { return static_cast<EFillBox>(m_origin); } 75 EFillBox origin() const { return static_cast<EFillBox>(m_origin); }
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after
234 unsigned m_maskSourceTypeSet : 1; 234 unsigned m_maskSourceTypeSet : 1;
235 235
236 unsigned m_type : 1; // EFillLayerType 236 unsigned m_type : 1; // EFillLayerType
237 237
238 mutable unsigned m_clipMax : 2; // EFillBox, maximum m_clip value from this to bottom layer 238 mutable unsigned m_clipMax : 2; // EFillBox, maximum m_clip value from this to bottom layer
239 }; 239 };
240 240
241 } // namespace WebCore 241 } // namespace WebCore
242 242
243 #endif // FillLayer_h 243 #endif // FillLayer_h
OLDNEW
« no previous file with comments | « LayoutTests/transitions/background-webkit-mask-crash-expected.txt ('k') | Source/core/rendering/style/FillLayer.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698