<!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>[198507] 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/198507">198507</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2016-03-21 17:06:53 -0700 (Mon, 21 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Improve SharedBuffer testing
https://bugs.webkit.org/show_bug.cgi?id=93078
<rdar://problem/25277829>
Reviewed by Ryosuke Niwa.
Source/WebCore:
* platform/SharedBuffer.h: Mark a few methods as WEBCORE_EXPORT so they
can be used by TestWebKitAPI.
Tools:
Based on a Blink patch by Huang Dongsung <luxtella@company100.net>.
<https://src.chromium.org/viewvc/blink?revision=153850&view=revision,
and a Blink patch by <tyoshino@chromium.org>
<https://src.chromium.org/viewvc/blink?view=rev&revision=151617>
Add three test cases from the Blink project that cover various append,
copy, and createArrayBuffer calls.
* TestWebKitAPI/Tests/WebCore/SharedBuffer.cpp:
(TestWebKitAPI::TEST_F):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformSharedBufferh">trunk/Source/WebCore/platform/SharedBuffer.h</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebCoreSharedBuffercpp">trunk/Tools/TestWebKitAPI/Tests/WebCore/SharedBuffer.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (198506 => 198507)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-03-21 23:29:58 UTC (rev 198506)
+++ trunk/Source/WebCore/ChangeLog 2016-03-22 00:06:53 UTC (rev 198507)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-03-21 Brent Fulgham <bfulgham@apple.com>
+
+ Improve SharedBuffer testing
+ https://bugs.webkit.org/show_bug.cgi?id=93078
+ <rdar://problem/25277829>
+
+ Reviewed by Ryosuke Niwa.
+
+ * platform/SharedBuffer.h: Mark a few methods as WEBCORE_EXPORT so they
+ can be used by TestWebKitAPI.
+
</ins><span class="cx"> 2016-03-21 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> WebCore::RenderTableCell::setCol should put a cap on the column value.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformSharedBufferh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/SharedBuffer.h (198506 => 198507)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/SharedBuffer.h 2016-03-21 23:29:58 UTC (rev 198506)
+++ trunk/Source/WebCore/platform/SharedBuffer.h 2016-03-22 00:06:53 UTC (rev 198507)
</span><span class="lines">@@ -83,7 +83,7 @@
</span><span class="cx"> WEBCORE_EXPORT const char* data() const;
</span><span class="cx"> // Creates an ArrayBuffer and copies this SharedBuffer's contents to that
</span><span class="cx"> // ArrayBuffer without merging segmented buffers into a flat buffer.
</span><del>- RefPtr<ArrayBuffer> createArrayBuffer() const;
</del><ins>+ WEBCORE_EXPORT RefPtr<ArrayBuffer> createArrayBuffer() const;
</ins><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT unsigned size() const;
</span><span class="cx">
</span><span class="lines">@@ -92,7 +92,7 @@
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT void append(SharedBuffer*);
</span><span class="cx"> WEBCORE_EXPORT void append(const char*, unsigned);
</span><del>- void append(const Vector<char>&);
</del><ins>+ WEBCORE_EXPORT void append(const Vector<char>&);
</ins><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT void clear();
</span><span class="cx"> const char* platformData() const;
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (198506 => 198507)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-03-21 23:29:58 UTC (rev 198506)
+++ trunk/Tools/ChangeLog 2016-03-22 00:06:53 UTC (rev 198507)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2016-03-21 Brent Fulgham <bfulgham@apple.com>
+
+ Improve SharedBuffer testing
+ https://bugs.webkit.org/show_bug.cgi?id=93078
+ <rdar://problem/25277829>
+
+ Reviewed by Ryosuke Niwa.
+
+ Based on a Blink patch by Huang Dongsung <luxtella@company100.net>.
+ <https://src.chromium.org/viewvc/blink?revision=153850&view=revision,
+ and a Blink patch by <tyoshino@chromium.org>
+ <https://src.chromium.org/viewvc/blink?view=rev&revision=151617>
+
+ Add three test cases from the Blink project that cover various append,
+ copy, and createArrayBuffer calls.
+
+ * TestWebKitAPI/Tests/WebCore/SharedBuffer.cpp:
+ (TestWebKitAPI::TEST_F):
+
</ins><span class="cx"> 2016-03-21 Hyungwook Lee <hyungwook.lee@navercorp.com>
</span><span class="cx">
</span><span class="cx"> [Win] Connect layoutTestController.findString() to support testing
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebCoreSharedBuffercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebCore/SharedBuffer.cpp (198506 => 198507)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebCore/SharedBuffer.cpp 2016-03-21 23:29:58 UTC (rev 198506)
+++ trunk/Tools/TestWebKitAPI/Tests/WebCore/SharedBuffer.cpp 2016-03-22 00:06:53 UTC (rev 198507)
</span><span class="lines">@@ -1,5 +1,7 @@
</span><span class="cx"> /*
</span><ins>+ * Copyright (C) 2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2015 Canon Inc. All rights reserved.
</span><ins>+ * Copyright (C) 2013 Google Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -116,4 +118,77 @@
</span><span class="cx"> EXPECT_EQ('a', buffer->data()[strlen(SharedBufferTestData)]);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+TEST_F(SharedBufferTest, createArrayBuffer)
+{
+ char testData0[] = "Hello";
+ char testData1[] = "World";
+ char testData2[] = "Goodbye";
+ RefPtr<SharedBuffer> sharedBuffer = SharedBuffer::create(testData0, strlen(testData0));
+ sharedBuffer->append(testData1, strlen(testData1));
+ sharedBuffer->append(testData2, strlen(testData2));
+ RefPtr<ArrayBuffer> arrayBuffer = sharedBuffer->createArrayBuffer();
+ char expectedConcatenation[] = "HelloWorldGoodbye";
+ ASSERT_EQ(strlen(expectedConcatenation), arrayBuffer->byteLength());
+ EXPECT_EQ(0, memcmp(expectedConcatenation, arrayBuffer->data(), strlen(expectedConcatenation)));
</ins><span class="cx"> }
</span><ins>+
+TEST_F(SharedBufferTest, createArrayBufferLargeSegments)
+{
+ Vector<char> vector0(0x4000, 'a');
+ Vector<char> vector1(0x4000, 'b');
+ Vector<char> vector2(0x4000, 'c');
+
+ RefPtr<SharedBuffer> sharedBuffer = SharedBuffer::adoptVector(vector0);
+ sharedBuffer->append(vector1);
+ sharedBuffer->append(vector2);
+ RefPtr<ArrayBuffer> arrayBuffer = sharedBuffer->createArrayBuffer();
+ ASSERT_EQ(0x4000U + 0x4000U + 0x4000U, arrayBuffer->byteLength());
+ int position = 0;
+ for (int i = 0; i < 0x4000; ++i) {
+ EXPECT_EQ('a', static_cast<char*>(arrayBuffer->data())[position]);
+ ++position;
+ }
+ for (int i = 0; i < 0x4000; ++i) {
+ EXPECT_EQ('b', static_cast<char*>(arrayBuffer->data())[position]);
+ ++position;
+ }
+ for (int i = 0; i < 0x4000; ++i) {
+ EXPECT_EQ('c', static_cast<char*>(arrayBuffer->data())[position]);
+ ++position;
+ }
+}
+
+TEST_F(SharedBufferTest, copy)
+{
+ char testData[] = "Habitasse integer eros tincidunt a scelerisque! Enim elit? Scelerisque magnis,"
+ "et montes ultrices tristique a! Pid. Velit turpis, dapibus integer rhoncus sociis amet facilisis,"
+ "adipiscing pulvinar nascetur magnis tempor sit pulvinar, massa urna enim porttitor sociis sociis proin enim?"
+ "Lectus, platea dolor, integer a. A habitasse hac nunc, nunc, nec placerat vut in sit nunc nec, sed. Sociis,"
+ "vut! Hac, velit rhoncus facilisis. Rhoncus et, enim, sed et in tristique nunc montes,"
+ "natoque nunc sagittis elementum parturient placerat dolor integer? Pulvinar,"
+ "magnis dignissim porttitor ac pulvinar mid tempor. A risus sed mid! Magnis elit duis urna,"
+ "cras massa, magna duis. Vut magnis pid a! Penatibus aliquet porttitor nunc, adipiscing massa odio lundium,"
+ "risus elementum ac turpis massa pellentesque parturient augue. Purus amet turpis pid aliquam?"
+ "Dolor est tincidunt? Dolor? Dignissim porttitor sit in aliquam! Tincidunt, non nunc, rhoncus dictumst!"
+ "Porta augue etiam. Cursus augue nunc lacus scelerisque. Rhoncus lectus, integer hac, nec pulvinar augue massa,"
+ "integer amet nisi facilisis? A! A, enim velit pulvinar elit in non scelerisque in et ultricies amet est!"
+ "in porttitor montes lorem et, hac aliquet pellentesque a sed? Augue mid purus ridiculus vel dapibus,"
+ "sagittis sed, tortor auctor nascetur rhoncus nec, rhoncus, magna integer. Sit eu massa vut?"
+ "Porta augue porttitor elementum, enim, rhoncus pulvinar duis integer scelerisque rhoncus natoque,"
+ "mattis dignissim massa ac pulvinar urna, nunc ut. Sagittis, aliquet penatibus proin lorem, pulvinar lectus,"
+ "augue proin! Ac, arcu quis. Placerat habitasse, ridiculus ridiculus.";
+ unsigned length = strlen(testData);
+ RefPtr<SharedBuffer> sharedBuffer = SharedBuffer::create(testData, length);
+ sharedBuffer->append(testData, length);
+ sharedBuffer->append(testData, length);
+ sharedBuffer->append(testData, length);
+ // sharedBuffer must contain data more than segmentSize (= 0x1000) to check copy().
+ ASSERT_EQ(length * 4, sharedBuffer->size());
+ RefPtr<SharedBuffer> clone = sharedBuffer->copy();
+ ASSERT_EQ(length * 4, clone->size());
+ ASSERT_EQ(0, memcmp(clone->data(), sharedBuffer->data(), clone->size()));
+ clone->append(testData, length);
+ ASSERT_EQ(length * 5, clone->size());
+}
+
+}
</ins></span></pre>
</div>
</div>
</body>
</html>