<!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>[162814] 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/162814">162814</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-01-26 14:52:17 -0800 (Sun, 26 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove even more Windows history code.
* WebHistory.cpp:
(WebHistory::removeItemForURLString):
* WebHistoryItem.cpp:
(WebHistoryItem::initFromDictionaryRepresentation):
(WebHistoryItem::dictionaryRepresentation):
(WebHistoryItem::getDailyVisitCounts):
(WebHistoryItem::getWeeklyVisitCounts):
(WebHistoryItem::recordInitialVisit):
(WebHistoryItem::initWithURLString):</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 (162813 => 162814)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/ChangeLog 2014-01-26 22:46:32 UTC (rev 162813)
+++ trunk/Source/WebKit/win/ChangeLog 2014-01-26 22:52:17 UTC (rev 162814)
</span><span class="lines">@@ -1,5 +1,19 @@
</span><span class="cx"> 2014-01-26 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><ins>+ Remove even more Windows history code.
+
+ * WebHistory.cpp:
+ (WebHistory::removeItemForURLString):
+ * WebHistoryItem.cpp:
+ (WebHistoryItem::initFromDictionaryRepresentation):
+ (WebHistoryItem::dictionaryRepresentation):
+ (WebHistoryItem::getDailyVisitCounts):
+ (WebHistoryItem::getWeeklyVisitCounts):
+ (WebHistoryItem::recordInitialVisit):
+ (WebHistoryItem::initWithURLString):
+
+2014-01-26 Anders Carlsson <andersca@apple.com>
+
</ins><span class="cx"> Another follow-up build fix.
</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 (162813 => 162814)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebHistory.cpp 2014-01-26 22:46:32 UTC (rev 162813)
+++ trunk/Source/WebKit/win/WebHistory.cpp 2014-01-26 22:52:17 UTC (rev 162814)
</span><span class="lines">@@ -553,7 +553,7 @@
</span><span class="cx"> if (!m_entriesByURL.size())
</span><span class="cx"> PageGroup::removeAllVisitedLinks();
</span><span class="cx">
</span><del>- return hr;
</del><ins>+ return S_OK;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> COMPtr<IWebHistoryItem> WebHistory::itemForURLString(const String& urlString) const
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebHistoryItemcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebHistoryItem.cpp (162813 => 162814)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebHistoryItem.cpp 2014-01-26 22:46:32 UTC (rev 162813)
+++ trunk/Source/WebKit/win/WebHistoryItem.cpp 2014-01-26 22:52:17 UTC (rev 162814)
</span><span class="lines">@@ -92,11 +92,8 @@
</span><span class="cx">
</span><span class="cx"> static CFStringRef urlKey = CFSTR("");
</span><span class="cx"> static CFStringRef titleKey = CFSTR("title");
</span><del>-static CFStringRef visitCountKey = CFSTR("visitCount");
</del><span class="cx"> static CFStringRef lastVisitWasFailureKey = CFSTR("lastVisitWasFailure");
</span><span class="cx"> static CFStringRef redirectURLsKey = CFSTR("redirectURLs");
</span><del>-static CFStringRef dailyVisitCountKey = CFSTR("D"); // short key to save space
-static CFStringRef weeklyVisitCountKey = CFSTR("W"); // short key to save space
</del><span class="cx">
</span><span class="cx"> HRESULT STDMETHODCALLTYPE WebHistoryItem::initFromDictionaryRepresentation(void* dictionary)
</span><span class="cx"> {
</span><span class="lines">@@ -110,19 +107,6 @@
</span><span class="cx"> if (titleRef && CFGetTypeID(titleRef) != CFStringGetTypeID())
</span><span class="cx"> return E_FAIL;
</span><span class="cx">
</span><del>- CFNumberRef visitCountRef = (CFNumberRef) CFDictionaryGetValue(dictionaryRef, visitCountKey);
- if (!visitCountRef || CFGetTypeID(visitCountRef) != CFNumberGetTypeID())
- return E_FAIL;
- int visitedCount = 0;
- if (!CFNumberGetValue(visitCountRef, kCFNumberIntType, &visitedCount))
- return E_FAIL;
-
- // Can't trust data on disk, and we've had at least one report of this (<rdar://6572300>).
- if (visitedCount < 0) {
- LOG_ERROR("visit count for history item \"%s\" is negative (%d), will be reset to 1", String(urlStringRef).utf8().data(), visitedCount);
- visitedCount = 1;
- }
-
</del><span class="cx"> CFBooleanRef lastVisitWasFailureRef = static_cast<CFBooleanRef>(CFDictionaryGetValue(dictionaryRef, lastVisitWasFailureKey));
</span><span class="cx"> if (lastVisitWasFailureRef && CFGetTypeID(lastVisitWasFailureRef) != CFBooleanGetTypeID())
</span><span class="cx"> return E_FAIL;
</span><span class="lines">@@ -136,13 +120,6 @@
</span><span class="cx"> (*redirectURLsVector)[i] = String(static_cast<CFStringRef>(CFArrayGetValueAtIndex(redirectURLsRef, i)));
</span><span class="cx"> }
</span><span class="cx">
</span><del>- CFArrayRef dailyCounts = static_cast<CFArrayRef>(CFDictionaryGetValue(dictionaryRef, dailyVisitCountKey));
- if (dailyCounts && CFGetTypeID(dailyCounts) != CFArrayGetTypeID())
- dailyCounts = 0;
- CFArrayRef weeklyCounts = static_cast<CFArrayRef>(CFDictionaryGetValue(dictionaryRef, weeklyVisitCountKey));
- if (weeklyCounts && CFGetTypeID(weeklyCounts) != CFArrayGetTypeID())
- weeklyCounts = 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="lines">@@ -174,10 +151,6 @@
</span><span class="cx"> values[keyCount++] = m_historyItem->title().createCFString().leakRef();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- keys[keyCount] = visitCountKey;
- int visitCount = m_historyItem->visitCount();
- values[keyCount++] = CFNumberCreate(0, kCFNumberIntType, &visitCount);
-
</del><span class="cx"> if (m_historyItem->lastVisitWasFailure()) {
</span><span class="cx"> keys[keyCount] = lastVisitWasFailureKey;
</span><span class="cx"> values[keyCount++] = CFRetain(kCFBooleanTrue);
</span><span class="lines">@@ -388,34 +361,23 @@
</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::getDailyVisitCounts(int* number, int** counts)
</span><span class="cx"> {
</span><del>- if (!number || !counts) {
- ASSERT_NOT_REACHED();
- return E_POINTER;
- }
-
- *counts = const_cast<int*>(m_historyItem->dailyVisitCounts().data());
- *number = m_historyItem->dailyVisitCounts().size();
- 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::getWeeklyVisitCounts(int* number, int** counts)
</span><span class="cx"> {
</span><del>- if (!number || !counts) {
- ASSERT_NOT_REACHED();
- return E_POINTER;
- }
-
- *counts = const_cast<int*>(m_historyItem->weeklyVisitCounts().data());
- *number = m_historyItem->weeklyVisitCounts().size();
- 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::recordInitialVisit()
</span><span class="cx"> {
</span><del>- m_historyItem->recordInitialVisit();
- return S_OK;
</del><ins>+ // FIXME: This function should be removed from the IWebHistoryItem interface.
+ return E_NOTIMPL;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // IUnknown -------------------------------------------------------------------
</span><span class="lines">@@ -460,7 +422,7 @@
</span><span class="cx"> /* [in] */ DATE lastVisited)
</span><span class="cx"> {
</span><span class="cx"> historyItemWrappers().remove(m_historyItem.get());
</span><del>- m_historyItem = HistoryItem::create(String(urlString, SysStringLen(urlString)), String(title, SysStringLen(title)), 0);
</del><ins>+ m_historyItem = HistoryItem::create(String(urlString, SysStringLen(urlString)), String(title, SysStringLen(title)));
</ins><span class="cx"> historyItemWrappers().set(m_historyItem.get(), this);
</span><span class="cx">
</span><span class="cx"> return S_OK;
</span></span></pre>
</div>
</div>
</body>
</html>