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

Side by Side Diff: Source/core/animation/AnimatableShapeValue.cpp

Issue 220023003: Rename LayoutBox to CSSBoxType (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 8 months 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 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 21 matching lines...) Expand all
32 #include "core/animation/AnimatableShapeValue.h" 32 #include "core/animation/AnimatableShapeValue.h"
33 33
34 namespace WebCore { 34 namespace WebCore {
35 35
36 bool AnimatableShapeValue::usesDefaultInterpolationWith(const AnimatableValue* v alue) const 36 bool AnimatableShapeValue::usesDefaultInterpolationWith(const AnimatableValue* v alue) const
37 { 37 {
38 const AnimatableShapeValue* shapeValue = toAnimatableShapeValue(value); 38 const AnimatableShapeValue* shapeValue = toAnimatableShapeValue(value);
39 39
40 if (m_shape->type() != ShapeValue::Shape 40 if (m_shape->type() != ShapeValue::Shape
41 || shapeValue->m_shape->type() != ShapeValue::Shape 41 || shapeValue->m_shape->type() != ShapeValue::Shape
42 || m_shape->layoutBox() != shapeValue->m_shape->layoutBox()) 42 || m_shape->cssBox() != shapeValue->m_shape->cssBox())
43 return true; 43 return true;
44 44
45 const BasicShape* fromShape = this->m_shape->shape(); 45 const BasicShape* fromShape = this->m_shape->shape();
46 const BasicShape* toShape = shapeValue->m_shape->shape(); 46 const BasicShape* toShape = shapeValue->m_shape->shape();
47 47
48 return !fromShape->canBlend(toShape); 48 return !fromShape->canBlend(toShape);
49 } 49 }
50 50
51 PassRefPtrWillBeRawPtr<AnimatableValue> AnimatableShapeValue::interpolateTo(cons t AnimatableValue* value, double fraction) const 51 PassRefPtrWillBeRawPtr<AnimatableValue> AnimatableShapeValue::interpolateTo(cons t AnimatableValue* value, double fraction) const
52 { 52 {
53 if (usesDefaultInterpolationWith(value)) 53 if (usesDefaultInterpolationWith(value))
54 return defaultInterpolateTo(this, value, fraction); 54 return defaultInterpolateTo(this, value, fraction);
55 55
56 const AnimatableShapeValue* shapeValue = toAnimatableShapeValue(value); 56 const AnimatableShapeValue* shapeValue = toAnimatableShapeValue(value);
57 const BasicShape* fromShape = this->m_shape->shape(); 57 const BasicShape* fromShape = this->m_shape->shape();
58 const BasicShape* toShape = shapeValue->m_shape->shape(); 58 const BasicShape* toShape = shapeValue->m_shape->shape();
59 return AnimatableShapeValue::create(ShapeValue::createShapeValue(toShape->bl end(fromShape, fraction), shapeValue->m_shape->layoutBox()).get()); 59 return AnimatableShapeValue::create(ShapeValue::createShapeValue(toShape->bl end(fromShape, fraction), shapeValue->m_shape->cssBox()).get());
60 } 60 }
61 61
62 bool AnimatableShapeValue::equalTo(const AnimatableValue* value) const 62 bool AnimatableShapeValue::equalTo(const AnimatableValue* value) const
63 { 63 {
64 const ShapeValue* shape = toAnimatableShapeValue(value)->m_shape.get(); 64 const ShapeValue* shape = toAnimatableShapeValue(value)->m_shape.get();
65 return m_shape == shape || (m_shape && shape && *m_shape == *shape); 65 return m_shape == shape || (m_shape && shape && *m_shape == *shape);
66 } 66 }
67 67
68 } 68 }
OLDNEW
« no previous file with comments | « Source/build/scripts/templates/StyleBuilderFunctions.cpp.tmpl ('k') | Source/core/css/CSSBasicShapes.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698