WebKit side of merge from r41149 to r41181.

WebCore/loader/appcache/ApplicationCacheGroup.cpp

 /*
  * Copyright (C) 2008, 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
@@ skipping 173 matching lines @@
     if (mainResourceCache) {
         mainResourceCache->group()->associateDocumentLoaderWithCache(documentLoader, mainResourceCache);
         mainResourceCache->group()->update(frame, ApplicationCacheUpdateWithBrowsingContext);
     }
 }
 
 void ApplicationCacheGroup::finishedLoadingMainResource(DocumentLoader* loader)
 {
     ASSERT(m_pendingMasterResourceLoaders.contains(loader));
     ASSERT(m_completionType == None || m_pendingEntries.isEmpty());
-    const KURL& url = loader->originalURL();
+    const KURL& url = loader->url();
 
     switch (m_completionType) {
     case None:
         // The main resource finished loading before the manifest was ready. It will be handled via dispatchMainResources() later.
         return;
     case NoUpdate:
         ASSERT(!m_cacheBeingUpdated);
         associateDocumentLoaderWithCache(loader, m_newestCache.get());
 
         if (ApplicationCacheResource* resource = m_newestCache->resourceForURL(url)) {
@@ skipping 669 matching lines @@
     
     HashSet<ApplicationCache*>::const_iterator end = m_caches.end();
     for (HashSet<ApplicationCache*>::const_iterator it = m_caches.begin(); it != end; ++it)
         (*it)->clearStorageID();
 }
     
 
 }
 
 #endif // ENABLE(OFFLINE_WEB_APPLICATIONS)