<!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>[162813] trunk/Source/WebKit/win</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/162813">162813</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-01-26 14:46:32 -0800 (Sun, 26 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Another follow-up build fix.
* WebHistory.cpp:
(WebHistory::removeAllItems):
(WebHistory::orderedItemsLastVisitedOnDay):
* WebHistoryItem.cpp:
(WebHistoryItem::initFromDictionaryRepresentation):
(WebHistoryItem::dictionaryRepresentation):
(WebHistoryItem::visitCount):
(WebHistoryItem::setVisitCount):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitwinChangeLog">trunk/Source/WebKit/win/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitwinWebHistorycpp">trunk/Source/WebKit/win/WebHistory.cpp</a></li>
<li><a href="#trunkSourceWebKitwinWebHistoryItemcpp">trunk/Source/WebKit/win/WebHistoryItem.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitwinChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/ChangeLog (162812 => 162813)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/ChangeLog 2014-01-26 22:41:13 UTC (rev 162812)
+++ trunk/Source/WebKit/win/ChangeLog 2014-01-26 22:46:32 UTC (rev 162813)
</span><span class="lines">@@ -1,5 +1,18 @@
</span><span class="cx"> 2014-01-26 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><ins>+ Another follow-up build fix.
+
+ * WebHistory.cpp:
+ (WebHistory::removeAllItems):
+ (WebHistory::orderedItemsLastVisitedOnDay):
+ * WebHistoryItem.cpp:
+ (WebHistoryItem::initFromDictionaryRepresentation):
+ (WebHistoryItem::dictionaryRepresentation):
+ (WebHistoryItem::visitCount):
+ (WebHistoryItem::setVisitCount):
+
+2014-01-26 Anders Carlsson <andersca@apple.com>
+
</ins><span class="cx"> Remove more history gunk.
</span><span class="cx">
</span><span class="cx"> * WebHistory.cpp:
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebHistorycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebHistory.cpp (162812 => 162813)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebHistory.cpp 2014-01-26 22:41:13 UTC (rev 162812)
+++ trunk/Source/WebKit/win/WebHistory.cpp 2014-01-26 22:46:32 UTC (rev 162813)
</span><span class="lines">@@ -315,9 +315,6 @@
</span><span class="cx">
</span><span class="cx"> HRESULT STDMETHODCALLTYPE WebHistory::removeAllItems( void)
</span><span class="cx"> {
</span><del>- m_entriesByDate.clear();
- m_orderedLastVisitedDays = nullptr;
-
</del><span class="cx"> Vector<IWebHistoryItem*> itemsVector;
</span><span class="cx"> itemsVector.reserveInitialCapacity(m_entriesByURL.size());
</span><span class="cx"> for (auto it = m_entriesByURL.begin(); it != m_entriesByURL.end(); ++it)
</span><span class="lines">@@ -339,35 +336,13 @@
</span><span class="cx"> return E_NOTIMPL;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+// FIXME: This function should be removed from the IWebHistory interface.
</ins><span class="cx"> HRESULT STDMETHODCALLTYPE WebHistory::orderedItemsLastVisitedOnDay(
</span><span class="cx"> /* [out][in] */ int* count,
</span><span class="cx"> /* [in] */ IWebHistoryItem** items,
</span><span class="cx"> /* [in] */ DATE calendarDate)
</span><span class="cx"> {
</span><del>- auto found = m_entriesByDate.find(dateKey(calendarDate));
- if (found == m_entriesByDate.end()) {
- *count = 0;
- return 0;
- }
-
- auto& entriesForDate = found->value;
- int newCount = entriesForDate.size();
-
- if (!items) {
- *count = newCount;
- return S_OK;
- }
-
- if (*count < newCount) {
- *count = newCount;
- return E_FAIL;
- }
-
- *count = newCount;
- for (int i = 0; i < newCount; ++i)
- entriesForDate[i].copyRefTo(&items[i]);
-
- return S_OK;
</del><ins>+ return E_NOTIMPL;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> HRESULT STDMETHODCALLTYPE WebHistory::allItems(
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebHistoryItemcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebHistoryItem.cpp (162812 => 162813)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebHistoryItem.cpp 2014-01-26 22:41:13 UTC (rev 162812)
+++ trunk/Source/WebKit/win/WebHistoryItem.cpp 2014-01-26 22:46:32 UTC (rev 162813)
</span><span class="lines">@@ -143,44 +143,16 @@
</span><span class="cx"> if (weeklyCounts && CFGetTypeID(weeklyCounts) != CFArrayGetTypeID())
</span><span class="cx"> weeklyCounts = 0;
</span><span class="cx">
</span><del>- std::auto_ptr<Vector<int> > dailyVector, weeklyVector;
- if (dailyCounts || weeklyCounts) {
- CFIndex dailySize = dailyCounts ? CFArrayGetCount(dailyCounts) : 0;
- CFIndex weeklySize = weeklyCounts ? CFArrayGetCount(weeklyCounts) : 0;
- dailyVector.reset(new Vector<int>(dailySize));
- weeklyVector.reset(new Vector<int>(weeklySize));
-
- // Daily and weekly counts < 0 are errors in the data read from disk, so reset to 0.
- for (CFIndex i = 0; i < dailySize; ++i) {
- CFNumberRef dailyCount = static_cast<CFNumberRef>(CFArrayGetValueAtIndex(dailyCounts, i));
- if (CFGetTypeID(dailyCount) == CFNumberGetTypeID())
- CFNumberGetValue(dailyCount, kCFNumberIntType, &(*dailyVector)[i]);
- if ((*dailyVector)[i] < 0)
- (*dailyVector)[i] = 0;
- }
- for (CFIndex i = 0; i < weeklySize; ++i) {
- CFNumberRef weeklyCount = static_cast<CFNumberRef>(CFArrayGetValueAtIndex(weeklyCounts, i));
- if (CFGetTypeID(weeklyCount) == CFNumberGetTypeID())
- CFNumberGetValue(weeklyCount, kCFNumberIntType, &(*weeklyVector)[i]);
- if ((*weeklyVector)[i] < 0)
- (*weeklyVector)[i] = 0;
- }
- }
-
</del><span class="cx"> historyItemWrappers().remove(m_historyItem.get());
</span><span class="cx"> m_historyItem = HistoryItem::create(urlStringRef, titleRef);
</span><span class="cx"> historyItemWrappers().set(m_historyItem.get(), this);
</span><span class="cx">
</span><del>- m_historyItem->setVisitCount(visitedCount);
</del><span class="cx"> if (lastVisitWasFailure)
</span><span class="cx"> m_historyItem->setLastVisitWasFailure(true);
</span><span class="cx">
</span><span class="cx"> if (redirectURLsVector.get())
</span><span class="cx"> m_historyItem->setRedirectURLs(std::move(redirectURLsVector));
</span><span class="cx">
</span><del>- if (dailyVector.get())
- m_historyItem->adoptVisitCounts(*dailyVector, *weeklyVector);
-
</del><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -197,9 +169,6 @@
</span><span class="cx"> values[keyCount++] = m_historyItem->urlString().createCFString().leakRef();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- keys[keyCount] = lastVisitedDateKey;
- values[keyCount++] = lastVisitedStringRef;
-
</del><span class="cx"> if (!m_historyItem->title().isEmpty()) {
</span><span class="cx"> keys[keyCount] = titleKey;
</span><span class="cx"> values[keyCount++] = m_historyItem->title().createCFString().leakRef();
</span><span class="lines">@@ -229,36 +198,6 @@
</span><span class="cx"> values[keyCount++] = result;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- const Vector<int>& dailyVisitCount(m_historyItem->dailyVisitCounts());
- if (size_t size = dailyVisitCount.size()) {
- Vector<CFNumberRef, 13> numbers(size);
- for (size_t i = 0; i < size; ++i)
- numbers[i] = CFNumberCreate(0, kCFNumberIntType, &dailyVisitCount[i]);
-
- CFArrayRef result = CFArrayCreate(0, (const void**)numbers.data(), size, &kCFTypeArrayCallBacks);
-
- for (size_t i = 0; i < size; ++i)
- CFRelease(numbers[i]);
-
- keys[keyCount] = dailyVisitCountKey;
- values[keyCount++] = result;
- }
-
- const Vector<int>& weeklyVisitCount(m_historyItem->weeklyVisitCounts());
- if (size_t size = weeklyVisitCount.size()) {
- Vector<CFNumberRef, 5> numbers(size);
- for (size_t i = 0; i < size; ++i)
- numbers[i] = CFNumberCreate(0, kCFNumberIntType, &weeklyVisitCount[i]);
-
- CFArrayRef result = CFArrayCreate(0, (const void**)numbers.data(), size, &kCFTypeArrayCallBacks);
-
- for (size_t i = 0; i < size; ++i)
- CFRelease(numbers[i]);
-
- keys[keyCount] = weeklyVisitCountKey;
- values[keyCount++] = result;
- }
-
</del><span class="cx"> *dictionaryRef = CFDictionaryCreate(0, keys, values, keyCount, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks);
</span><span class="cx">
</span><span class="cx"> for (int i = 0; i < keyCount; ++i)
</span><span class="lines">@@ -273,16 +212,17 @@
</span><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+// FIXME: This function should be removed from the IWebHistoryItem interface.
</ins><span class="cx"> HRESULT STDMETHODCALLTYPE WebHistoryItem::visitCount(int *count)
</span><span class="cx"> {
</span><del>- *count = m_historyItem->visitCount();
- return S_OK;
</del><ins>+ return E_NOTIMPL;
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+// FIXME: This function should be removed from the IWebHistoryItem interface.
</ins><span class="cx"> HRESULT STDMETHODCALLTYPE WebHistoryItem::setVisitCount(int count)
</span><span class="cx"> {
</span><del>- m_historyItem->setVisitCount(count);
- return S_OK;
</del><ins>+ return E_NOTIMPL;
+
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // FIXME: This function should be removed from the IWebHistoryItem interface.
</span></span></pre>
</div>
</div>
</body>
</html>