Modified: trunk/Source/WebCore/ChangeLog (143937 => 143938)
--- trunk/Source/WebCore/ChangeLog 2013-02-25 17:30:23 UTC (rev 143937)
+++ trunk/Source/WebCore/ChangeLog 2013-02-25 17:47:24 UTC (rev 143938)
@@ -1,3 +1,29 @@
+2013-02-25 Vsevolod Vlasov <[email protected]>
+
+ WebInspector: Do not keep track of resources unless they have a valid loader identifier.
+ https://bugs.webkit.org/show_bug.cgi?id=110761
+
+ Reviewed by Pavel Feldman.
+
+ * inspector/NetworkResourcesData.cpp:
+ (WebCore::NetworkResourcesData::responseReceived):
+ (WebCore::NetworkResourcesData::setResourceType):
+ (WebCore::NetworkResourcesData::resourceType):
+ (WebCore::NetworkResourcesData::setResourceContent):
+ (WebCore::NetworkResourcesData::maybeAddResourceData):
+ (WebCore::NetworkResourcesData::maybeDecodeDataToContent):
+ (WebCore::NetworkResourcesData::addCachedResource):
+ (WebCore::NetworkResourcesData::addResourceSharedBuffer):
+ (WebCore::NetworkResourcesData::data):
+ (WebCore::NetworkResourcesData::xhrReplayData):
+ (WebCore::NetworkResourcesData::setXHRReplayData):
+ (WebCore::NetworkResourcesData::reuseXHRReplayData):
+ (WebCore::NetworkResourcesData::resourceDataForRequestId):
+ (WebCore::NetworkResourcesData::ensureNoDataForRequestId):
+ (WebCore::NetworkResourcesData::ensureFreeSpace):
+ * inspector/NetworkResourcesData.h:
+ (NetworkResourcesData):
+
2013-02-25 Mariusz Grzegorczyk <[email protected]>
[EFL][GTK] Move text selection/focus notification for a11y from gtk to atk directory
Modified: trunk/Source/WebCore/inspector/NetworkResourcesData.cpp (143937 => 143938)
--- trunk/Source/WebCore/inspector/NetworkResourcesData.cpp 2013-02-25 17:30:23 UTC (rev 143937)
+++ trunk/Source/WebCore/inspector/NetworkResourcesData.cpp 2013-02-25 17:47:24 UTC (rev 143938)
@@ -199,7 +199,7 @@
void NetworkResourcesData::responseReceived(const String& requestId, const String& frameId, const ResourceResponse& response)
{
- ResourceData* resourceData = m_requestIdToResourceDataMap.get(requestId);
+ ResourceData* resourceData = resourceDataForRequestId(requestId);
if (!resourceData)
return;
resourceData->setFrameId(frameId);
@@ -210,7 +210,7 @@
void NetworkResourcesData::setResourceType(const String& requestId, InspectorPageAgent::ResourceType type)
{
- ResourceData* resourceData = m_requestIdToResourceDataMap.get(requestId);
+ ResourceData* resourceData = resourceDataForRequestId(requestId);
if (!resourceData)
return;
resourceData->setType(type);
@@ -218,7 +218,7 @@
InspectorPageAgent::ResourceType NetworkResourcesData::resourceType(const String& requestId)
{
- ResourceData* resourceData = m_requestIdToResourceDataMap.get(requestId);
+ ResourceData* resourceData = resourceDataForRequestId(requestId);
if (!resourceData)
return InspectorPageAgent::OtherResource;
return resourceData->type();
@@ -226,7 +226,7 @@
void NetworkResourcesData::setResourceContent(const String& requestId, const String& content, bool base64Encoded)
{
- ResourceData* resourceData = m_requestIdToResourceDataMap.get(requestId);
+ ResourceData* resourceData = resourceDataForRequestId(requestId);
if (!resourceData)
return;
size_t dataLength = contentSizeInBytes(content);
@@ -246,7 +246,7 @@
void NetworkResourcesData::maybeAddResourceData(const String& requestId, const char* data, size_t dataLength)
{
- ResourceData* resourceData = m_requestIdToResourceDataMap.get(requestId);
+ ResourceData* resourceData = resourceDataForRequestId(requestId);
if (!resourceData)
return;
if (!resourceData->decoder())
@@ -264,7 +264,7 @@
void NetworkResourcesData::maybeDecodeDataToContent(const String& requestId)
{
- ResourceData* resourceData = m_requestIdToResourceDataMap.get(requestId);
+ ResourceData* resourceData = resourceDataForRequestId(requestId);
if (!resourceData)
return;
if (!resourceData->hasData())
@@ -277,16 +277,15 @@
void NetworkResourcesData::addCachedResource(const String& requestId, CachedResource* cachedResource)
{
- if (!m_requestIdToResourceDataMap.contains(requestId))
+ ResourceData* resourceData = resourceDataForRequestId(requestId);
+ if (!resourceData)
return;
- ResourceData* resourceData = m_requestIdToResourceDataMap.get(requestId);
-
resourceData->setCachedResource(cachedResource);
}
void NetworkResourcesData::addResourceSharedBuffer(const String& requestId, PassRefPtr<SharedBuffer> buffer, const String& textEncodingName)
{
- ResourceData* resourceData = m_requestIdToResourceDataMap.get(requestId);
+ ResourceData* resourceData = resourceDataForRequestId(requestId);
if (!resourceData)
return;
resourceData->setBuffer(buffer);
@@ -295,7 +294,7 @@
NetworkResourcesData::ResourceData const* NetworkResourcesData::data(const String& requestId)
{
- return m_requestIdToResourceDataMap.get(requestId);
+ return resourceDataForRequestId(requestId);
}
XHRReplayData* NetworkResourcesData::xhrReplayData(const String& requestId)
@@ -303,7 +302,7 @@
if (m_reusedXHRReplayDataRequestIds.contains(requestId))
return xhrReplayData(m_reusedXHRReplayDataRequestIds.get(requestId));
- ResourceData* resourceData = m_requestIdToResourceDataMap.get(requestId);
+ ResourceData* resourceData = resourceDataForRequestId(requestId);
if (!resourceData)
return 0;
return resourceData->xhrReplayData();
@@ -311,7 +310,7 @@
void NetworkResourcesData::setXHRReplayData(const String& requestId, XHRReplayData* xhrReplayData)
{
- ResourceData* resourceData = m_requestIdToResourceDataMap.get(requestId);
+ ResourceData* resourceData = resourceDataForRequestId(requestId);
if (!resourceData) {
Vector<String> result;
ReusedRequestIds::iterator it;
@@ -328,8 +327,8 @@
void NetworkResourcesData::reuseXHRReplayData(const String& requestId, const String& reusedRequestId)
{
- ResourceData* reusedResourceData = m_requestIdToResourceDataMap.get(reusedRequestId);
- ResourceData* resourceData = m_requestIdToResourceDataMap.get(requestId);
+ ResourceData* reusedResourceData = resourceDataForRequestId(reusedRequestId);
+ ResourceData* resourceData = resourceDataForRequestId(requestId);
if (!reusedResourceData || !resourceData) {
m_reusedXHRReplayDataRequestIds.set(requestId, reusedRequestId);
return;
@@ -382,16 +381,22 @@
m_maximumSingleResourceContentSize = maximumSingleResourceContentSize;
}
+NetworkResourcesData::ResourceData* NetworkResourcesData::resourceDataForRequestId(const String& requestId)
+{
+ if (requestId.isNull())
+ return 0;
+ return m_requestIdToResourceDataMap.get(requestId);
+}
void NetworkResourcesData::ensureNoDataForRequestId(const String& requestId)
{
- ResourceData* resourceData = m_requestIdToResourceDataMap.get(requestId);
- if (resourceData) {
- if (resourceData->hasContent() || resourceData->hasData())
- m_contentSize -= resourceData->evictContent();
- delete resourceData;
- m_requestIdToResourceDataMap.remove(requestId);
- }
+ ResourceData* resourceData = resourceDataForRequestId(requestId);
+ if (!resourceData)
+ return;
+ if (resourceData->hasContent() || resourceData->hasData())
+ m_contentSize -= resourceData->evictContent();
+ delete resourceData;
+ m_requestIdToResourceDataMap.remove(requestId);
}
bool NetworkResourcesData::ensureFreeSpace(size_t size)
@@ -401,7 +406,7 @@
while (size > m_maximumResourcesContentSize - m_contentSize) {
String requestId = m_requestIdsDeque.takeFirst();
- ResourceData* resourceData = m_requestIdToResourceDataMap.get(requestId);
+ ResourceData* resourceData = resourceDataForRequestId(requestId);
if (resourceData)
m_contentSize -= resourceData->evictContent();
}
Modified: trunk/Source/WebCore/inspector/NetworkResourcesData.h (143937 => 143938)
--- trunk/Source/WebCore/inspector/NetworkResourcesData.h 2013-02-25 17:30:23 UTC (rev 143937)
+++ trunk/Source/WebCore/inspector/NetworkResourcesData.h 2013-02-25 17:47:24 UTC (rev 143938)
@@ -170,6 +170,7 @@
void reportMemoryUsage(MemoryObjectInfo*) const;
private:
+ ResourceData* resourceDataForRequestId(const String& requestId);
void ensureNoDataForRequestId(const String& requestId);
bool ensureFreeSpace(size_t);
