Changeset 40380

Timestamp:

01/29/09 15:48:04 (19 months ago)

Author:

weinig@apple.com

Message:

WebCore:

2009-01-29 Sam Weinig < sam@webkit.org>

Reviewed by Mark Rowe.

First step in tracking the urls a HistoryItem was redirected through.

• WebCore.base.exp:
• history/HistoryItem.cpp: (WebCore::HistoryItem::HistoryItem): (WebCore::HistoryItem::addRedirectURL): (WebCore::HistoryItem::redirectURLs): (WebCore::HistoryItem::setRedirectURLs):
• history/HistoryItem.h:

WebKit/mac:

2009-01-29 Sam Weinig < sam@webkit.org>

Reviewed by Mark Rowe.

First step in tracking the urls a HistoryItem was redirected through.

• History/WebHistoryItem.mm: (-[WebHistoryItem initFromDictionaryRepresentation:]): (-[WebHistoryItem dictionaryRepresentation]):
• Misc/WebNSDictionaryExtras.h:
• Misc/WebNSDictionaryExtras.m: (-[NSDictionary _webkit_arrayForKey:]): Add helper.

WebKit/win:

2009-01-29 Sam Weinig < sam@webkit.org>

Reviewed by Mark Rowe.

First step in tracking the urls a HistoryItem was redirected through.

• WebHistoryItem.cpp: (WebHistoryItem::initFromDictionaryRepresentation): (WebHistoryItem::dictionaryRepresentation):

Location:

trunk

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/WebCore.base.exp (modified) (2 diffs)
• WebCore/history/HistoryItem.cpp (modified) (2 diffs)
• WebCore/history/HistoryItem.h (modified) (2 diffs)
• WebKit/mac/ChangeLog (modified) (1 diff)
• WebKit/mac/History/WebHistoryItem.mm (modified) (4 diffs)
• WebKit/mac/Misc/WebNSDictionaryExtras.h (modified) (1 diff)
• WebKit/mac/Misc/WebNSDictionaryExtras.m (modified) (1 diff)
• WebKit/win/ChangeLog (modified) (1 diff)
• WebKit/win/WebHistoryItem.cpp (modified) (5 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-01-29  Sam Weinig  <sam@webkit.org>
+
+        Reviewed by Mark Rowe.
+
+        First step in tracking the urls a HistoryItem was redirected through.
+
+        * WebCore.base.exp:
+        * history/HistoryItem.cpp:
+        (WebCore::HistoryItem::HistoryItem):
+        (WebCore::HistoryItem::addRedirectURL):
+        (WebCore::HistoryItem::redirectURLs):
+        (WebCore::HistoryItem::setRedirectURLs):
+        * history/HistoryItem.h:
+
 2009-01-29  Dirk Schulze  <krit@webkit.org>
 

trunk/WebCore/WebCore.base.exp

@@ -181 +181 @@
 __ZN7WebCore11HistoryItem14setScrollPointERKNS_8IntPointE
 __ZN7WebCore11HistoryItem15setIsTargetItemEb
+__ZN7WebCore11HistoryItem15setRedirectURLsESt8auto_ptrIN3WTF6VectorINS_6StringELm0EEEE
 __ZN7WebCore11HistoryItem17setAlternateTitleERKNS_6StringE
 __ZN7WebCore11HistoryItem18setLastVisitedTimeEd
@@ -717 +718 @@
 __ZNK7WebCore11HistoryItem11scrollPointEv
 __ZNK7WebCore11HistoryItem12isTargetItemEv
+__ZNK7WebCore11HistoryItem12redirectURLsEv
 __ZNK7WebCore11HistoryItem14alternateTitleEv
 __ZNK7WebCore11HistoryItem15lastVisitedTimeEv

trunk/WebCore/history/HistoryItem.cpp

@@ -129 +129 @@
     for (unsigned i = 0; i < size; ++i)
         m_subItems.append(item.m_subItems[i]->copy());
+
+    if (item.m_redirectURLs)
+        m_redirectURLs.set(new Vector<String>(*item.m_redirectURLs));
 }
 
@@ -401 +404 @@
 }
 
+void HistoryItem::addRedirectURL(const String& url)
+{
+    if (!m_redirectURLs)
+        m_redirectURLs.set(new Vector<String>);
+
+    m_redirectURLs->append(url);
+}
+
+Vector<String>* HistoryItem::redirectURLs() const
+{
+    return m_redirectURLs.get();
+}
+
+void HistoryItem::setRedirectURLs(std::auto_ptr<Vector<String> > redirectURLs)
+{
+    m_redirectURLs.adopt(redirectURLs);
+}
+
 #ifndef NDEBUG
 

