Split the frame tree logic out of HistoryItem

Source/core/loader/NavigationScheduler.cpp

 /*
  * Copyright (C) 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  * Copyright (C) 2009 Adam Barth. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
@@ skipping 105 matching lines @@
         frame->loader().load(request);
     }
 
     virtual void didStartTimer(Frame* frame, Timer<NavigationScheduler>* timer)
     {
         if (m_haveToldClient)
             return;
         m_haveToldClient = true;
 
         OwnPtr<UserGestureIndicator> gestureIndicator = createUserGestureIndicator();
-        if (frame->loader().history()->currentItemShouldBeReplaced())
+        if (frame->page()->history()->currentItemShouldBeReplaced(frame))
             setLockBackForwardList(true);
     }
 
     SecurityOrigin* securityOrigin() const { return m_securityOrigin.get(); }
     String url() const { return m_url; }
     String referrer() const { return m_referrer; }
 
 private:
     RefPtr<SecurityOrigin> m_securityOrigin;
     String m_url;
@@ skipping 96 matching lines @@
         frame->loader().load(frameRequest);
     }
 
     virtual void didStartTimer(Frame* frame, Timer<NavigationScheduler>* timer)
     {
         if (m_haveToldClient)
             return;
         m_haveToldClient = true;
 
         OwnPtr<UserGestureIndicator> gestureIndicator = createUserGestureIndicator();
-        if (frame->loader().history()->currentItemShouldBeReplaced())
+        if (frame->page()->history()->currentItemShouldBeReplaced(frame))
             setLockBackForwardList(true);
     }
 
     virtual bool isForm() const { return true; }
     FormSubmission* submission() const { return m_submission.get(); }
 
 private:
     RefPtr<FormSubmission> m_submission;
     bool m_haveToldClient;
 };
@@ skipping 178 matching lines @@
 void NavigationScheduler::cancel()
 {
     if (m_timer.isActive())
         InspectorInstrumentation::frameClearedScheduledNavigation(m_frame);
     m_timer.stop();
     m_redirect.clear();
     m_additionalFormSubmissions.clear();
 }
 
 } // namespace WebCore