Title: [141874] trunk/Source/WebCore
- Revision
- 141874
- Author
- [email protected]
- Date
- 2013-02-05 01:37:13 -0800 (Tue, 05 Feb 2013)
Log Message
Web Inspector: Native Memory Instrumentation: rename Image m_data member to m_encodedImageData for the consistency
https://bugs.webkit.org/show_bug.cgi?id=108913
Reviewed by Yury Semikhatsky.
No new tests because no API changes.
* platform/graphics/Image.cpp:
(WebCore::Image::setData):
(WebCore::Image::reportMemoryUsage):
* platform/graphics/Image.h:
(WebCore::Image::data):
(Image):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (141873 => 141874)
--- trunk/Source/WebCore/ChangeLog 2013-02-05 09:19:31 UTC (rev 141873)
+++ trunk/Source/WebCore/ChangeLog 2013-02-05 09:37:13 UTC (rev 141874)
@@ -1,3 +1,19 @@
+2013-02-04 Ilya Tikhonovsky <[email protected]>
+
+ Web Inspector: Native Memory Instrumentation: rename Image m_data member to m_encodedImageData for the consistency
+ https://bugs.webkit.org/show_bug.cgi?id=108913
+
+ Reviewed by Yury Semikhatsky.
+
+ No new tests because no API changes.
+
+ * platform/graphics/Image.cpp:
+ (WebCore::Image::setData):
+ (WebCore::Image::reportMemoryUsage):
+ * platform/graphics/Image.h:
+ (WebCore::Image::data):
+ (Image):
+
2013-02-05 Hajime Morrita <[email protected]>
Unreviewed Linux ASAN build fix for r141783.
Modified: trunk/Source/WebCore/platform/graphics/Image.cpp (141873 => 141874)
--- trunk/Source/WebCore/platform/graphics/Image.cpp 2013-02-05 09:19:31 UTC (rev 141873)
+++ trunk/Source/WebCore/platform/graphics/Image.cpp 2013-02-05 09:37:13 UTC (rev 141874)
@@ -70,11 +70,11 @@
bool Image::setData(PassRefPtr<SharedBuffer> data, bool allDataReceived)
{
- m_data = data;
- if (!m_data.get())
+ m_encodedImageData = data;
+ if (!m_encodedImageData.get())
return true;
- int length = m_data->size();
+ int length = m_encodedImageData->size();
if (!length)
return true;
@@ -203,7 +203,7 @@
{
MemoryClassInfo info(memoryObjectInfo, this, PlatformMemoryTypes::Image);
memoryObjectInfo->setClassName("Image");
- info.addMember(m_data, "m_data");
+ info.addMember(m_encodedImageData, "encodedImageData");
info.addWeakPointer(m_imageObserver);
}
Modified: trunk/Source/WebCore/platform/graphics/Image.h (141873 => 141874)
--- trunk/Source/WebCore/platform/graphics/Image.h 2013-02-05 09:19:31 UTC (rev 141873)
+++ trunk/Source/WebCore/platform/graphics/Image.h 2013-02-05 09:37:13 UTC (rev 141874)
@@ -128,7 +128,7 @@
virtual void destroyDecodedData(bool destroyAll = true) = 0;
virtual unsigned decodedSize() const = 0;
- SharedBuffer* data() { return m_data.get(); }
+ SharedBuffer* data() { return m_encodedImageData.get(); }
// Animation begins whenever someone draws the image, so startAnimation() is not normally called.
// It will automatically pause once all observers no longer want to render the image anywhere.
@@ -207,7 +207,7 @@
virtual Color solidColor() const { return Color(); }
private:
- RefPtr<SharedBuffer> m_data; // The encoded raw data for the image.
+ RefPtr<SharedBuffer> m_encodedImageData;
ImageObserver* m_imageObserver;
};
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
