Diff
Modified: trunk/LayoutTests/ChangeLog (124020 => 124021)
--- trunk/LayoutTests/ChangeLog 2012-07-30 13:21:24 UTC (rev 124020)
+++ trunk/LayoutTests/ChangeLog 2012-07-30 13:29:41 UTC (rev 124021)
@@ -1,3 +1,15 @@
+2012-07-30 Vsevolod Vlasov <vse...@chromium.org>
+
+ Web Inspector: Content size variables in NetworkResourcesData should have size_t type instead of int.
+ https://bugs.webkit.org/show_bug.cgi?id=92618
+
+ Reviewed by Yury Semikhatsky.
+
+ * http/tests/inspector/network/network-content-replacement-embed-expected.txt:
+ * http/tests/inspector/network/network-content-replacement-embed.html:
+ * http/tests/inspector/network/network-content-replacement-xhr-expected.txt:
+ * http/tests/inspector/network/network-content-replacement-xhr.html:
+
2012-07-30 János Badics <jbad...@inf.u-szeged.hu>
[Qt][WK1] Gardening after r123988. It made fast/writing-mode/flipped-blocks-hit-test-line-edges.html fail
Modified: trunk/LayoutTests/http/tests/inspector/network/network-content-replacement-embed-expected.txt (124020 => 124021)
--- trunk/LayoutTests/http/tests/inspector/network/network-content-replacement-embed-expected.txt 2012-07-30 13:21:24 UTC (rev 124020)
+++ trunk/LayoutTests/http/tests/inspector/network/network-content-replacement-embed-expected.txt 2012-07-30 13:29:41 UTC (rev 124021)
@@ -1,4 +1,4 @@
-CONSOLE MESSAGE: line 60: Done.
+CONSOLE MESSAGE: line 58: Done.
Tests NetworkResourcesData logic for embed content replacement.
Modified: trunk/LayoutTests/http/tests/inspector/network/network-content-replacement-embed.html (124020 => 124021)
--- trunk/LayoutTests/http/tests/inspector/network/network-content-replacement-embed.html 2012-07-30 13:21:24 UTC (rev 124020)
+++ trunk/LayoutTests/http/tests/inspector/network/network-content-replacement-embed.html 2012-07-30 13:29:41 UTC (rev 124021)
@@ -29,9 +29,7 @@
console.log("This test can not be run as window.internals is not available.");
return;
}
- // Each '*' symbol in original data will use two bytes in String object
- // after decoding, hence multiplying by two.
- internals.settings.setInspectorResourcesDataSizeLimits(2*300, 2*200);
+ internals.settings.setInspectorResourcesDataSizeLimits(300, 200);
// Here we test replacement logic. We save first two resources content,
// discard third resource content once we see its size exceeds limit,
Modified: trunk/LayoutTests/http/tests/inspector/network/network-content-replacement-xhr-expected.txt (124020 => 124021)
--- trunk/LayoutTests/http/tests/inspector/network/network-content-replacement-xhr-expected.txt 2012-07-30 13:21:24 UTC (rev 124020)
+++ trunk/LayoutTests/http/tests/inspector/network/network-content-replacement-xhr-expected.txt 2012-07-30 13:29:41 UTC (rev 124021)
@@ -1,4 +1,4 @@
-CONSOLE MESSAGE: line 39: Done.
+CONSOLE MESSAGE: line 38: Done.
Tests NetworkResourcesData logic for XHR content replacement.
http://127.0.0.1:8000/inspector/network/resources/resource.php?size=200
Modified: trunk/LayoutTests/http/tests/inspector/network/network-content-replacement-xhr.html (124020 => 124021)
--- trunk/LayoutTests/http/tests/inspector/network/network-content-replacement-xhr.html 2012-07-30 13:21:24 UTC (rev 124020)
+++ trunk/LayoutTests/http/tests/inspector/network/network-content-replacement-xhr.html 2012-07-30 13:29:41 UTC (rev 124021)
@@ -9,8 +9,7 @@
console.log("This test can not be run as window.internals is not available.");
return;
}
- // Each '*' symbol will use two bytes in String object, hence multiplying by two.
- internals.settings.setInspectorResourcesDataSizeLimits(2*300, 2*200);
+ internals.settings.setInspectorResourcesDataSizeLimits(300, 200);
// Here we test replacement logic. We save first two resources content,
// discard third resource content once we see its size exceeds limit,
Modified: trunk/Source/WebCore/ChangeLog (124020 => 124021)
--- trunk/Source/WebCore/ChangeLog 2012-07-30 13:21:24 UTC (rev 124020)
+++ trunk/Source/WebCore/ChangeLog 2012-07-30 13:29:41 UTC (rev 124021)
@@ -1,3 +1,27 @@
+2012-07-30 Vsevolod Vlasov <vse...@chromium.org>
+
+ Web Inspector: Content size variables in NetworkResourcesData should have size_t type instead of int.
+ https://bugs.webkit.org/show_bug.cgi?id=92618
+
+ Reviewed by Yury Semikhatsky.
+
+ Changed content size variables type in NetworkResourcesData from int to size_t.
+ Drive-by: Switched String length calculation to recently added StringImpl's sizeInBytes.
+
+ * inspector/NetworkResourcesData.cpp:
+ (WebCore::NetworkResourcesData::ResourceData::removeContent):
+ (WebCore::NetworkResourcesData::ResourceData::dataLength):
+ (WebCore::NetworkResourcesData::ResourceData::appendData):
+ (WebCore::NetworkResourcesData::ResourceData::decodeDataToContent):
+ (WebCore::NetworkResourcesData::setResourceContent):
+ (WebCore::NetworkResourcesData::maybeAddResourceData):
+ (WebCore::NetworkResourcesData::maybeDecodeDataToContent):
+ (WebCore::NetworkResourcesData::setResourcesDataSizeLimits):
+ (WebCore::NetworkResourcesData::ensureFreeSpace):
+ * inspector/NetworkResourcesData.h:
+ (ResourceData):
+ (NetworkResourcesData):
+
2012-07-30 Hayato Ito <hay...@chromium.org>
Remove an useless member variable, m_shouldPreventDispatch, from EventDispatcher.
Modified: trunk/Source/WebCore/inspector/NetworkResourcesData.cpp (124020 => 124021)
--- trunk/Source/WebCore/inspector/NetworkResourcesData.cpp 2012-07-30 13:21:24 UTC (rev 124020)
+++ trunk/Source/WebCore/inspector/NetworkResourcesData.cpp 2012-07-30 13:29:41 UTC (rev 124021)
@@ -38,10 +38,10 @@
namespace {
// 100MB
-static int maximumResourcesContentSize = 100 * 1000 * 1000;
+static size_t maximumResourcesContentSize = 100 * 1000 * 1000;
// 10MB
-static int maximumSingleResourceContentSize = 10 * 1000 * 1000;
+static size_t maximumSingleResourceContentSize = 10 * 1000 * 1000;
}
namespace WebCore {
@@ -74,7 +74,7 @@
if (hasContent()) {
ASSERT(!hasData());
- result = 2 * m_content.length();
+ result = m_content.impl()->sizeInBytes();
m_content = String();
}
return result;
@@ -86,12 +86,12 @@
return removeContent();
}
-int NetworkResourcesData::ResourceData::dataLength() const
+size_t NetworkResourcesData::ResourceData::dataLength() const
{
return m_dataBuffer ? m_dataBuffer->size() : 0;
}
-void NetworkResourcesData::ResourceData::appendData(const char* data, int dataLength)
+void NetworkResourcesData::ResourceData::appendData(const char* data, size_t dataLength)
{
ASSERT(!hasContent());
if (!m_dataBuffer)
@@ -100,14 +100,14 @@
m_dataBuffer->append(data, dataLength);
}
-int NetworkResourcesData::ResourceData::decodeDataToContent()
+size_t NetworkResourcesData::ResourceData::decodeDataToContent()
{
ASSERT(!hasContent());
- int dataLength = m_dataBuffer->size();
+ size_t dataLength = m_dataBuffer->size();
m_content = m_decoder->decode(m_dataBuffer->data(), m_dataBuffer->size());
m_content += m_decoder->flush();
m_dataBuffer = nullptr;
- return 2 * m_content.length() - dataLength;
+ return m_content.impl()->sizeInBytes() - dataLength;
}
// NetworkResourcesData
@@ -176,7 +176,7 @@
ResourceData* resourceData = m_requestIdToResourceDataMap.get(requestId);
if (!resourceData)
return;
- int dataLength = 2 * content.length();
+ size_t dataLength = content.impl()->sizeInBytes();
if (dataLength > m_maximumSingleResourceContentSize)
return;
if (resourceData->isContentPurged())
@@ -191,7 +191,7 @@
}
}
-void NetworkResourcesData::maybeAddResourceData(const String& requestId, const char* data, int dataLength)
+void NetworkResourcesData::maybeAddResourceData(const String& requestId, const char* data, size_t dataLength)
{
ResourceData* resourceData = m_requestIdToResourceDataMap.get(requestId);
if (!resourceData)
@@ -217,7 +217,7 @@
if (!resourceData->hasData())
return;
m_contentSize += resourceData->decodeDataToContent();
- int dataLength = 2 * resourceData->content().length();
+ size_t dataLength = resourceData->content().impl()->sizeInBytes();
if (dataLength > m_maximumSingleResourceContentSize)
m_contentSize -= resourceData->purgeContent();
}
@@ -264,7 +264,7 @@
m_requestIdToResourceDataMap.swap(preservedMap);
}
-void NetworkResourcesData::setResourcesDataSizeLimits(int maximumResourcesContentSize, int maximumSingleResourceContentSize)
+void NetworkResourcesData::setResourcesDataSizeLimits(size_t maximumResourcesContentSize, size_t maximumSingleResourceContentSize)
{
clear();
m_maximumResourcesContentSize = maximumResourcesContentSize;
@@ -283,7 +283,7 @@
}
}
-bool NetworkResourcesData::ensureFreeSpace(int size)
+bool NetworkResourcesData::ensureFreeSpace(size_t size)
{
if (size > m_maximumResourcesContentSize)
return false;
Modified: trunk/Source/WebCore/inspector/NetworkResourcesData.h (124020 => 124021)
--- trunk/Source/WebCore/inspector/NetworkResourcesData.h 2012-07-30 13:21:24 UTC (rev 124020)
+++ trunk/Source/WebCore/inspector/NetworkResourcesData.h 2012-07-30 13:29:41 UTC (rev 124021)
@@ -91,9 +91,9 @@
private:
bool hasData() const { return m_dataBuffer; }
- int dataLength() const;
- void appendData(const char* data, int dataLength);
- int decodeDataToContent();
+ size_t dataLength() const;
+ void appendData(const char* data, size_t dataLength);
+ size_t decodeDataToContent();
String m_requestId;
String m_loaderId;
@@ -121,26 +121,26 @@
void setResourceType(const String& requestId, InspectorPageAgent::ResourceType);
InspectorPageAgent::ResourceType resourceType(const String& requestId);
void setResourceContent(const String& requestId, const String& content);
- void maybeAddResourceData(const String& requestId, const char* data, int dataLength);
+ void maybeAddResourceData(const String& requestId, const char* data, size_t dataLength);
void maybeDecodeDataToContent(const String& requestId);
void addCachedResource(const String& requestId, CachedResource*);
void addResourceSharedBuffer(const String& requestId, PassRefPtr<SharedBuffer>, const String& textEncodingName);
ResourceData const* data(const String& requestId);
void clear(const String& preservedLoaderId = String());
- void setResourcesDataSizeLimits(int maximumResourcesContentSize, int maximumSingleResourceContentSize);
+ void setResourcesDataSizeLimits(size_t maximumResourcesContentSize, size_t maximumSingleResourceContentSize);
private:
void ensureNoDataForRequestId(const String& requestId);
- bool ensureFreeSpace(int size);
+ bool ensureFreeSpace(size_t);
Deque<String> m_requestIdsDeque;
typedef HashMap<String, ResourceData*> ResourceDataMap;
ResourceDataMap m_requestIdToResourceDataMap;
- int m_contentSize;
- int m_maximumResourcesContentSize;
- int m_maximumSingleResourceContentSize;
+ size_t m_contentSize;
+ size_t m_maximumResourcesContentSize;
+ size_t m_maximumSingleResourceContentSize;
};
} // namespace WebCore
