| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2012 Apple Inc. All rights reserved. | 2 * Copyright (C) 2012 Apple 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 | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
| 8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
| 9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
| 10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
| (...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 142 | 142 |
| 143 String CSSImageSetValue::customCSSText() const | 143 String CSSImageSetValue::customCSSText() const |
| 144 { | 144 { |
| 145 StringBuilder result; | 145 StringBuilder result; |
| 146 result.append("-webkit-image-set("); | 146 result.append("-webkit-image-set("); |
| 147 | 147 |
| 148 size_t length = this->length(); | 148 size_t length = this->length(); |
| 149 size_t i = 0; | 149 size_t i = 0; |
| 150 while (i < length) { | 150 while (i < length) { |
| 151 if (i > 0) | 151 if (i > 0) |
| 152 result.append(", "); | 152 result.appendLiteral(", "); |
| 153 | 153 |
| 154 const CSSValue* imageValue = item(i); | 154 const CSSValue* imageValue = item(i); |
| 155 result.append(imageValue->cssText()); | 155 result.append(imageValue->cssText()); |
| 156 result.append(' '); | 156 result.append(' '); |
| 157 | 157 |
| 158 ++i; | 158 ++i; |
| 159 ASSERT_WITH_SECURITY_IMPLICATION(i < length); | 159 ASSERT_WITH_SECURITY_IMPLICATION(i < length); |
| 160 const CSSValue* scaleFactorValue = item(i); | 160 const CSSValue* scaleFactorValue = item(i); |
| 161 result.append(scaleFactorValue->cssText()); | 161 result.append(scaleFactorValue->cssText()); |
| 162 // FIXME: Eventually the scale factor should contain it's own unit http:
//wkb.ug/100120. | 162 // FIXME: Eventually the scale factor should contain it's own unit http:
//wkb.ug/100120. |
| 163 // For now 'x' is hard-coded in the parser, so we hard-code it here too. | 163 // For now 'x' is hard-coded in the parser, so we hard-code it here too. |
| 164 result.append('x'); | 164 result.append('x'); |
| 165 | 165 |
| 166 ++i; | 166 ++i; |
| 167 } | 167 } |
| 168 | 168 |
| 169 result.append(")"); | 169 result.append(')'); |
| 170 return result.toString(); | 170 return result.toString(); |
| 171 } | 171 } |
| 172 | 172 |
| 173 bool CSSImageSetValue::hasFailedOrCanceledSubresources() const | 173 bool CSSImageSetValue::hasFailedOrCanceledSubresources() const |
| 174 { | 174 { |
| 175 if (!m_imageSet || !m_imageSet->isImageResourceSet()) | 175 if (!m_imageSet || !m_imageSet->isImageResourceSet()) |
| 176 return false; | 176 return false; |
| 177 if (Resource* cachedResource = toStyleFetchedImageSet(m_imageSet)->cachedIma
ge()) | 177 if (Resource* cachedResource = toStyleFetchedImageSet(m_imageSet)->cachedIma
ge()) |
| 178 return cachedResource->loadFailedOrCanceled(); | 178 return cachedResource->loadFailedOrCanceled(); |
| 179 return true; | 179 return true; |
| 180 } | 180 } |
| 181 | 181 |
| 182 CSSImageSetValue::CSSImageSetValue(const CSSImageSetValue& cloneFrom) | 182 CSSImageSetValue::CSSImageSetValue(const CSSImageSetValue& cloneFrom) |
| 183 : CSSValueList(cloneFrom) | 183 : CSSValueList(cloneFrom) |
| 184 , m_accessedBestFitImage(false) | 184 , m_accessedBestFitImage(false) |
| 185 , m_scaleFactor(1) | 185 , m_scaleFactor(1) |
| 186 { | 186 { |
| 187 // Non-CSSValueList data is not accessible through CSS OM, no need to clone. | 187 // Non-CSSValueList data is not accessible through CSS OM, no need to clone. |
| 188 } | 188 } |
| 189 | 189 |
| 190 PassRefPtrWillBeRawPtr<CSSImageSetValue> CSSImageSetValue::cloneForCSSOM() const | 190 PassRefPtrWillBeRawPtr<CSSImageSetValue> CSSImageSetValue::cloneForCSSOM() const |
| 191 { | 191 { |
| 192 return adoptRefWillBeNoop(new CSSImageSetValue(*this)); | 192 return adoptRefWillBeNoop(new CSSImageSetValue(*this)); |
| 193 } | 193 } |
| 194 | 194 |
| 195 } // namespace blink | 195 } // namespace blink |
| OLD | NEW |