| OLD | NEW |
| 1 // Copyright 2014 Google Inc. All rights reserved. | 1 // Copyright 2014 Google Inc. All rights reserved. |
| 2 // | 2 // |
| 3 // Licensed under the Apache License, Version 2.0 (the "License"); | 3 // Licensed under the Apache License, Version 2.0 (the "License"); |
| 4 // you may not use this file except in compliance with the License. | 4 // you may not use this file except in compliance with the License. |
| 5 // You may obtain a copy of the License at | 5 // You may obtain a copy of the License at |
| 6 // | 6 // |
| 7 // http://www.apache.org/licenses/LICENSE-2.0 | 7 // http://www.apache.org/licenses/LICENSE-2.0 |
| 8 // | 8 // |
| 9 // Unless required by applicable law or agreed to in writing, software | 9 // Unless required by applicable law or agreed to in writing, software |
| 10 // distributed under the License is distributed on an "AS IS" BASIS, | 10 // distributed under the License is distributed on an "AS IS" BASIS, |
| (...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 75 return scope.mergeList(left.slice(2), right.slice(2), [ | 75 return scope.mergeList(left.slice(2), right.slice(2), [ |
| 76 'polygon(', | 76 'polygon(', |
| 77 left[1], | 77 left[1], |
| 78 mergeSizePairList, | 78 mergeSizePairList, |
| 79 ')']); | 79 ')']); |
| 80 } | 80 } |
| 81 } | 81 } |
| 82 | 82 |
| 83 scope.addPropertiesHandler(parseShape, mergeShapes, ['shape-outside']); | 83 scope.addPropertiesHandler(parseShape, mergeShapes, ['shape-outside']); |
| 84 | 84 |
| 85 })(webAnimationsMinifill); | 85 })(webAnimations1); |
| OLD | NEW |