| OLD | NEW |
| 1 /* | 1 /* |
| 2 Copyright (C) 1998 Lars Knoll (knoll@mpi-hd.mpg.de) | 2 Copyright (C) 1998 Lars Knoll (knoll@mpi-hd.mpg.de) |
| 3 Copyright (C) 2001 Dirk Mueller (mueller@kde.org) | 3 Copyright (C) 2001 Dirk Mueller (mueller@kde.org) |
| 4 Copyright (C) 2002 Waldo Bastian (bastian@kde.org) | 4 Copyright (C) 2002 Waldo Bastian (bastian@kde.org) |
| 5 Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com) | 5 Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com) |
| 6 Copyright (C) 2004, 2005, 2006, 2007 Apple Inc. All rights reserved. | 6 Copyright (C) 2004, 2005, 2006, 2007 Apple Inc. All rights reserved. |
| 7 | 7 |
| 8 This library is free software; you can redistribute it and/or | 8 This library is free software; you can redistribute it and/or |
| 9 modify it under the terms of the GNU Library General Public | 9 modify it under the terms of the GNU Library General Public |
| 10 License as published by the Free Software Foundation; either | 10 License as published by the Free Software Foundation; either |
| (...skipping 475 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 486 if (!image || image != m_image) | 486 if (!image || image != m_image) |
| 487 return; | 487 return; |
| 488 notifyObservers(&rect); | 488 notifyObservers(&rect); |
| 489 } | 489 } |
| 490 | 490 |
| 491 bool ImageResource::currentFrameKnownToBeOpaque(const LayoutObject* renderer) | 491 bool ImageResource::currentFrameKnownToBeOpaque(const LayoutObject* renderer) |
| 492 { | 492 { |
| 493 blink::Image* image = imageForRenderer(renderer); | 493 blink::Image* image = imageForRenderer(renderer); |
| 494 if (image->isBitmapImage()) { | 494 if (image->isBitmapImage()) { |
| 495 TRACE_EVENT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "PaintImage
", "data", InspectorPaintImageEvent::data(renderer, *this)); | 495 TRACE_EVENT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "PaintImage
", "data", InspectorPaintImageEvent::data(renderer, *this)); |
| 496 image->nativeImageForCurrentFrame(); // force decode | 496 image->bitmapForCurrentFrame(); // force decode |
| 497 } | 497 } |
| 498 return image->currentFrameKnownToBeOpaque(); | 498 return image->currentFrameKnownToBeOpaque(); |
| 499 } | 499 } |
| 500 | 500 |
| 501 bool ImageResource::isAccessAllowed(ExecutionContext* context, SecurityOrigin* s
ecurityOrigin) | 501 bool ImageResource::isAccessAllowed(ExecutionContext* context, SecurityOrigin* s
ecurityOrigin) |
| 502 { | 502 { |
| 503 if (response().wasFetchedViaServiceWorker()) | 503 if (response().wasFetchedViaServiceWorker()) |
| 504 return response().serviceWorkerResponseType() != WebServiceWorkerRespons
eTypeOpaque; | 504 return response().serviceWorkerResponseType() != WebServiceWorkerRespons
eTypeOpaque; |
| 505 if (!image()->currentFrameHasSingleSecurityOrigin()) | 505 if (!image()->currentFrameHasSingleSecurityOrigin()) |
| 506 return false; | 506 return false; |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 542 if (node && isHTMLImageElement(node)) { | 542 if (node && isHTMLImageElement(node)) { |
| 543 const AtomicString& urlString = toHTMLImageElement(node)->imageSourceURL
(); | 543 const AtomicString& urlString = toHTMLImageElement(node)->imageSourceURL
(); |
| 544 KURL url = node->document().completeURL(urlString); | 544 KURL url = node->document().completeURL(urlString); |
| 545 imageForContainer->setURL(url); | 545 imageForContainer->setURL(url); |
| 546 } | 546 } |
| 547 | 547 |
| 548 return imageForContainer.get(); | 548 return imageForContainer.get(); |
| 549 } | 549 } |
| 550 | 550 |
| 551 } // namespace blink | 551 } // namespace blink |
| OLD | NEW |