WebKit merge 40500:40539 [WebKit side]

third_party/WebKit/WebCore/loader/FrameLoaderTypes.h

 /*
  * Copyright (C) 2006 Apple Computer, 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 34 matching lines @@
         PolicyIgnore,
     };
 
     enum FrameLoadType {
         FrameLoadTypeStandard,
         FrameLoadTypeBack,
         FrameLoadTypeForward,
         FrameLoadTypeIndexedBackForward, // a multi-item hop in the backforward list
         FrameLoadTypeReload,
         FrameLoadTypeSame,               // user loads same URL again (but not reload button)
-        FrameLoadTypeRedirect,
+        FrameLoadTypeRedirectWithLockedBackForwardList, // FIXME: Merge "lockBackForwardList", "lockHistory", "quickRedirect" and "clientRedirect" into a single concept of redirect.
         FrameLoadTypeReplace,
         FrameLoadTypeReloadFromOrigin
     };
 
     enum NavigationType {
         NavigationTypeLinkClicked,
         NavigationTypeFormSubmitted,
         NavigationTypeBackForward,
         NavigationTypeReload,
         NavigationTypeFormResubmitted,
         NavigationTypeOther
     };
 
     enum ObjectContentType {
         ObjectContentNone,
         ObjectContentImage,
         ObjectContentFrame,
         ObjectContentNetscapePlugin,
         ObjectContentOtherPlugin
     };
 }
 
 #endif