WebKit merge 40722:40785 (part 1)

third_party/WebKit/WebCore/loader/DocumentLoader.cpp

 /*
  * Copyright (C) 2006, 2007, 2008 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
@@ skipping 134 matching lines @@
     , m_request(req)
     , m_committed(false)
     , m_isStopping(false)
     , m_loading(false)
     , m_gotFirstByte(false)
     , m_primaryLoadComplete(false)
     , m_isClientRedirect(false)
     , m_loadingFromCachedPage(false)
     , m_stopRecordingResponses(false)
     , m_substituteResourceDeliveryTimer(this, &DocumentLoader::substituteResourceDeliveryTimerFired)
-    , m_urlForHistoryReflectsClientRedirect(false)
+    , m_didCreateGlobalHistoryEntry(false)
 #if ENABLE(OFFLINE_WEB_APPLICATIONS)
     , m_candidateApplicationCacheGroup(0)
 #endif
 {
 }
 
 FrameLoader* DocumentLoader::frameLoader() const
 {
     if (!m_frame)
         return 0;
@@ skipping 779 matching lines @@
 
     m_pendingSubstituteResources.set(loader, resource);
     deliverSubstituteResourcesAfterDelay();
         
     return true;
 }
 
 #endif // ENABLE(OFFLINE_WEB_APPLICATIONS)
 
 }