Title: [162810] trunk/Source/WebKit/win
- Revision
- 162810
- Author
- [email protected]
- Date
- 2014-01-26 14:34:13 -0800 (Sun, 26 Jan 2014)
Log Message
Build fix.
* WebHistoryItem.cpp:
(WebHistoryItem::initFromDictionaryRepresentation):
(WebHistoryItem::dictionaryRepresentation):
Modified Paths
Diff
Modified: trunk/Source/WebKit/win/ChangeLog (162809 => 162810)
--- trunk/Source/WebKit/win/ChangeLog 2014-01-26 22:29:06 UTC (rev 162809)
+++ trunk/Source/WebKit/win/ChangeLog 2014-01-26 22:34:13 UTC (rev 162810)
@@ -1,5 +1,13 @@
2014-01-26 Anders Carlsson <[email protected]>
+ Build fix.
+
+ * WebHistoryItem.cpp:
+ (WebHistoryItem::initFromDictionaryRepresentation):
+ (WebHistoryItem::dictionaryRepresentation):
+
+2014-01-26 Anders Carlsson <[email protected]>
+
Move lastVisitWasHTTPNonGet out to WebHistoryItem
https://bugs.webkit.org/show_bug.cgi?id=127657
Modified: trunk/Source/WebKit/win/WebHistoryItem.cpp (162809 => 162810)
--- trunk/Source/WebKit/win/WebHistoryItem.cpp 2014-01-26 22:29:06 UTC (rev 162809)
+++ trunk/Source/WebKit/win/WebHistoryItem.cpp 2014-01-26 22:34:13 UTC (rev 162810)
@@ -95,7 +95,6 @@
static CFStringRef titleKey = CFSTR("title");
static CFStringRef visitCountKey = CFSTR("visitCount");
static CFStringRef lastVisitWasFailureKey = CFSTR("lastVisitWasFailure");
-static CFStringRef lastVisitWasHTTPNonGetKey = CFSTR("lastVisitWasHTTPNonGet");
static CFStringRef redirectURLsKey = CFSTR("redirectURLs");
static CFStringRef dailyVisitCountKey = CFSTR("D"); // short key to save space
static CFStringRef weeklyVisitCountKey = CFSTR("W"); // short key to save space
@@ -135,11 +134,6 @@
return E_FAIL;
bool lastVisitWasFailure = lastVisitWasFailureRef && CFBooleanGetValue(lastVisitWasFailureRef);
- CFBooleanRef lastVisitWasHTTPNonGetRef = static_cast<CFBooleanRef>(CFDictionaryGetValue(dictionaryRef, lastVisitWasHTTPNonGetKey));
- if (lastVisitWasHTTPNonGetRef && CFGetTypeID(lastVisitWasHTTPNonGetRef) != CFBooleanGetTypeID())
- return E_FAIL;
- bool lastVisitWasHTTPNonGet = lastVisitWasHTTPNonGetRef && CFBooleanGetValue(lastVisitWasHTTPNonGetRef);
-
std::unique_ptr<Vector<String>> redirectURLsVector;
if (CFArrayRef redirectURLsRef = static_cast<CFArrayRef>(CFDictionaryGetValue(dictionaryRef, redirectURLsKey))) {
CFIndex size = CFArrayGetCount(redirectURLsRef);
@@ -231,12 +225,6 @@
values[keyCount++] = CFRetain(kCFBooleanTrue);
}
- if (m_historyItem->lastVisitWasHTTPNonGet()) {
- ASSERT(m_historyItem->urlString().startsWith("http:", false) || m_historyItem->urlString().startsWith("https:", false));
- keys[keyCount] = lastVisitWasHTTPNonGetKey;
- values[keyCount++] = CFRetain(kCFBooleanTrue);
- }
-
if (Vector<String>* redirectURLs = m_historyItem->redirectURLs()) {
size_t size = redirectURLs->size();
ASSERT(size);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
