| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2012 Adobe Systems Incorporated. All rights reserved. | 2 * Copyright (C) 2012 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 12 matching lines...) Expand all Loading... |
| 23 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 23 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
| 24 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR | 24 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR |
| 25 * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF | 25 * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF |
| 26 * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | 26 * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF |
| 27 * SUCH DAMAGE. | 27 * SUCH DAMAGE. |
| 28 */ | 28 */ |
| 29 | 29 |
| 30 #include "config.h" | 30 #include "config.h" |
| 31 #include "core/rendering/shapes/ShapeInfo.h" | 31 #include "core/rendering/shapes/ShapeInfo.h" |
| 32 | 32 |
| 33 #include "core/rendering/RenderRegion.h" | 33 #include "core/dom/Document.h" |
| 34 #include "core/rendering/RenderBlock.h" |
| 34 | 35 |
| 35 namespace WebCore { | 36 namespace WebCore { |
| 36 | 37 |
| 37 bool checkShapeImageOrigin(Document& document, ImageResource& imageResource) | 38 bool checkShapeImageOrigin(Document& document, ImageResource& imageResource) |
| 38 { | 39 { |
| 39 if (imageResource.isAccessAllowed(document.securityOrigin())) | 40 if (imageResource.isAccessAllowed(document.securityOrigin())) |
| 40 return true; | 41 return true; |
| 41 | 42 |
| 42 const KURL& url = imageResource.url(); | 43 const KURL& url = imageResource.url(); |
| 43 String urlString = url.isNull() ? "''" : url.elidedString(); | 44 String urlString = url.isNull() ? "''" : url.elidedString(); |
| (...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 94 segments[i].logicalLeft += logicalLeftOffset(); | 95 segments[i].logicalLeft += logicalLeftOffset(); |
| 95 segments[i].logicalRight += logicalLeftOffset(); | 96 segments[i].logicalRight += logicalLeftOffset(); |
| 96 } | 97 } |
| 97 | 98 |
| 98 return segments; | 99 return segments; |
| 99 } | 100 } |
| 100 | 101 |
| 101 template class ShapeInfo<RenderBlock>; | 102 template class ShapeInfo<RenderBlock>; |
| 102 template class ShapeInfo<RenderBox>; | 103 template class ShapeInfo<RenderBox>; |
| 103 } | 104 } |
| OLD | NEW |