trunk/WebCore/history/HistoryItem.h

@@ -139 +139 @@
     void setLastVisitedTime(double);
     void visited(const String& title, double time);
-    
+
+    void addRedirectURL(const String&);
+    Vector<String>* redirectURLs() const;
+    void setRedirectURLs(std::auto_ptr<Vector<String> >);
+
     bool isCurrentDocument(Document*) const;
     
@@ -190 +194 @@
     bool m_isTargetItem;
     int m_visitCount;
-    
+
+    OwnPtr<Vector<String> > m_redirectURLs;
+
     // info used to repost form data
     RefPtr<FormData> m_formData;

trunk/WebKit/mac/ChangeLog

@@ +1 @@
+2009-01-29  Sam Weinig  <sam@webkit.org>
+
+        Reviewed by Mark Rowe.
+
+        First step in tracking the urls a HistoryItem was redirected through.
+
+        * History/WebHistoryItem.mm:
+        (-[WebHistoryItem initFromDictionaryRepresentation:]):
+        (-[WebHistoryItem dictionaryRepresentation]):
+        * Misc/WebNSDictionaryExtras.h:
+        * Misc/WebNSDictionaryExtras.m:
+        (-[NSDictionary _webkit_arrayForKey:]): Add helper.
+
 2009-01-29  Anders Carlsson  <andersca@apple.com>
 

trunk/WebKit/mac/History/WebHistoryItem.mm

@@ -63 +63 @@
 static NSString *lastVisitWasFailureKey = @"lastVisitWasFailure";
 static NSString *lastVisitWasHTTPNonGetKey = @"lastVisitWasHTTPNonGet";
+static NSString *redirectURLsKey = @"redirectURLs";
 
 // Notification strings.
@@ -365 +366 @@
         core(_private)->setLastVisitWasHTTPNonGet(lastVisitWasHTTPNonGet);
 
