Diff
Modified: trunk/Source/WebKit/ChangeLog (162806 => 162807)
--- trunk/Source/WebKit/ChangeLog 2014-01-26 21:21:39 UTC (rev 162806)
+++ trunk/Source/WebKit/ChangeLog 2014-01-26 21:32:59 UTC (rev 162807)
@@ -1,3 +1,11 @@
+2014-01-26 Anders Carlsson <[email protected]>
+
+ Fix build.
+
+ Make HistoryPropertyList an Objective-C++ class.
+
+ * WebKit.xcodeproj/project.pbxproj:
+
2014-01-25 Alex Christensen <[email protected]>
Unreviewed build fix for Win64.
Modified: trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj (162806 => 162807)
--- trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2014-01-26 21:21:39 UTC (rev 162806)
+++ trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2014-01-26 21:32:59 UTC (rev 162807)
@@ -29,7 +29,7 @@
1A4DF5E50EC8D104006BD4B4 /* WebBaseNetscapePluginView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A4DF5E30EC8D104006BD4B4 /* WebBaseNetscapePluginView.mm */; };
1A60519117502A5D00BC62F5 /* BinaryPropertyList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A60518D17502A5D00BC62F5 /* BinaryPropertyList.cpp */; };
1A60519217502A5D00BC62F5 /* BinaryPropertyList.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A60518E17502A5D00BC62F5 /* BinaryPropertyList.h */; };
- 1A60519317502A5D00BC62F5 /* HistoryPropertyList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A60518F17502A5D00BC62F5 /* HistoryPropertyList.cpp */; };
+ 1A60519317502A5D00BC62F5 /* HistoryPropertyList.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A60518F17502A5D00BC62F5 /* HistoryPropertyList.mm */; };
1A60519417502A5D00BC62F5 /* HistoryPropertyList.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A60519017502A5D00BC62F5 /* HistoryPropertyList.h */; };
1A6A208D1886154600E50F5F /* WebProgressTrackerClient.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A6A208B1886154600E50F5F /* WebProgressTrackerClient.mm */; };
1A6A208E1886154600E50F5F /* WebProgressTrackerClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A6A208C1886154600E50F5F /* WebProgressTrackerClient.h */; };
@@ -470,7 +470,7 @@
1A4DF5E30EC8D104006BD4B4 /* WebBaseNetscapePluginView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebBaseNetscapePluginView.mm; sourceTree = "<group>"; };
1A60518D17502A5D00BC62F5 /* BinaryPropertyList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = BinaryPropertyList.cpp; sourceTree = "<group>"; };
1A60518E17502A5D00BC62F5 /* BinaryPropertyList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BinaryPropertyList.h; sourceTree = "<group>"; };
- 1A60518F17502A5D00BC62F5 /* HistoryPropertyList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HistoryPropertyList.cpp; sourceTree = "<group>"; };
+ 1A60518F17502A5D00BC62F5 /* HistoryPropertyList.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = HistoryPropertyList.mm; sourceTree = "<group>"; };
1A60519017502A5D00BC62F5 /* HistoryPropertyList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HistoryPropertyList.h; sourceTree = "<group>"; };
1A6A208B1886154600E50F5F /* WebProgressTrackerClient.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebProgressTrackerClient.mm; sourceTree = "<group>"; };
1A6A208C1886154600E50F5F /* WebProgressTrackerClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebProgressTrackerClient.h; sourceTree = "<group>"; };
@@ -1142,7 +1142,7 @@
children = (
1A60518D17502A5D00BC62F5 /* BinaryPropertyList.cpp */,
1A60518E17502A5D00BC62F5 /* BinaryPropertyList.h */,
- 1A60518F17502A5D00BC62F5 /* HistoryPropertyList.cpp */,
+ 1A60518F17502A5D00BC62F5 /* HistoryPropertyList.mm */,
1A60519017502A5D00BC62F5 /* HistoryPropertyList.h */,
3944607D020F50ED0ECA1767 /* WebBackForwardList.h */,
3944607E020F50ED0ECA1767 /* WebBackForwardList.mm */,
@@ -2161,7 +2161,7 @@
939810FE0824BF01008DF038 /* CarbonWindowContentView.m in Sources */,
939810FF0824BF01008DF038 /* CarbonWindowFrame.m in Sources */,
B82958D4132707D0000D0E79 /* CorrectionPanel.mm in Sources */,
- 1A60519317502A5D00BC62F5 /* HistoryPropertyList.cpp in Sources */,
+ 1A60519317502A5D00BC62F5 /* HistoryPropertyList.mm in Sources */,
939811000824BF01008DF038 /* HIViewAdapter.m in Sources */,
939811020824BF01008DF038 /* HIWebView.mm in Sources */,
1A8DED510EE88B8A00F25022 /* HostedNetscapePluginStream.mm in Sources */,
Modified: trunk/Source/WebKit/mac/ChangeLog (162806 => 162807)
--- trunk/Source/WebKit/mac/ChangeLog 2014-01-26 21:21:39 UTC (rev 162806)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-01-26 21:32:59 UTC (rev 162807)
@@ -1,5 +1,22 @@
2014-01-26 Anders Carlsson <[email protected]>
+ Fix build.
+
+ Pass a WebHistoryItem to writeHistoryItem so we can extract _lastVisitWasHTTPNonGet from it.
+
+ * History/HistoryPropertyList.h:
+ * History/HistoryPropertyList.mm:
+ (HistoryPropertyListWriter::HistoryPropertyListWriter):
+ (HistoryPropertyListWriter::buffer):
+ (HistoryPropertyListWriter::releaseData):
+ (HistoryPropertyListWriter::writeObjects):
+ (HistoryPropertyListWriter::writeHistoryItem):
+ * History/WebHistory.mm:
+ (WebHistoryWriter::writeHistoryItems):
+ * History/WebHistoryItem.mm:
+
+2014-01-26 Anders Carlsson <[email protected]>
+
Move lastVisitWasHTTPNonGet out to WebHistoryItem
https://bugs.webkit.org/show_bug.cgi?id=127657
Deleted: trunk/Source/WebKit/mac/History/HistoryPropertyList.cpp (162806 => 162807)
--- trunk/Source/WebKit/mac/History/HistoryPropertyList.cpp 2014-01-26 21:21:39 UTC (rev 162806)
+++ trunk/Source/WebKit/mac/History/HistoryPropertyList.cpp 2014-01-26 21:32:59 UTC (rev 162807)
@@ -1,154 +0,0 @@
-/*
- * Copyright (C) 2009 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. ``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
- * 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 "HistoryPropertyList.h"
-
-#include <WebCore/HistoryItem.h>
-#include <wtf/StringExtras.h>
-
-using namespace WebCore;
-
-static const int currentFileVersion = 1;
-
-HistoryPropertyListWriter::HistoryPropertyListWriter()
- : m_dailyVisitCountsKey("D")
- , m_displayTitleKey("displayTitle")
- , m_lastVisitWasFailureKey("lastVisitWasFailure")
- , m_lastVisitWasHTTPNonGetKey("lastVisitWasHTTPNonGet")
- , m_lastVisitedDateKey("lastVisitedDate")
- , m_redirectURLsKey("redirectURLs")
- , m_titleKey("title")
- , m_urlKey("")
- , m_visitCountKey("visitCount")
- , m_weeklyVisitCountsKey("W")
- , m_buffer(0)
-{
-}
-
-UInt8* HistoryPropertyListWriter::buffer(size_t size)
-{
- ASSERT(!m_buffer);
- m_buffer = static_cast<UInt8*>(CFAllocatorAllocate(0, size, 0));
- m_bufferSize = size;
- return m_buffer;
-}
-
-RetainPtr<CFDataRef> HistoryPropertyListWriter::releaseData()
-{
- UInt8* buffer = m_buffer;
- if (!buffer)
- return 0;
- m_buffer = 0;
- RetainPtr<CFDataRef> data = "" buffer, m_bufferSize, 0));
- if (!data) {
- CFAllocatorDeallocate(0, buffer);
- return 0;
- }
- return data;
-}
-
-void HistoryPropertyListWriter::writeObjects(BinaryPropertyListObjectStream& stream)
-{
- size_t outerDictionaryStart = stream.writeDictionaryStart();
-
- stream.writeString("WebHistoryFileVersion");
- stream.writeString("WebHistoryDates");
-
- stream.writeInteger(currentFileVersion);
- size_t outerDateArrayStart = stream.writeArrayStart();
- writeHistoryItems(stream);
- stream.writeArrayEnd(outerDateArrayStart);
-
- stream.writeDictionaryEnd(outerDictionaryStart);
-}
-
-void HistoryPropertyListWriter::writeHistoryItem(BinaryPropertyListObjectStream& stream, HistoryItem* item)
-{
- size_t itemDictionaryStart = stream.writeDictionaryStart();
-
- const String& title = item->title();
- const String& displayTitle = item->alternateTitle();
- double lastVisitedDate = item->lastVisitedTime();
- int visitCount = item->visitCount();
- Vector<String>* redirectURLs = item->redirectURLs();
- const Vector<int>& dailyVisitCounts = item->dailyVisitCounts();
- const Vector<int>& weeklyVisitCounts = item->weeklyVisitCounts();
-
- // keys
- stream.writeString(m_urlKey);
- if (!title.isEmpty())
- stream.writeString(m_titleKey);
- if (!displayTitle.isEmpty())
- stream.writeString(m_displayTitleKey);
- if (lastVisitedDate)
- stream.writeString(m_lastVisitedDateKey);
- if (visitCount)
- stream.writeString(m_visitCountKey);
- if (item->lastVisitWasFailure())
- stream.writeString(m_lastVisitWasFailureKey);
- if (item->lastVisitWasHTTPNonGet())
- stream.writeString(m_lastVisitWasHTTPNonGetKey);
- if (redirectURLs)
- stream.writeString(m_redirectURLsKey);
- if (!dailyVisitCounts.isEmpty())
- stream.writeString(m_dailyVisitCountsKey);
- if (!weeklyVisitCounts.isEmpty())
- stream.writeString(m_weeklyVisitCountsKey);
-
- // values
- stream.writeUniqueString(item->urlString());
- if (!title.isEmpty())
- stream.writeString(title);
- if (!displayTitle.isEmpty())
- stream.writeString(displayTitle);
- if (lastVisitedDate) {
- char buffer[32];
- snprintf(buffer, sizeof(buffer), "%.1lf", lastVisitedDate);
- stream.writeUniqueString(buffer);
- }
- if (visitCount)
- stream.writeInteger(visitCount);
- if (item->lastVisitWasFailure())
- stream.writeBooleanTrue();
- if (item->lastVisitWasHTTPNonGet()) {
- ASSERT(item->urlString().startsWith("http:", false) || item->urlString().startsWith("https:", false));
- stream.writeBooleanTrue();
- }
- if (redirectURLs) {
- size_t redirectArrayStart = stream.writeArrayStart();
- size_t size = redirectURLs->size();
- ASSERT(size);
- for (size_t i = 0; i < size; ++i)
- stream.writeUniqueString(redirectURLs->at(i));
- stream.writeArrayEnd(redirectArrayStart);
- }
- if (size_t size = dailyVisitCounts.size())
- stream.writeIntegerArray(dailyVisitCounts.data(), size);
- if (size_t size = weeklyVisitCounts.size())
- stream.writeIntegerArray(weeklyVisitCounts.data(), size);
-
- stream.writeDictionaryEnd(itemDictionaryStart);
-}
-
Modified: trunk/Source/WebKit/mac/History/HistoryPropertyList.h (162806 => 162807)
--- trunk/Source/WebKit/mac/History/HistoryPropertyList.h 2014-01-26 21:21:39 UTC (rev 162806)
+++ trunk/Source/WebKit/mac/History/HistoryPropertyList.h 2014-01-26 21:32:59 UTC (rev 162807)
@@ -30,9 +30,7 @@
#include <wtf/RetainPtr.h>
#include <wtf/text/WTFString.h>
-namespace WebCore {
-class HistoryItem;
-}
+@class WebHistoryItem;
class HistoryPropertyListWriter : public BinaryPropertyListWriter {
public:
@@ -41,7 +39,7 @@
protected:
HistoryPropertyListWriter();
- void writeHistoryItem(BinaryPropertyListObjectStream&, WebCore::HistoryItem*);
+ void writeHistoryItem(BinaryPropertyListObjectStream&, WebHistoryItem *);
private:
virtual void writeHistoryItems(BinaryPropertyListObjectStream&) = 0;
Copied: trunk/Source/WebKit/mac/History/HistoryPropertyList.mm (from rev 162806, trunk/Source/WebKit/mac/History/HistoryPropertyList.cpp) (0 => 162807)
--- trunk/Source/WebKit/mac/History/HistoryPropertyList.mm (rev 0)
+++ trunk/Source/WebKit/mac/History/HistoryPropertyList.mm 2014-01-26 21:32:59 UTC (rev 162807)
@@ -0,0 +1,157 @@
+/*
+ * Copyright (C) 2009 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. ``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
+ * 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.
+ */
+
+#import "HistoryPropertyList.h"
+
+#import "WebHistoryItemInternal.h"
+#import <WebCore/HistoryItem.h>
+#import <wtf/StringExtras.h>
+
+using namespace WebCore;
+
+static const int currentFileVersion = 1;
+
+HistoryPropertyListWriter::HistoryPropertyListWriter()
+ : m_dailyVisitCountsKey("D")
+ , m_displayTitleKey("displayTitle")
+ , m_lastVisitWasFailureKey("lastVisitWasFailure")
+ , m_lastVisitWasHTTPNonGetKey("lastVisitWasHTTPNonGet")
+ , m_lastVisitedDateKey("lastVisitedDate")
+ , m_redirectURLsKey("redirectURLs")
+ , m_titleKey("title")
+ , m_urlKey("")
+ , m_visitCountKey("visitCount")
+ , m_weeklyVisitCountsKey("W")
+ , m_buffer(0)
+{
+}
+
+UInt8* HistoryPropertyListWriter::buffer(size_t size)
+{
+ ASSERT(!m_buffer);
+ m_buffer = static_cast<UInt8*>(CFAllocatorAllocate(0, size, 0));
+ m_bufferSize = size;
+ return m_buffer;
+}
+
+RetainPtr<CFDataRef> HistoryPropertyListWriter::releaseData()
+{
+ UInt8* buffer = m_buffer;
+ if (!buffer)
+ return 0;
+ m_buffer = 0;
+ RetainPtr<CFDataRef> data = "" buffer, m_bufferSize, 0));
+ if (!data) {
+ CFAllocatorDeallocate(0, buffer);
+ return 0;
+ }
+ return data;
+}
+
+void HistoryPropertyListWriter::writeObjects(BinaryPropertyListObjectStream& stream)
+{
+ size_t outerDictionaryStart = stream.writeDictionaryStart();
+
+ stream.writeString("WebHistoryFileVersion");
+ stream.writeString("WebHistoryDates");
+
+ stream.writeInteger(currentFileVersion);
+ size_t outerDateArrayStart = stream.writeArrayStart();
+ writeHistoryItems(stream);
+ stream.writeArrayEnd(outerDateArrayStart);
+
+ stream.writeDictionaryEnd(outerDictionaryStart);
+}
+
+void HistoryPropertyListWriter::writeHistoryItem(BinaryPropertyListObjectStream& stream, WebHistoryItem* webHistoryItem)
+{
+ HistoryItem* item = core(webHistoryItem);
+
+ size_t itemDictionaryStart = stream.writeDictionaryStart();
+
+ const String& title = item->title();
+ const String& displayTitle = item->alternateTitle();
+ double lastVisitedDate = item->lastVisitedTime();
+ int visitCount = item->visitCount();
+ Vector<String>* redirectURLs = item->redirectURLs();
+ const Vector<int>& dailyVisitCounts = item->dailyVisitCounts();
+ const Vector<int>& weeklyVisitCounts = item->weeklyVisitCounts();
+
+ // keys
+ stream.writeString(m_urlKey);
+ if (!title.isEmpty())
+ stream.writeString(m_titleKey);
+ if (!displayTitle.isEmpty())
+ stream.writeString(m_displayTitleKey);
+ if (lastVisitedDate)
+ stream.writeString(m_lastVisitedDateKey);
+ if (visitCount)
+ stream.writeString(m_visitCountKey);
+ if (item->lastVisitWasFailure())
+ stream.writeString(m_lastVisitWasFailureKey);
+ if (webHistoryItem->_private->_lastVisitWasHTTPNonGet)
+ stream.writeString(m_lastVisitWasHTTPNonGetKey);
+ if (redirectURLs)
+ stream.writeString(m_redirectURLsKey);
+ if (!dailyVisitCounts.isEmpty())
+ stream.writeString(m_dailyVisitCountsKey);
+ if (!weeklyVisitCounts.isEmpty())
+ stream.writeString(m_weeklyVisitCountsKey);
+
+ // values
+ stream.writeUniqueString(item->urlString());
+ if (!title.isEmpty())
+ stream.writeString(title);
+ if (!displayTitle.isEmpty())
+ stream.writeString(displayTitle);
+ if (lastVisitedDate) {
+ char buffer[32];
+ snprintf(buffer, sizeof(buffer), "%.1lf", lastVisitedDate);
+ stream.writeUniqueString(buffer);
+ }
+ if (visitCount)
+ stream.writeInteger(visitCount);
+ if (item->lastVisitWasFailure())
+ stream.writeBooleanTrue();
+ if (webHistoryItem->_private->_lastVisitWasHTTPNonGet) {
+ ASSERT(item->urlString().startsWith("http:", false) || item->urlString().startsWith("https:", false));
+ stream.writeBooleanTrue();
+ }
+ if (redirectURLs) {
+ size_t redirectArrayStart = stream.writeArrayStart();
+ size_t size = redirectURLs->size();
+ ASSERT(size);
+ for (size_t i = 0; i < size; ++i)
+ stream.writeUniqueString(redirectURLs->at(i));
+ stream.writeArrayEnd(redirectArrayStart);
+ }
+ if (size_t size = dailyVisitCounts.size())
+ stream.writeIntegerArray(dailyVisitCounts.data(), size);
+ if (size_t size = weeklyVisitCounts.size())
+ stream.writeIntegerArray(weeklyVisitCounts.data(), size);
+
+ stream.writeDictionaryEnd(itemDictionaryStart);
+}
+
Modified: trunk/Source/WebKit/mac/History/WebHistory.mm (162806 => 162807)
--- trunk/Source/WebKit/mac/History/WebHistory.mm 2014-01-26 21:21:39 UTC (rev 162806)
+++ trunk/Source/WebKit/mac/History/WebHistory.mm 2014-01-26 21:32:59 UTC (rev 162807)
@@ -970,6 +970,6 @@
NSArray *entries = m_entriesByDate->get(m_dateKeys[dateIndex]).get();
NSUInteger entryCount = [entries count];
for (NSUInteger entryIndex = 0; entryIndex < entryCount; ++entryIndex)
- writeHistoryItem(stream, core([entries objectAtIndex:entryIndex]));
+ writeHistoryItem(stream, [entries objectAtIndex:entryIndex]);
}
}
Modified: trunk/Source/WebKit/mac/History/WebHistoryItem.mm (162806 => 162807)
--- trunk/Source/WebKit/mac/History/WebHistoryItem.mm 2014-01-26 21:21:39 UTC (rev 162806)
+++ trunk/Source/WebKit/mac/History/WebHistoryItem.mm 2014-01-26 21:32:59 UTC (rev 162807)
@@ -509,7 +509,7 @@
[dict setObject:[NSNumber numberWithInt:coreItem->visitCount()] forKey:visitCountKey];
if (coreItem->lastVisitWasFailure())
[dict setObject:[NSNumber numberWithBool:YES] forKey:lastVisitWasFailureKey];
- if (coreItem->lastVisitWasHTTPNonGet()) {
+ if (_private->_lastVisitWasHTTPNonGet) {
ASSERT(coreItem->urlString().startsWith("http:", false) || coreItem->urlString().startsWith("https:", false));
[dict setObject:[NSNumber numberWithBool:YES] forKey:lastVisitWasHTTPNonGetKey];
}
