Title: [132675] trunk/Source/WebCore
- Revision
- 132675
- Author
- [email protected]
- Date
- 2012-10-26 10:49:23 -0700 (Fri, 26 Oct 2012)
Log Message
Unreviewed, rolling out r132644.
http://trac.webkit.org/changeset/132644
https://bugs.webkit.org/show_bug.cgi?id=100497
Causes webkit_unit_tests
MemoryInstrumentationTest.ImageObserver to fail.
* platform/network/ResourceRequestBase.cpp:
(WebCore::ResourceRequestBase::reportMemoryUsage):
* platform/network/ResourceRequestBase.h:
(ResourceRequestBase):
* platform/network/chromium/ResourceRequest.cpp:
* platform/network/chromium/ResourceRequest.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (132674 => 132675)
--- trunk/Source/WebCore/ChangeLog 2012-10-26 17:30:33 UTC (rev 132674)
+++ trunk/Source/WebCore/ChangeLog 2012-10-26 17:49:23 UTC (rev 132675)
@@ -1,3 +1,19 @@
+2012-10-26 Vincent Scheib <[email protected]>
+
+ Unreviewed, rolling out r132644.
+ http://trac.webkit.org/changeset/132644
+ https://bugs.webkit.org/show_bug.cgi?id=100497
+
+ Causes webkit_unit_tests
+ MemoryInstrumentationTest.ImageObserver to fail.
+
+ * platform/network/ResourceRequestBase.cpp:
+ (WebCore::ResourceRequestBase::reportMemoryUsage):
+ * platform/network/ResourceRequestBase.h:
+ (ResourceRequestBase):
+ * platform/network/chromium/ResourceRequest.cpp:
+ * platform/network/chromium/ResourceRequest.h:
+
2012-10-26 Zeno Albisser <[email protected]>
[Qt] MiniBrowser segfaults on exit after using WebGL.
Modified: trunk/Source/WebCore/platform/network/ResourceRequestBase.cpp (132674 => 132675)
--- trunk/Source/WebCore/platform/network/ResourceRequestBase.cpp 2012-10-26 17:30:33 UTC (rev 132674)
+++ trunk/Source/WebCore/platform/network/ResourceRequestBase.cpp 2012-10-26 17:49:23 UTC (rev 132675)
@@ -447,7 +447,7 @@
m_httpHeaderFields.contains("If-Unmodified-Since"));
}
-void ResourceRequestBase::reportMemoryUsageBase(MemoryObjectInfo* memoryObjectInfo) const
+void ResourceRequestBase::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
{
MemoryClassInfo info(memoryObjectInfo, this, PlatformMemoryTypes::Loader);
info.addMember(m_url);
Modified: trunk/Source/WebCore/platform/network/ResourceRequestBase.h (132674 => 132675)
--- trunk/Source/WebCore/platform/network/ResourceRequestBase.h 2012-10-26 17:30:33 UTC (rev 132674)
+++ trunk/Source/WebCore/platform/network/ResourceRequestBase.h 2012-10-26 17:49:23 UTC (rev 132675)
@@ -132,6 +132,8 @@
bool reportRawHeaders() const { return m_reportRawHeaders; }
void setReportRawHeaders(bool reportRawHeaders) { m_reportRawHeaders = reportRawHeaders; }
+ void reportMemoryUsage(MemoryObjectInfo*) const;
+
static double defaultTimeoutInterval(); // May return 0 when using platform default.
static void setDefaultTimeoutInterval(double);
@@ -167,8 +169,6 @@
void updatePlatformRequest() const;
void updateResourceRequest() const;
- void reportMemoryUsageBase(MemoryObjectInfo*) const;
-
// The ResourceRequest subclass may "shadow" this method to compare platform specific fields
static bool platformCompare(const ResourceRequest&, const ResourceRequest&) { return true; }
Modified: trunk/Source/WebCore/platform/network/chromium/ResourceRequest.cpp (132674 => 132675)
--- trunk/Source/WebCore/platform/network/chromium/ResourceRequest.cpp 2012-10-26 17:30:33 UTC (rev 132674)
+++ trunk/Source/WebCore/platform/network/chromium/ResourceRequest.cpp 2012-10-26 17:49:23 UTC (rev 132675)
@@ -26,8 +26,6 @@
#include "config.h"
#include "ResourceRequest.h"
-#include "PlatformMemoryInstrumentation.h"
-
namespace WebCore {
// This is used by the loader to control the number of issued parallel load requests.
@@ -60,11 +58,4 @@
m_targetType = data->m_targetType;
}
-void ResourceRequest::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
-{
- MemoryClassInfo info(memoryObjectInfo, this, PlatformMemoryTypes::Loader);
- ResourceRequestBase::reportMemoryUsageBase(memoryObjectInfo);
- info.addMember(m_extraData);
-}
-
} // namespace WebCore
Modified: trunk/Source/WebCore/platform/network/chromium/ResourceRequest.h (132674 => 132675)
--- trunk/Source/WebCore/platform/network/chromium/ResourceRequest.h 2012-10-26 17:30:33 UTC (rev 132674)
+++ trunk/Source/WebCore/platform/network/chromium/ResourceRequest.h 2012-10-26 17:49:23 UTC (rev 132675)
@@ -140,8 +140,6 @@
TargetType targetType() const { return m_targetType; }
void setTargetType(TargetType type) { m_targetType = type; }
- void reportMemoryUsage(MemoryObjectInfo*) const;
-
private:
friend class ResourceRequestBase;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