+    if (NSArray *redirectURLs = [dict _webkit_arrayForKey:redirectURLsKey]) {
+        NSUInteger size = [redirectURLs count];
+        std::auto_ptr<Vector<String> > redirectURLsVector(new Vector<String>(size));
+        for (NSUInteger i = 0; i < size; ++i)
+            (*redirectURLsVector)[i] = String([redirectURLs objectAtIndex:i]);
+        core(_private)->setRedirectURLs(redirectURLsVector);
+    }
+
     NSArray *childDicts = [dict objectForKey:childrenKey];
     if (childDicts) {
@@ -409 +418 @@
     HistoryItem* coreItem = core(_private);
     
-    if (!coreItem->urlString().isEmpty()) {
+    if (!coreItem->urlString().isEmpty())
         [dict setObject:(NSString*)coreItem->urlString() forKey:@""];
-    }
-    if (!coreItem->title().isEmpty()) {
+    if (!coreItem->title().isEmpty())
         [dict setObject:(NSString*)coreItem->title() forKey:titleKey];
-    }
-    if (!coreItem->alternateTitle().isEmpty()) {
+    if (!coreItem->alternateTitle().isEmpty())
         [dict setObject:(NSString*)coreItem->alternateTitle() forKey:displayTitleKey];
-    }
     if (coreItem->lastVisitedTime() != 0.0) {
-        // store as a string to maintain backward compatibility (see 3245793)
+        // Store as a string to maintain backward compatibility. (See 3245793)
         [dict setObject:[NSString stringWithFormat:@"%.1lf", coreItem->lastVisitedTime()]
                  forKey:lastVisitedTimeIntervalKey];
@@ -427 +433 @@
     if (coreItem->lastVisitWasFailure())
         [dict setObject:[NSNumber numberWithBool:YES] forKey:lastVisitWasFailureKey];
-
     if (coreItem->lastVisitWasHTTPNonGet()) {
         ASSERT(coreItem->urlString().startsWith("http:", false) || coreItem->urlString().startsWith("https:", false));
         [dict setObject:[NSNumber numberWithBool:YES] forKey:lastVisitWasHTTPNonGetKey];
+    }
+    if (Vector<String>* redirectURLs = coreItem->redirectURLs()) {
+        size_t size = redirectURLs->size();
+        NSMutableArray *result = [[NSMutableArray alloc] initWithCapacity:size];
+        for (size_t i = 0; i < size; ++i)
+            [result addObject:(NSString*)redirectURLs->at(i)];
+        [dict setObject:result forKey:redirectURLsKey];
+        [result release];
     }
     

trunk/WebKit/mac/Misc/WebNSDictionaryExtras.h

@@ -33 +33 @@
 - (int)_webkit_intForKey:(id)key;
 - (NSString *)_webkit_stringForKey:(id)key; // Returns nil if the value is not an NSString.
+- (NSArray *)_webkit_arrayForKey:(id)key; // Returns nil if the value is not an NSArray.
 
 // Searches for the full MIME type, then the prefix (e.g., "text/" for "text/html")

trunk/WebKit/mac/Misc/WebNSDictionaryExtras.m

@@ -48 +48 @@
     id object = [self objectForKey:key];
     return [object isKindOfClass:[NSString class]] ? object : nil;
+}
+
+-(NSArray *)_webkit_arrayForKey:(id)key
+{
+    id object = [self objectForKey:key];
+    return [object isKindOfClass:[NSArray class]] ? object : nil;
 }
 

trunk/WebKit/win/ChangeLog

@@ +1 @@
+2009-01-29  Sam Weinig  <sam@webkit.org>
+
+        Reviewed by Mark Rowe.
+
+        First step in tracking the urls a HistoryItem was redirected through.
+
+        * WebHistoryItem.cpp:
+        (WebHistoryItem::initFromDictionaryRepresentation):
+        (WebHistoryItem::dictionaryRepresentation):
+
 2009-01-29  Adam Roben  <aroben@apple.com>
 

trunk/WebKit/win/WebHistoryItem.cpp

@@ -98 +98 @@
 static CFStringRef lastVisitWasFailureKey = CFSTR("lastVisitWasFailure");
 static CFStringRef lastVisitWasHTTPNonGetKey = CFSTR("lastVisitWasHTTPNonGet");
+static CFStringRef redirectURLsKey = CFSTR("redirectURLs");
 
 HRESULT STDMETHODCALLTYPE WebHistoryItem::initFromDictionaryRepresentation(void* dictionary)
@@ -132 +133 @@
         return E_FAIL;
     bool lastVisitWasHTTPNonGet = lastVisitWasHTTPNonGetRef && CFBooleanGetValue(lastVisitWasHTTPNonGetRef);
+
+    std::auto_ptr<Vector<String> > redirectURLsVector;
+    if (CFArrayRef redirectURLsRef = static_cast<CFArrayRef>(CFDictionaryGetValue(dictionaryRef, redirectURLsKey))) {
+        CFIndex size = CFArrayGetCount(redirectURLsRef);
+        redirectURLs = std::auto_ptr<Vector<String> >(new Vector<String>(size));
+        for (CFIndex i = 0; i < size; ++i)
+            (*redirectURLsVector)[i] = String(static_cast<CFStringRef>(CFArrayGetValueAtIndex(redirectURLsRef, i)));
+    }
 
     historyItemWrappers().remove(m_historyItem.get());
@@ -143 +152 @@
     if (lastVisitWasHTTPNonGet && (protocolIs(m_historyItem->urlString(), "http") || protocolIs(m_historyItem->urlString(), "https")))
         m_historyItem->setLastVisitWasHTTPNonGet(true);
+
+    if (redirectURLsVector)
+        core(_private)->setRedirectURLs(redirectURLsVector);
 
     return S_OK;
@@ -157 +169 @@
 
     int keyCount = 0;
-    CFTypeRef keys[6];
-    CFTypeRef values[6];
+    CFTypeRef keys[7];
+    CFTypeRef values[7];
 
     if (!m_historyItem->urlString().isEmpty()) {
@@ -186 +198 @@
         keys[keyCount] = lastVisitWasHTTPNonGetKey;
         values[keyCount++] = CFRetain(kCFBooleanTrue);
+    }
+
+    if (Vector<String>* redirectURLs = m_historyItem->redirectURLs()) {
+        size_t size = redirectURLs->size();
+
+        CFStringRef* items = new CFStringRef[size];
+        for (size_t i = 0; i < size; ++i)
+            items[i] = redirectURLs->at(i).createCFString();
+        CFArrayRef result = CFArrayCreate(0, (const void**)items, size, &kCFTypeArrayCallBacks);
+        for (size_t i = 0; i < size; ++i)
+            CFRelease(items[i]);
+        delete[] items;
+
+        keys[keyCount] = redirectURLsKey;
+        values[keyCount++] = result;
     }