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

Side by Side Diff: Source/core/css/resolver/AnimatedStyleBuilder.cpp

Issue 170603003: Use nullptr_t for RefPtr, PassRefPtr and RawPtr. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Final rebase Created 6 years, 10 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 | Annotate | Revision Log
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 159 matching lines...) Expand 10 before | Expand all | Expand 10 after
170 prev->setNext(fillLayer); 170 prev->setNext(fillLayer);
171 } 171 }
172 const AnimatableValue* layerValue = values[i].get(); 172 const AnimatableValue* layerValue = values[i].get();
173 switch (property) { 173 switch (property) {
174 case CSSPropertyBackgroundImage: 174 case CSSPropertyBackgroundImage:
175 case CSSPropertyWebkitMaskImage: 175 case CSSPropertyWebkitMaskImage:
176 if (layerValue->isImage()) { 176 if (layerValue->isImage()) {
177 fillLayer->setImage(toAnimatableImage(layerValue)->toStyleImage( )); 177 fillLayer->setImage(toAnimatableImage(layerValue)->toStyleImage( ));
178 } else { 178 } else {
179 ASSERT(toAnimatableUnknown(layerValue)->toCSSValueID() == CSSVal ueNone); 179 ASSERT(toAnimatableUnknown(layerValue)->toCSSValueID() == CSSVal ueNone);
180 fillLayer->setImage(0); 180 fillLayer->setImage(nullptr);
181 } 181 }
182 break; 182 break;
183 case CSSPropertyBackgroundPositionX: 183 case CSSPropertyBackgroundPositionX:
184 case CSSPropertyWebkitMaskPositionX: 184 case CSSPropertyWebkitMaskPositionX:
185 fillLayer->setXPosition(animatableValueToLength(layerValue, state)); 185 fillLayer->setXPosition(animatableValueToLength(layerValue, state));
186 break; 186 break;
187 case CSSPropertyBackgroundPositionY: 187 case CSSPropertyBackgroundPositionY:
188 case CSSPropertyWebkitMaskPositionY: 188 case CSSPropertyWebkitMaskPositionY:
189 fillLayer->setYPosition(animatableValueToLength(layerValue, state)); 189 fillLayer->setYPosition(animatableValueToLength(layerValue, state));
190 break; 190 break;
(...skipping 397 matching lines...) Expand 10 before | Expand all | Expand 10 after
588 return; 588 return;
589 case CSSPropertyZoom: 589 case CSSPropertyZoom:
590 style->setZoom(clampTo<float>(toAnimatableDouble(value)->toDouble(), std ::numeric_limits<float>::denorm_min())); 590 style->setZoom(clampTo<float>(toAnimatableDouble(value)->toDouble(), std ::numeric_limits<float>::denorm_min()));
591 return; 591 return;
592 default: 592 default:
593 ASSERT_NOT_REACHED(); 593 ASSERT_NOT_REACHED();
594 } 594 }
595 } 595 }
596 596
597 } // namespace WebCore 597 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/css/parser/BisonCSSParser-in.cpp ('k') | Source/core/css/resolver/CSSToStyleMap.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698