Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(341)

Side by Side Diff: Source/WebCore/loader/cache/CachedImage.h

Issue 12314169: Merge 143541 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1410/
Patch Set: Created 7 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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) 2006 Samuel Weinig (sam.weinig@gmail.com) 4 Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
5 Copyright (C) 2004, 2005, 2006, 2007 Apple Inc. All rights reserved. 5 Copyright (C) 2004, 2005, 2006, 2007 Apple Inc. All rights reserved.
6 6
7 This library is free software; you can redistribute it and/or 7 This library is free software; you can redistribute it and/or
8 modify it under the terms of the GNU Library General Public 8 modify it under the terms of the GNU Library General Public
9 License as published by the Free Software Foundation; either 9 License as published by the Free Software Foundation; either
10 version 2 of the License, or (at your option) any later version. 10 version 2 of the License, or (at your option) any later version.
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 virtual void decodedSizeChanged(const Image* image, int delta); 90 virtual void decodedSizeChanged(const Image* image, int delta);
91 virtual void didDraw(const Image*); 91 virtual void didDraw(const Image*);
92 92
93 virtual bool shouldPauseAnimation(const Image*); 93 virtual bool shouldPauseAnimation(const Image*);
94 virtual void animationAdvanced(const Image*); 94 virtual void animationAdvanced(const Image*);
95 virtual void changedInRect(const Image*, const IntRect&); 95 virtual void changedInRect(const Image*, const IntRect&);
96 96
97 virtual void reportMemoryUsage(MemoryObjectInfo*) const OVERRIDE; 97 virtual void reportMemoryUsage(MemoryObjectInfo*) const OVERRIDE;
98 98
99 private: 99 private:
100 Image* lookupOrCreateImageForRenderer(const RenderObject*);
101
102 void clear(); 100 void clear();
103 101
104 void createImage(); 102 void createImage();
105 void clearImage(); 103 void clearImage();
106 size_t maximumDecodedImageSize(); 104 size_t maximumDecodedImageSize();
107 // If not null, changeRect is the changed part of the image. 105 // If not null, changeRect is the changed part of the image.
108 void notifyObservers(const IntRect* changeRect = 0); 106 void notifyObservers(const IntRect* changeRect = 0);
109 virtual PurgePriority purgePriority() const { return PurgeFirst; } 107 virtual PurgePriority purgePriority() const { return PurgeFirst; }
110 void checkShouldPaintBrokenImage(); 108 void checkShouldPaintBrokenImage();
111 109
112 virtual void switchClientsToRevalidatedResource() OVERRIDE; 110 virtual void switchClientsToRevalidatedResource() OVERRIDE;
113 111
114 typedef pair<IntSize, float> SizeAndZoom; 112 typedef pair<IntSize, float> SizeAndZoom;
115 typedef HashMap<const CachedImageClient*, SizeAndZoom> ContainerSizeRequests ; 113 typedef HashMap<const CachedImageClient*, SizeAndZoom> ContainerSizeRequests ;
116 ContainerSizeRequests m_pendingContainerSizeRequests; 114 ContainerSizeRequests m_pendingContainerSizeRequests;
117 115
118 RefPtr<Image> m_image; 116 RefPtr<Image> m_image;
119 #if ENABLE(SVG) 117 #if ENABLE(SVG)
120 OwnPtr<SVGImageCache> m_svgImageCache; 118 OwnPtr<SVGImageCache> m_svgImageCache;
121 #endif 119 #endif
122 bool m_shouldPaintBrokenImage; 120 bool m_shouldPaintBrokenImage;
123 }; 121 };
124 122
125 } 123 }
126 124
127 #endif 125 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698