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 21 matching lines...) Expand all Loading... |
32 #include "FrameLoaderTypes.h" | 32 #include "FrameLoaderTypes.h" |
33 #include "FrameView.h" | 33 #include "FrameView.h" |
34 #include "MemoryCache.h" | 34 #include "MemoryCache.h" |
35 #include "Page.h" | 35 #include "Page.h" |
36 #include "RenderObject.h" | 36 #include "RenderObject.h" |
37 #include "ResourceLoader.h" | 37 #include "ResourceLoader.h" |
38 #include "RuntimeEnabledFeatures.h" | 38 #include "RuntimeEnabledFeatures.h" |
39 #include "Settings.h" | 39 #include "Settings.h" |
40 #include "SharedBuffer.h" | 40 #include "SharedBuffer.h" |
41 #include <wtf/CurrentTime.h> | 41 #include <wtf/CurrentTime.h> |
42 #include <wtf/MemoryInstrumentationHashMap.h> | |
43 #include <wtf/MemoryObjectInfo.h> | |
44 #include <wtf/StdLibExtras.h> | 42 #include <wtf/StdLibExtras.h> |
45 #include <wtf/Vector.h> | 43 #include <wtf/Vector.h> |
46 | 44 |
47 #if ENABLE(SVG) | 45 #if ENABLE(SVG) |
48 #include "SVGImage.h" | 46 #include "SVGImage.h" |
49 #endif | 47 #endif |
50 | 48 |
51 using std::max; | 49 using std::max; |
52 | 50 |
53 namespace WebCore { | 51 namespace WebCore { |
(...skipping 400 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
454 notifyObservers(); | 452 notifyObservers(); |
455 } | 453 } |
456 | 454 |
457 void CachedImage::changedInRect(const Image* image, const IntRect& rect) | 455 void CachedImage::changedInRect(const Image* image, const IntRect& rect) |
458 { | 456 { |
459 if (!image || image != m_image) | 457 if (!image || image != m_image) |
460 return; | 458 return; |
461 notifyObservers(&rect); | 459 notifyObservers(&rect); |
462 } | 460 } |
463 | 461 |
464 void CachedImage::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const | |
465 { | |
466 MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::CachedResou
rceImage); | |
467 memoryObjectInfo->setClassName("CachedImage"); | |
468 CachedResource::reportMemoryUsage(memoryObjectInfo); | |
469 info.addMember(m_pendingContainerSizeRequests, "pendingContainerSizeRequests
"); | |
470 info.addMember(m_image, "m_image"); | |
471 #if ENABLE(SVG) | |
472 info.addMember(m_svgImageCache, "svgImageCache"); | |
473 #endif | |
474 } | |
475 | |
476 bool CachedImage::currentFrameKnownToBeOpaque(const RenderObject* renderer) | 462 bool CachedImage::currentFrameKnownToBeOpaque(const RenderObject* renderer) |
477 { | 463 { |
478 Image* image = imageForRenderer(renderer); | 464 Image* image = imageForRenderer(renderer); |
479 if (image->isBitmapImage()) | 465 if (image->isBitmapImage()) |
480 image->nativeImageForCurrentFrame(); // force decode | 466 image->nativeImageForCurrentFrame(); // force decode |
481 return image->currentFrameKnownToBeOpaque(); | 467 return image->currentFrameKnownToBeOpaque(); |
482 } | 468 } |
483 | 469 |
484 } // namespace WebCore | 470 } // namespace WebCore |
OLD | NEW |