Changeset 134037 in webkit

Timestamp:

Nov 9, 2012 2:06:43 AM (11 years ago)

Author:

vsevik@chromium.org

Message:

Web Inspector: Add meaningful error message when request content was evicted from inspector cache.
​https://bugs.webkit.org/show_bug.cgi?id=101578

Reviewed by Yury Semikhatsky.

Added specific error message when request content was evicted from inspector cache.
Replaced purge with evict in fields/methods names.

• inspector/InspectorResourceAgent.cpp:

(WebCore::InspectorResourceAgent::getResponseBody):

• inspector/NetworkResourcesData.cpp:

(WebCore::NetworkResourcesData::ResourceData::ResourceData):
(WebCore::NetworkResourcesData::ResourceData::evictContent):
(WebCore::NetworkResourcesData::setResourceContent):
(WebCore::NetworkResourcesData::maybeAddResourceData):
(WebCore::NetworkResourcesData::maybeDecodeDataToContent):
(WebCore::NetworkResourcesData::ensureNoDataForRequestId):
(WebCore::NetworkResourcesData::ensureFreeSpace):

• inspector/NetworkResourcesData.h:

(WebCore::NetworkResourcesData::ResourceData::isContentEvicted):
(ResourceData):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/InspectorResourceAgent.cpp (modified) (1 diff)
• inspector/NetworkResourcesData.cpp (modified) (7 diffs)
• inspector/NetworkResourcesData.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-11-09  Vsevolod Vlasov  <vsevik@chromium.org>
+
+        Web Inspector: Add meaningful error message when request content was evicted from inspector cache.
+        https://bugs.webkit.org/show_bug.cgi?id=101578
+
+        Reviewed by Yury Semikhatsky.
+
+        Added specific error message when request content was evicted from inspector cache.
+        Replaced purge with evict in fields/methods names.
+
+        * inspector/InspectorResourceAgent.cpp:
+        (WebCore::InspectorResourceAgent::getResponseBody):
+        * inspector/NetworkResourcesData.cpp:
+        (WebCore::NetworkResourcesData::ResourceData::ResourceData):
+        (WebCore::NetworkResourcesData::ResourceData::evictContent):
+        (WebCore::NetworkResourcesData::setResourceContent):
+        (WebCore::NetworkResourcesData::maybeAddResourceData):
+        (WebCore::NetworkResourcesData::maybeDecodeDataToContent):
+        (WebCore::NetworkResourcesData::ensureNoDataForRequestId):
+        (WebCore::NetworkResourcesData::ensureFreeSpace):
+        * inspector/NetworkResourcesData.h:
+        (WebCore::NetworkResourcesData::ResourceData::isContentEvicted):
+        (ResourceData):
+
 2012-11-09  Kent Tamura  <tkent@chromium.org>
 

trunk/Source/WebCore/inspector/InspectorResourceAgent.cpp

@@ -601 +601 @@
     }
 
+    if (resourceData->isContentEvicted()) {
+        *errorString = "Request content was evicted from inspector cache";
+        return;
+    }
+
     if (resourceData->buffer() && !resourceData->textEncodingName().isNull()) {
         *base64Encoded = false;

trunk/Source/WebCore/inspector/NetworkResourcesData.cpp

@@ -82 +82 @@
     , m_loaderId(loaderId)
     , m_base64Encoded(false)
-    , m_isContentPurged(false)
+    , m_isContentEvicted(false)
     , m_type(InspectorPageAgent::OtherResource)
     , m_cachedResource(0)
@@ -118 +118 @@
 }
 
-unsigned NetworkResourcesData::ResourceData::purgeContent()
-{
-    m_isContentPurged = true;
+unsigned NetworkResourcesData::ResourceData::evictContent()
+{
+    m_isContentEvicted = true;
     return removeContent();
 }
@@ -233 +233 @@
     if (dataLength > m_maximumSingleResourceContentSize)
         return;
-    if (resourceData->isContentPurged())
-        return;
-    if (ensureFreeSpace(dataLength) && !resourceData->isContentPurged()) {
+    if (resourceData->isContentEvicted())
+        return;
+    if (ensureFreeSpace(dataLength) && !resourceData->isContentEvicted()) {
         // We can not be sure that we didn't try to save this request data while it was loading, so remove it, if any.
         if (resourceData->hasContent())
@@ -253 +253 @@
         return;
     if (resourceData->dataLength() + dataLength > m_maximumSingleResourceContentSize)
-        m_contentSize -= resourceData->purgeContent();
-    if (resourceData->isContentPurged())
-        return;
-    if (ensureFreeSpace(dataLength) && !resourceData->isContentPurged()) {
+        m_contentSize -= resourceData->evictContent();
+    if (resourceData->isContentEvicted())
+        return;
+    if (ensureFreeSpace(dataLength) && !resourceData->isContentEvicted()) {
         m_requestIdsDeque.append(requestId);
         resourceData->appendData(data, dataLength);
@@ -273 +273 @@
     size_t dataLength = contentSizeInBytes(resourceData->content());
     if (dataLength > m_maximumSingleResourceContentSize)
-        m_contentSize -= resourceData->purgeContent();
+        m_contentSize -= resourceData->evictContent();
 }
 
@@ -389 +389 @@
     if (resourceData) {
         if (resourceData->hasContent() || resourceData->hasData())
-            m_contentSize -= resourceData->purgeContent();
+            m_contentSize -= resourceData->evictContent();
         delete resourceData;
         m_requestIdToResourceDataMap.remove(requestId);
@@ -404 +404 @@
         ResourceData* resourceData = m_requestIdToResourceDataMap.get(requestId);
         if (resourceData)
-            m_contentSize -= resourceData->purgeContent();
+            m_contentSize -= resourceData->evictContent();
     }
     return true;

trunk/Source/WebCore/inspector/NetworkResourcesData.h

@@ -95 +95 @@
 
         unsigned removeContent();
-        bool isContentPurged() const { return m_isContentPurged; }
-        unsigned purgeContent();
+        bool isContentEvicted() const { return m_isContentEvicted; }
+        unsigned evictContent();
 
         InspectorPageAgent::ResourceType type() const { return m_type; }
@@ -135 +135 @@
         bool m_base64Encoded;
         RefPtr<SharedBuffer> m_dataBuffer;
-        bool m_isContentPurged;
+        bool m_isContentEvicted;
         InspectorPageAgent::ResourceType m_type;
         int m_httpStatusCode;