| 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, 2009, 2010 Apple Inc. All rights reserv
ed. | 4 * Copyright (C) 2004, 2005, 2006, 2007, 2009, 2010 Apple Inc. All rights reserv
ed. |
| 5 * | 5 * |
| 6 * This library is free software; you can redistribute it and/or | 6 * This library is free software; you can redistribute it and/or |
| 7 * modify it under the terms of the GNU Library General Public | 7 * modify it under the terms of the GNU Library General Public |
| 8 * License as published by the Free Software Foundation; either | 8 * License as published by the Free Software Foundation; either |
| 9 * version 2 of the License, or (at your option) any later version. | 9 * version 2 of the License, or (at your option) any later version. |
| 10 * | 10 * |
| (...skipping 18 matching lines...) Expand all Loading... |
| 29 #include "core/dom/Microtask.h" | 29 #include "core/dom/Microtask.h" |
| 30 #include "core/events/Event.h" | 30 #include "core/events/Event.h" |
| 31 #include "core/events/EventSender.h" | 31 #include "core/events/EventSender.h" |
| 32 #include "core/fetch/FetchRequest.h" | 32 #include "core/fetch/FetchRequest.h" |
| 33 #include "core/fetch/MemoryCache.h" | 33 #include "core/fetch/MemoryCache.h" |
| 34 #include "core/fetch/ResourceFetcher.h" | 34 #include "core/fetch/ResourceFetcher.h" |
| 35 #include "core/frame/LocalFrame.h" | 35 #include "core/frame/LocalFrame.h" |
| 36 #include "core/html/HTMLImageElement.h" | 36 #include "core/html/HTMLImageElement.h" |
| 37 #include "core/html/parser/HTMLParserIdioms.h" | 37 #include "core/html/parser/HTMLParserIdioms.h" |
| 38 #include "core/rendering/RenderImage.h" | 38 #include "core/rendering/RenderImage.h" |
| 39 #include "core/rendering/RenderVideo.h" | |
| 40 #include "platform/Logging.h" | 39 #include "platform/Logging.h" |
| 41 #include "public/platform/WebURLRequest.h" | 40 #include "public/platform/WebURLRequest.h" |
| 42 | 41 |
| 43 namespace blink { | 42 namespace blink { |
| 44 | 43 |
| 45 static ImageEventSender& loadEventSender() | 44 static ImageEventSender& loadEventSender() |
| 46 { | 45 { |
| 47 DEFINE_STATIC_LOCAL(ImageEventSender, sender, (EventTypeNames::load)); | 46 DEFINE_STATIC_LOCAL(ImageEventSender, sender, (EventTypeNames::load)); |
| 48 return sender; | 47 return sender; |
| 49 } | 48 } |
| (...skipping 313 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 363 RenderObject* renderer = m_element->renderer(); | 362 RenderObject* renderer = m_element->renderer(); |
| 364 | 363 |
| 365 if (!renderer) | 364 if (!renderer) |
| 366 return 0; | 365 return 0; |
| 367 | 366 |
| 368 // We don't return style generated image because it doesn't belong to the Im
ageLoader. | 367 // We don't return style generated image because it doesn't belong to the Im
ageLoader. |
| 369 // See <https://bugs.webkit.org/show_bug.cgi?id=42840> | 368 // See <https://bugs.webkit.org/show_bug.cgi?id=42840> |
| 370 if (renderer->isImage() && !static_cast<RenderImage*>(renderer)->isGenerated
Content()) | 369 if (renderer->isImage() && !static_cast<RenderImage*>(renderer)->isGenerated
Content()) |
| 371 return toRenderImage(renderer)->imageResource(); | 370 return toRenderImage(renderer)->imageResource(); |
| 372 | 371 |
| 373 if (renderer->isVideo()) | |
| 374 return toRenderVideo(renderer)->imageResource(); | |
| 375 | |
| 376 return 0; | 372 return 0; |
| 377 } | 373 } |
| 378 | 374 |
| 379 void ImageLoader::updateRenderer() | 375 void ImageLoader::updateRenderer() |
| 380 { | 376 { |
| 381 RenderImageResource* imageResource = renderImageResource(); | 377 RenderImageResource* imageResource = renderImageResource(); |
| 382 | 378 |
| 383 if (!imageResource) | 379 if (!imageResource) |
| 384 return; | 380 return; |
| 385 | 381 |
| (...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 504 void ImageLoader::sourceImageChanged() | 500 void ImageLoader::sourceImageChanged() |
| 505 { | 501 { |
| 506 HashSet<ImageLoaderClient*>::iterator end = m_clients.end(); | 502 HashSet<ImageLoaderClient*>::iterator end = m_clients.end(); |
| 507 for (HashSet<ImageLoaderClient*>::iterator it = m_clients.begin(); it != end
; ++it) { | 503 for (HashSet<ImageLoaderClient*>::iterator it = m_clients.begin(); it != end
; ++it) { |
| 508 ImageLoaderClient* handle = *it; | 504 ImageLoaderClient* handle = *it; |
| 509 handle->notifyImageSourceChanged(); | 505 handle->notifyImageSourceChanged(); |
| 510 } | 506 } |
| 511 } | 507 } |
| 512 | 508 |
| 513 } | 509 } |
| OLD | NEW |