<!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>[204558] 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/204558">204558</a></dd>
<dt>Author</dt> <dd>pvollan@apple.com</dd>
<dt>Date</dt> <dd>2016-08-17 07:39:23 -0700 (Wed, 17 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Win] Add tests for linked fonts.
https://bugs.webkit.org/show_bug.cgi?id=160898
Reviewed by Brent Fulgham.
Add tests for https://trac.webkit.org/changeset/204502.
Source/WebCore:
* platform/graphics/win/FontCacheWin.cpp:
(WebCore::appendLinkedFonts):
(WebCore::getLinkedFonts):
Tools:
* TestWebKitAPI/PlatformWin.cmake:
* TestWebKitAPI/Tests/WebCore/win/LinkedFonts.cpp: Added.
(TestWebKitAPI::TEST):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicswinFontCacheWincpp">trunk/Source/WebCore/platform/graphics/win/FontCacheWin.cpp</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPIPlatformWincmake">trunk/Tools/TestWebKitAPI/PlatformWin.cmake</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkToolsTestWebKitAPITestsWebCorewinLinkedFontscpp">trunk/Tools/TestWebKitAPI/Tests/WebCore/win/LinkedFonts.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (204557 => 204558)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-08-17 11:12:46 UTC (rev 204557)
+++ trunk/Source/WebCore/ChangeLog 2016-08-17 14:39:23 UTC (rev 204558)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-08-17 Per Arne Vollan <pvollan@apple.com>
+
+ [Win] Add tests for linked fonts.
+ https://bugs.webkit.org/show_bug.cgi?id=160898
+
+ Reviewed by Brent Fulgham.
+
+ Add tests for https://trac.webkit.org/changeset/204502.
+
+ * platform/graphics/win/FontCacheWin.cpp:
+ (WebCore::appendLinkedFonts):
+ (WebCore::getLinkedFonts):
+
</ins><span class="cx"> 2016-08-17 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed. Fix GObject DOM bindings API break after r204449, r204450 and r204451.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicswinFontCacheWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/win/FontCacheWin.cpp (204557 => 204558)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/win/FontCacheWin.cpp 2016-08-17 11:12:46 UTC (rev 204557)
+++ trunk/Source/WebCore/platform/graphics/win/FontCacheWin.cpp 2016-08-17 14:39:23 UTC (rev 204558)
</span><span class="lines">@@ -96,6 +96,24 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+WEBCORE_EXPORT void appendLinkedFonts(WCHAR* linkedFonts, unsigned length, Vector<String>* result)
+{
+ unsigned i = 0;
+ while (i < length) {
+ while (i < length && linkedFonts[i] != ',')
+ i++;
+ // Break if we did not find a comma.
+ if (i == length)
+ break;
+ i++;
+ unsigned j = i;
+ while (j < length && linkedFonts[j])
+ j++;
+ result->append(String(linkedFonts + i, j - i));
+ i = j + 1;
+ }
+}
+
</ins><span class="cx"> static const Vector<String>* getLinkedFonts(String& family)
</span><span class="cx"> {
</span><span class="cx"> static HashMap<String, Vector<String>*> systemLinkMap;
</span><span class="lines">@@ -106,7 +124,7 @@
</span><span class="cx"> result = new Vector<String>;
</span><span class="cx"> systemLinkMap.set(family, result);
</span><span class="cx"> HKEY fontLinkKey = nullptr;
</span><del>- if (FAILED(RegOpenKeyEx(HKEY_LOCAL_MACHINE, L"Software\\Microsoft\\Windows NT\\CurrentVersion\\FontLink\\SystemLink", 0, KEY_READ, &fontLinkKey)))
</del><ins>+ if (::RegOpenKeyEx(HKEY_LOCAL_MACHINE, L"Software\\Microsoft\\Windows NT\\CurrentVersion\\FontLink\\SystemLink", 0, KEY_READ, &fontLinkKey) != ERROR_SUCCESS)
</ins><span class="cx"> return result;
</span><span class="cx">
</span><span class="cx"> DWORD linkedFontsBufferSize = 0;
</span><span class="lines">@@ -117,21 +135,8 @@
</span><span class="cx">
</span><span class="cx"> WCHAR* linkedFonts = reinterpret_cast<WCHAR*>(malloc(linkedFontsBufferSize));
</span><span class="cx"> if (::RegQueryValueEx(fontLinkKey, family.charactersWithNullTermination().data(), 0, nullptr, reinterpret_cast<BYTE*>(linkedFonts), &linkedFontsBufferSize) == ERROR_SUCCESS) {
</span><del>- unsigned i = 0;
</del><span class="cx"> unsigned length = linkedFontsBufferSize / sizeof(*linkedFonts);
</span><del>- while (i < length) {
- while (i < length && linkedFonts[i] != ',')
- i++;
- // Break if we did not find a comma.
- if (i == length)
- break;
- i++;
- unsigned j = i;
- while (j < length && linkedFonts[j])
- j++;
- result->append(String(linkedFonts + i, j - i));
- i = j + 1;
- }
</del><ins>+ appendLinkedFonts(linkedFonts, length, result);
</ins><span class="cx"> }
</span><span class="cx"> free(linkedFonts);
</span><span class="cx"> RegCloseKey(fontLinkKey);
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (204557 => 204558)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-08-17 11:12:46 UTC (rev 204557)
+++ trunk/Tools/ChangeLog 2016-08-17 14:39:23 UTC (rev 204558)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-08-17 Per Arne Vollan <pvollan@apple.com>
+
+ [Win] Add tests for linked fonts.
+ https://bugs.webkit.org/show_bug.cgi?id=160898
+
+ Reviewed by Brent Fulgham.
+
+ Add tests for https://trac.webkit.org/changeset/204502.
+
+ * TestWebKitAPI/PlatformWin.cmake:
+ * TestWebKitAPI/Tests/WebCore/win/LinkedFonts.cpp: Added.
+ (TestWebKitAPI::TEST):
+
</ins><span class="cx"> 2016-08-16 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><span class="cx"> prepare-ChangeLog: Extract logic from generateFunctionLists() into a function that takes a delegate object
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPIPlatformWincmake"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/PlatformWin.cmake (204557 => 204558)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/PlatformWin.cmake 2016-08-17 11:12:46 UTC (rev 204557)
+++ trunk/Tools/TestWebKitAPI/PlatformWin.cmake 2016-08-17 14:39:23 UTC (rev 204558)
</span><span class="lines">@@ -50,6 +50,7 @@
</span><span class="cx"> ${TESTWEBKITAPI_DIR}/Tests/WebCore/URL.cpp
</span><span class="cx"> ${TESTWEBKITAPI_DIR}/Tests/WebCore/URLParser.cpp
</span><span class="cx"> ${TESTWEBKITAPI_DIR}/Tests/WebCore/win/DIBPixelData.cpp
</span><ins>+ ${TESTWEBKITAPI_DIR}/Tests/WebCore/win/LinkedFonts.cpp
</ins><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> if (${WTF_PLATFORM_WIN_CAIRO})
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebCorewinLinkedFontscpp"></a>
<div class="addfile"><h4>Added: trunk/Tools/TestWebKitAPI/Tests/WebCore/win/LinkedFonts.cpp (0 => 204558)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebCore/win/LinkedFonts.cpp (rev 0)
+++ trunk/Tools/TestWebKitAPI/Tests/WebCore/win/LinkedFonts.cpp 2016-08-17 14:39:23 UTC (rev 204558)
</span><span class="lines">@@ -0,0 +1,63 @@
</span><ins>+/*
+ * Copyright (C) 2016 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+
+#include <WebCore/FontCache.h>
+
+using namespace WebCore;
+
+namespace WebCore {
+void appendLinkedFonts(WCHAR* linkedFonts, unsigned length, Vector<String>* result);
+}
+
+namespace TestWebKitAPI {
+
+// Test the appendLinkedFonts function with normal input data (string with pairs of font filenames and font names separated with \0).
+TEST(WebCore, appendLinkedFontsTest)
+{
+ Vector<String> result;
+ WCHAR linkedFonts[] = L"MICROSS.TTF,Microsoft Sans Serif,128,140\0MICROSS.TTF,Microsoft Sans Serif\0MSGOTHIC.TTC,MS UI Gothic\0MINGLIU.TTC,PMingLiU\0SIMSUN.TTC,SimSun";
+
+ appendLinkedFonts(linkedFonts, sizeof(linkedFonts) / sizeof(WCHAR), &result);
+ ASSERT(result.size() == 5);
+ ASSERT(result[0] == String(L"Microsoft Sans Serif,128,140"));
+ ASSERT(result[1] == String(L"Microsoft Sans Serif"));
+ ASSERT(result[2] == String(L"MS UI Gothic"));
+ ASSERT(result[3] == String(L"PMingLiU"));
+ ASSERT(result[4] == String(L"SimSun"));
+}
+
+// Test the appendLinkedFonts function when the input data does not contain the expected comma separator.
+TEST(WebCore, appendLinkedFontsWithMissingCommaTest)
+{
+ Vector<String> result;
+ WCHAR linkedFonts[] = L"MICROSS.TTF Microsoft Sans Serif";
+
+ appendLinkedFonts(linkedFonts, sizeof(linkedFonts) / sizeof(WCHAR), &result);
+ ASSERT(!result.size());
+}
+
+} // namespace TestWebKitAPI
</ins></span></pre>
</div>
</div>
</body>
</html>