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

Side by Side Diff: sky/engine/core/animation/css/CSSAnimatableValueFactory.cpp

Issue 711203002: Remove zoom() and effectiveZoom(). (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 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
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 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 #include "platform/LengthBox.h" 57 #include "platform/LengthBox.h"
58 58
59 namespace blink { 59 namespace blink {
60 60
61 static PassRefPtr<AnimatableValue> createFromLength(const Length& length, const RenderStyle& style) 61 static PassRefPtr<AnimatableValue> createFromLength(const Length& length, const RenderStyle& style)
62 { 62 {
63 switch (length.type()) { 63 switch (length.type()) {
64 case Fixed: 64 case Fixed:
65 case Percent: 65 case Percent:
66 case Calculated: 66 case Calculated:
67 return AnimatableLength::create(length, style.effectiveZoom()); 67 return AnimatableLength::create(length);
68 case Auto: 68 case Auto:
69 case Intrinsic: 69 case Intrinsic:
70 case MinIntrinsic: 70 case MinIntrinsic:
71 case MinContent: 71 case MinContent:
72 case MaxContent: 72 case MaxContent:
73 case FillAvailable: 73 case FillAvailable:
74 case FitContent: 74 case FitContent:
75 return AnimatableUnknown::create(CSSPrimitiveValue::create(length, 1)); 75 return AnimatableUnknown::create(CSSPrimitiveValue::create(length));
76 case MaxSizeNone: 76 case MaxSizeNone:
77 return AnimatableUnknown::create(CSSValueNone); 77 return AnimatableUnknown::create(CSSValueNone);
78 case ExtendToZoom: // Does not apply to elements. 78 case ExtendToZoom: // Does not apply to elements.
79 case DeviceWidth: 79 case DeviceWidth:
80 case DeviceHeight: 80 case DeviceHeight:
81 ASSERT_NOT_REACHED(); 81 ASSERT_NOT_REACHED();
82 return nullptr; 82 return nullptr;
83 } 83 }
84 ASSERT_NOT_REACHED(); 84 ASSERT_NOT_REACHED();
85 return nullptr; 85 return nullptr;
(...skipping 354 matching lines...) Expand 10 before | Expand all | Expand 10 after
440 case CSSPropertyZIndex: 440 case CSSPropertyZIndex:
441 return createFromDouble(style.zIndex()); 441 return createFromDouble(style.zIndex());
442 default: 442 default:
443 ASSERT_NOT_REACHED(); 443 ASSERT_NOT_REACHED();
444 // This return value is to avoid a release crash if possible. 444 // This return value is to avoid a release crash if possible.
445 return AnimatableUnknown::create(nullptr); 445 return AnimatableUnknown::create(nullptr);
446 } 446 }
447 } 447 }
448 448
449 } // namespace blink 449 } // namespace blink
OLDNEW
« no previous file with comments | « sky/engine/core/animation/animatable/AnimatableLengthTest.cpp ('k') | sky/engine/core/css/CSSGradientValue.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698