<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[195832] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/195832">195832</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2016-01-29 11:47:03 -0800 (Fri, 29 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Modern IDB: Fix logging that overwhelms python with strings of excessive length.
https://bugs.webkit.org/show_bug.cgi?id=153652
Reviewed by Tim Horton.
Source/WebCore:
No new tests (Two skipped tests now pass).
* Modules/indexeddb/IDBKeyData.cpp:
(WebCore::IDBKeyData::loggingString): Limit the length of the string.
* Modules/indexeddb/IDBKeyRangeData.cpp:
(WebCore::IDBKeyRangeData::loggingString): Limit the length of the string.
LayoutTests:
* platform/mac-wk1/TestExpectations:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk1TestExpectations">trunk/LayoutTests/platform/mac-wk1/TestExpectations</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbIDBKeyDatacpp">trunk/Source/WebCore/Modules/indexeddb/IDBKeyData.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbIDBKeyRangeDatacpp">trunk/Source/WebCore/Modules/indexeddb/IDBKeyRangeData.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (195831 => 195832)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-01-29 19:46:01 UTC (rev 195831)
+++ trunk/LayoutTests/ChangeLog 2016-01-29 19:47:03 UTC (rev 195832)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2016-01-29 Brady Eidson <beidson@apple.com>
+
+ Modern IDB: Fix logging that overwhelms python with strings of excessive length.
+ https://bugs.webkit.org/show_bug.cgi?id=153652
+
+ Reviewed by Tim Horton.
+
+ * platform/mac-wk1/TestExpectations:
+
</ins><span class="cx"> 2016-01-29 Saam barati <sbarati@apple.com>
</span><span class="cx">
</span><span class="cx"> Exits from exceptions shouldn't jettison code
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk1TestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk1/TestExpectations (195831 => 195832)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk1/TestExpectations 2016-01-29 19:46:01 UTC (rev 195831)
+++ trunk/LayoutTests/platform/mac-wk1/TestExpectations 2016-01-29 19:47:03 UTC (rev 195832)
</span><span class="lines">@@ -271,12 +271,8 @@
</span><span class="cx">
</span><span class="cx"> # SQLite backend tests that crash or ASSERT
</span><span class="cx"> storage/indexeddb/database-odd-names.html [ Skip ]
</span><ins>+storage/indexeddb/dont-wedge.html [ Skip ]
</ins><span class="cx"> storage/indexeddb/odd-strings.html [ Skip ]
</span><span class="cx">
</span><del>-# SQLite backend tests that wedge the entire testing harness
-imported/w3c/indexeddb/keyorder.htm [ Skip ]
-storage/indexeddb/dont-wedge.html [ Skip ]
-storage/indexeddb/key-type-array.html [ Skip ]
-
</del><span class="cx"> ### END OF (3) IndexedDB failures with SQLite
</span><span class="cx"> ########################################
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (195831 => 195832)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-01-29 19:46:01 UTC (rev 195831)
+++ trunk/Source/WebCore/ChangeLog 2016-01-29 19:47:03 UTC (rev 195832)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-01-29 Brady Eidson <beidson@apple.com>
+
+ Modern IDB: Fix logging that overwhelms python with strings of excessive length.
+ https://bugs.webkit.org/show_bug.cgi?id=153652
+
+ Reviewed by Tim Horton.
+
+ No new tests (Two skipped tests now pass).
+
+ * Modules/indexeddb/IDBKeyData.cpp:
+ (WebCore::IDBKeyData::loggingString): Limit the length of the string.
+
+ * Modules/indexeddb/IDBKeyRangeData.cpp:
+ (WebCore::IDBKeyRangeData::loggingString): Limit the length of the string.
+
</ins><span class="cx"> 2016-01-29 Jer Noble <jer.noble@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed Windows build fix; one more ResourceLoaderOptions call site which needs to
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBKeyDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBKeyData.cpp (195831 => 195832)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBKeyData.cpp 2016-01-29 19:46:01 UTC (rev 195831)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBKeyData.cpp 2016-01-29 19:47:03 UTC (rev 195832)
</span><span class="lines">@@ -255,23 +255,26 @@
</span><span class="cx"> if (m_isNull)
</span><span class="cx"> return "<null>";
</span><span class="cx">
</span><ins>+ String result;
+
</ins><span class="cx"> switch (m_type) {
</span><span class="cx"> case KeyType::Invalid:
</span><span class="cx"> return "<invalid>";
</span><del>- case KeyType::Array:
- {
- StringBuilder result;
- result.appendLiteral("<array> - { ");
- for (size_t i = 0; i < m_arrayValue.size(); ++i) {
- result.append(m_arrayValue[i].loggingString());
- if (i < m_arrayValue.size() - 1)
- result.appendLiteral(", ");
- }
- result.appendLiteral(" }");
- return result.toString();
</del><ins>+ case KeyType::Array: {
+ StringBuilder builder;
+ builder.appendLiteral("<array> - { ");
+ for (size_t i = 0; i < m_arrayValue.size(); ++i) {
+ builder.append(m_arrayValue[i].loggingString());
+ if (i < m_arrayValue.size() - 1)
+ builder.appendLiteral(", ");
</ins><span class="cx"> }
</span><ins>+ builder.appendLiteral(" }");
+ result = builder.toString();
+ break;
+ }
</ins><span class="cx"> case KeyType::String:
</span><del>- return "<string> - " + m_stringValue;
</del><ins>+ result = "<string> - " + m_stringValue;
+ break;
</ins><span class="cx"> case KeyType::Date:
</span><span class="cx"> return String::format("Date m_type - %f", m_numberValue);
</span><span class="cx"> case KeyType::Number:
</span><span class="lines">@@ -283,7 +286,13 @@
</span><span class="cx"> default:
</span><span class="cx"> return String();
</span><span class="cx"> }
</span><del>- ASSERT_NOT_REACHED();
</del><ins>+
+ if (result.length() > 150) {
+ result.truncate(147);
+ result.append(WTF::ASCIILiteral("..."));
+ }
+
+ return result;
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBKeyRangeDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBKeyRangeData.cpp (195831 => 195832)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBKeyRangeData.cpp 2016-01-29 19:46:01 UTC (rev 195831)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBKeyRangeData.cpp 2016-01-29 19:47:03 UTC (rev 195832)
</span><span class="lines">@@ -116,7 +116,13 @@
</span><span class="cx"> #ifndef NDEBUG
</span><span class="cx"> String IDBKeyRangeData::loggingString() const
</span><span class="cx"> {
</span><del>- return makeString(lowerOpen ? "( " : "[ ", lowerKey.loggingString(), ", ", upperKey.loggingString(), upperOpen ? " )" : " ]");
</del><ins>+ auto result = makeString(lowerOpen ? "( " : "[ ", lowerKey.loggingString(), ", ", upperKey.loggingString(), upperOpen ? " )" : " ]");
+ if (result.length() > 400) {
+ result.truncate(397);
+ result.append(WTF::ASCIILiteral("..."));
+ }
+
+ return result;
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>