Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 361 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 372 case CSSPropertyFloodColor: | 372 case CSSPropertyFloodColor: |
| 373 return createFromColor(property, style); | 373 return createFromColor(property, style); |
| 374 case CSSPropertyFloodOpacity: | 374 case CSSPropertyFloodOpacity: |
| 375 return createFromDouble(style.floodOpacity()); | 375 return createFromDouble(style.floodOpacity()); |
| 376 case CSSPropertyFontSize: | 376 case CSSPropertyFontSize: |
| 377 // Must pass a specified size to setFontSize if Text Autosizing is enabl ed, but a computed size | 377 // Must pass a specified size to setFontSize if Text Autosizing is enabl ed, but a computed size |
| 378 // if text zoom is enabled (if neither is enabled it's irrelevant as the y're probably the same). | 378 // if text zoom is enabled (if neither is enabled it's irrelevant as the y're probably the same). |
| 379 // FIXME: Should we introduce an option to pass the computed font size h ere, allowing consumers to | 379 // FIXME: Should we introduce an option to pass the computed font size h ere, allowing consumers to |
| 380 // enable text zoom rather than Text Autosizing? See http://crbug.com/22 7545. | 380 // enable text zoom rather than Text Autosizing? See http://crbug.com/22 7545. |
| 381 return createFromDouble(style.specifiedFontSize()); | 381 return createFromDouble(style.specifiedFontSize()); |
| 382 case CSSPropertyFontSizeAdjust: | |
| 383 return createFromDouble(style.fontSizeAdjust()); | |
|
rune
2015/03/06 10:08:05
Shouldn't you use the font's aspect value for 0 to
changseok
2015/03/08 06:16:56
It takes some time to understand this comment. Cur
Eric Willigers
2015/03/08 07:10:15
As it happens, I have a change involving perspecti
| |
| 382 case CSSPropertyFontStretch: | 384 case CSSPropertyFontStretch: |
| 383 return createFromFontStretch(style.fontStretch()); | 385 return createFromFontStretch(style.fontStretch()); |
| 384 case CSSPropertyFontWeight: | 386 case CSSPropertyFontWeight: |
| 385 return createFromFontWeight(style.fontWeight()); | 387 return createFromFontWeight(style.fontWeight()); |
| 386 case CSSPropertyHeight: | 388 case CSSPropertyHeight: |
| 387 return createFromLength(style.height(), style); | 389 return createFromLength(style.height(), style); |
| 388 case CSSPropertyLightingColor: | 390 case CSSPropertyLightingColor: |
| 389 return createFromColor(property, style); | 391 return createFromColor(property, style); |
| 390 case CSSPropertyListStyleImage: | 392 case CSSPropertyListStyleImage: |
| 391 return createFromStyleImage(style.listStyleImage()); | 393 return createFromStyleImage(style.listStyleImage()); |
| (...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 539 case CSSPropertyZIndex: | 541 case CSSPropertyZIndex: |
| 540 return createFromDouble(style.zIndex()); | 542 return createFromDouble(style.zIndex()); |
| 541 default: | 543 default: |
| 542 ASSERT_NOT_REACHED(); | 544 ASSERT_NOT_REACHED(); |
| 543 // This return value is to avoid a release crash if possible. | 545 // This return value is to avoid a release crash if possible. |
| 544 return AnimatableUnknown::create(nullptr); | 546 return AnimatableUnknown::create(nullptr); |
| 545 } | 547 } |
| 546 } | 548 } |
| 547 | 549 |
| 548 } // namespace blink | 550 } // namespace blink |
| OLD | NEW |