| 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 23 matching lines...) Expand all Loading... |
| 34 #include "HTMLNames.h" | 34 #include "HTMLNames.h" |
| 35 #include "HTMLObjectElement.h" | 35 #include "HTMLObjectElement.h" |
| 36 #include "HTMLParserIdioms.h" | 36 #include "HTMLParserIdioms.h" |
| 37 #include "RenderImage.h" | 37 #include "RenderImage.h" |
| 38 #include "RenderVideo.h" | 38 #include "RenderVideo.h" |
| 39 #include "ScriptCallStack.h" | 39 #include "ScriptCallStack.h" |
| 40 #include "SecurityOrigin.h" | 40 #include "SecurityOrigin.h" |
| 41 #include "WebCoreMemoryInstrumentation.h" | 41 #include "WebCoreMemoryInstrumentation.h" |
| 42 | 42 |
| 43 #if ENABLE(SVG) | 43 #if ENABLE(SVG) |
| 44 #include "RenderSVGImage.h" | 44 #include "core/rendering/svg/RenderSVGImage.h" |
| 45 #endif | 45 #endif |
| 46 | 46 |
| 47 #if !ASSERT_DISABLED | 47 #if !ASSERT_DISABLED |
| 48 // ImageLoader objects are allocated as members of other objects, so generic poi
nter check would always fail. | 48 // ImageLoader objects are allocated as members of other objects, so generic poi
nter check would always fail. |
| 49 namespace WTF { | 49 namespace WTF { |
| 50 | 50 |
| 51 template<> struct ValueCheck<WebCore::ImageLoader*> { | 51 template<> struct ValueCheck<WebCore::ImageLoader*> { |
| 52 typedef WebCore::ImageLoader* TraitType; | 52 typedef WebCore::ImageLoader* TraitType; |
| 53 static void checkConsistency(const WebCore::ImageLoader* p) | 53 static void checkConsistency(const WebCore::ImageLoader* p) |
| 54 { | 54 { |
| (...skipping 423 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 478 void ImageLoader::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const | 478 void ImageLoader::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const |
| 479 { | 479 { |
| 480 MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::Image); | 480 MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::Image); |
| 481 info.addMember(m_element, "element"); | 481 info.addMember(m_element, "element"); |
| 482 info.addMember(m_image.get(), "image", WTF::RetainingPointer); | 482 info.addMember(m_image.get(), "image", WTF::RetainingPointer); |
| 483 info.addMember(m_derefElementTimer, "derefElementTimer"); | 483 info.addMember(m_derefElementTimer, "derefElementTimer"); |
| 484 info.addMember(m_failedLoadURL, "failedLoadURL"); | 484 info.addMember(m_failedLoadURL, "failedLoadURL"); |
| 485 } | 485 } |
| 486 | 486 |
| 487 } | 487 } |
| OLD | NEW |