| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) | 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) |
| 3 * (C) 1999 Antti Koivisto (koivisto@kde.org) | 3 * (C) 1999 Antti Koivisto (koivisto@kde.org) |
| 4 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2010 Apple Inc. All rights reserv
ed. | 4 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2010 Apple Inc. All rights reserv
ed. |
| 5 * Copyright (C) 2010 Google Inc. All rights reserved. | 5 * Copyright (C) 2010 Google Inc. All rights reserved. |
| 6 * | 6 * |
| 7 * This library is free software; you can redistribute it and/or | 7 * This library is free software; you can redistribute it and/or |
| 8 * modify it under the terms of the GNU Library General Public | 8 * modify it under the terms of the GNU Library General Public |
| 9 * License as published by the Free Software Foundation; either | 9 * License as published by the Free Software Foundation; either |
| 10 * version 2 of the License, or (at your option) any later version. | 10 * version 2 of the License, or (at your option) any later version. |
| (...skipping 505 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 516 return nullptr; | 516 return nullptr; |
| 517 } | 517 } |
| 518 | 518 |
| 519 RefPtr<Image> sourceImage = cachedImage()->imageForRenderer(renderer()); | 519 RefPtr<Image> sourceImage = cachedImage()->imageForRenderer(renderer()); |
| 520 | 520 |
| 521 // We need to synthesize a container size if a renderer is not available to
provide one. | 521 // We need to synthesize a container size if a renderer is not available to
provide one. |
| 522 if (!renderer() && sourceImage->usesContainerSize()) | 522 if (!renderer() && sourceImage->usesContainerSize()) |
| 523 sourceImage->setContainerSize(sourceImage->size()); | 523 sourceImage->setContainerSize(sourceImage->size()); |
| 524 | 524 |
| 525 *status = NormalSourceImageStatus; | 525 *status = NormalSourceImageStatus; |
| 526 return sourceImage.release(); | 526 return sourceImage->imageForDefaultFrame(); |
| 527 } | 527 } |
| 528 | 528 |
| 529 bool HTMLImageElement::wouldTaintOrigin(SecurityOrigin* destinationSecurityOrigi
n) const | 529 bool HTMLImageElement::wouldTaintOrigin(SecurityOrigin* destinationSecurityOrigi
n) const |
| 530 { | 530 { |
| 531 ImageResource* image = cachedImage(); | 531 ImageResource* image = cachedImage(); |
| 532 if (!image) | 532 if (!image) |
| 533 return false; | 533 return false; |
| 534 return !image->isAccessAllowed(destinationSecurityOrigin); | 534 return !image->isAccessAllowed(destinationSecurityOrigin); |
| 535 } | 535 } |
| 536 | 536 |
| (...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 577 } | 577 } |
| 578 imageLoader().updateFromElement(behavior); | 578 imageLoader().updateFromElement(behavior); |
| 579 } | 579 } |
| 580 | 580 |
| 581 const KURL& HTMLImageElement::sourceURL() const | 581 const KURL& HTMLImageElement::sourceURL() const |
| 582 { | 582 { |
| 583 return cachedImage()->response().url(); | 583 return cachedImage()->response().url(); |
| 584 } | 584 } |
| 585 | 585 |
| 586 } | 586 } |
| OLD | NEW |