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 484 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
495 bool ImageResource::currentFrameKnownToBeOpaque(const RenderObject* renderer) | 495 bool ImageResource::currentFrameKnownToBeOpaque(const RenderObject* renderer) |
496 { | 496 { |
497 blink::Image* image = imageForRenderer(renderer); | 497 blink::Image* image = imageForRenderer(renderer); |
498 if (image->isBitmapImage()) { | 498 if (image->isBitmapImage()) { |
499 TRACE_EVENT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "PaintImage
", "data", InspectorPaintImageEvent::data(renderer, *this)); | 499 TRACE_EVENT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "PaintImage
", "data", InspectorPaintImageEvent::data(renderer, *this)); |
500 image->nativeImageForCurrentFrame(); // force decode | 500 image->nativeImageForCurrentFrame(); // force decode |
501 } | 501 } |
502 return image->currentFrameKnownToBeOpaque(); | 502 return image->currentFrameKnownToBeOpaque(); |
503 } | 503 } |
504 | 504 |
505 bool ImageResource::isAccessAllowed(SecurityOrigin* securityOrigin) | 505 bool ImageResource::isAccessAllowed(ExecutionContext* context, SecurityOrigin* s
ecurityOrigin) |
506 { | 506 { |
507 if (response().wasFetchedViaServiceWorker()) | 507 if (response().wasFetchedViaServiceWorker()) |
508 return response().serviceWorkerResponseType() != WebServiceWorkerRespons
eTypeOpaque; | 508 return response().serviceWorkerResponseType() != WebServiceWorkerRespons
eTypeOpaque; |
509 if (!image()->currentFrameHasSingleSecurityOrigin()) | 509 if (!image()->currentFrameHasSingleSecurityOrigin()) |
510 return false; | 510 return false; |
511 if (passesAccessControlCheck(securityOrigin)) | 511 if (passesAccessControlCheck(context, securityOrigin)) |
512 return true; | 512 return true; |
513 return !securityOrigin->taintsCanvas(response().url()); | 513 return !securityOrigin->taintsCanvas(response().url()); |
514 } | 514 } |
515 | 515 |
516 } // namespace blink | 516 } // namespace blink |
OLD | NEW |