| OLD | NEW |
|---|
| 1 /* | 1 /* |
| 2 * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved. | 2 * Copyright (C) 2013 Adobe Systems Incorporated. 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 | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * | 7 * |
| 8 * 1. Redistributions of source code must retain the above | 8 * 1. Redistributions of source code must retain the above |
| 9 * copyright notice, this list of conditions and the following | 9 * copyright notice, this list of conditions and the following |
| 10 * disclaimer. | 10 * disclaimer. |
| (...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 57 CSSPropertyID exclusionProperties[] = { | 57 CSSPropertyID exclusionProperties[] = { |
| 58 CSSPropertyWebkitWrap, | 58 CSSPropertyWebkitWrap, |
| 59 CSSPropertyWebkitWrapFlow, | 59 CSSPropertyWebkitWrapFlow, |
| 60 CSSPropertyWebkitShapeMargin, | 60 CSSPropertyWebkitShapeMargin, |
| 61 CSSPropertyWebkitShapePadding, | 61 CSSPropertyWebkitShapePadding, |
| 62 CSSPropertyWebkitWrapThrough, | 62 CSSPropertyWebkitWrapThrough, |
| 63 CSSPropertyWebkitShapeInside, | 63 CSSPropertyWebkitShapeInside, |
| 64 CSSPropertyWebkitShapeOutside, | 64 CSSPropertyWebkitShapeOutside, |
| 65 }; | 65 }; |
| 66 setCSSPropertiesEnabled(exclusionProperties, WTF_ARRAY_LENGTH(exclusionPrope
rties), RuntimeEnabledFeatures::cssExclusionsEnabled()); | 66 setCSSPropertiesEnabled(exclusionProperties, WTF_ARRAY_LENGTH(exclusionPrope
rties), RuntimeEnabledFeatures::cssExclusionsEnabled()); |
| 67 #if ENABLE(CSS_COMPOSITING) | 67 |
| 68 RuntimeCSSEnabled::setCSSPropertyEnabled(CSSPropertyBackgroundBlendMode, Run
timeEnabledFeatures::cssCompositingEnabled()); | 68 RuntimeCSSEnabled::setCSSPropertyEnabled(CSSPropertyBackgroundBlendMode, Run
timeEnabledFeatures::cssCompositingEnabled()); |
| 69 RuntimeCSSEnabled::setCSSPropertyEnabled(CSSPropertyWebkitBlendMode, Runtime
EnabledFeatures::cssCompositingEnabled()); | 69 RuntimeCSSEnabled::setCSSPropertyEnabled(CSSPropertyMixBlendMode, RuntimeEna
bledFeatures::cssCompositingEnabled()); |
| 70 #endif | |
| 71 } | 70 } |
| 72 | 71 |
| 73 static BoolVector& propertySwitches() | 72 static BoolVector& propertySwitches() |
| 74 { | 73 { |
| 75 static BoolVector* switches = 0; | 74 static BoolVector* switches = 0; |
| 76 if (!switches) { | 75 if (!switches) { |
| 77 switches = new BoolVector; | 76 switches = new BoolVector; |
| 78 switches->fill(true, numCSSProperties); | 77 switches->fill(true, numCSSProperties); |
| 79 setPropertySwitchesFromRuntimeFeatures(*switches); | 78 setPropertySwitchesFromRuntimeFeatures(*switches); |
| 80 } | 79 } |
| (...skipping 20 matching lines...) Expand all Loading... |
| 101 void RuntimeCSSEnabled::filterEnabledCSSPropertiesIntoVector(const CSSPropertyID
* properties, size_t propertyCount, Vector<CSSPropertyID>& outVector) | 100 void RuntimeCSSEnabled::filterEnabledCSSPropertiesIntoVector(const CSSPropertyID
* properties, size_t propertyCount, Vector<CSSPropertyID>& outVector) |
| 102 { | 101 { |
| 103 for (unsigned i = 0; i < propertyCount; i++) { | 102 for (unsigned i = 0; i < propertyCount; i++) { |
| 104 CSSPropertyID property = properties[i]; | 103 CSSPropertyID property = properties[i]; |
| 105 if (RuntimeCSSEnabled::isCSSPropertyEnabled(property)) | 104 if (RuntimeCSSEnabled::isCSSPropertyEnabled(property)) |
| 106 outVector.append(property); | 105 outVector.append(property); |
| 107 } | 106 } |
| 108 } | 107 } |
| 109 | 108 |
| 110 } // namespace WebCore | 109 } // namespace WebCore |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 15012010:
Remove the CSS_COMPOSITING define, leaving the implementation under the runtime flag, since runtime… (Closed)
Base URL: https://chromium.googlesource.com/chromium/blink.git@master