Merge 112184

Source/WebCore/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 209 matching lines @@
     }
 
     virtual void fire(Frame* frame)
     {
         UserGestureIndicator gestureIndicator(wasUserGesture() ? DefinitelyProcessingUserGesture : DefinitelyNotProcessingUserGesture);
 
         // The submitForm function will find a target frame before using the redirection timer.
         // Now that the timer has fired, we need to repeat the security check which normally is done when
         // selecting a target, in case conditions have changed. Other code paths avoid this by targeting
         // without leaving a time window. If we fail the check just silently drop the form submission.
-        Frame* requestingFrame = m_submission->state()->sourceFrame();
-        if (!requestingFrame->loader()->shouldAllowNavigation(frame))
+        Document* requestingDocument = m_submission->state()->sourceDocument();
+        if (!requestingDocument->canNavigate(frame))
             return;
-        FrameLoadRequest frameRequest(requestingFrame->document()->securityOrigin());
+        FrameLoadRequest frameRequest(requestingDocument->document()->securityOrigin());
         m_submission->populateFrameLoadRequest(frameRequest);
         frame->loader()->loadFrameRequest(frameRequest, lockHistory(), lockBackForwardList(), m_submission->event(), m_submission->state(), MaybeSendReferrer);
     }
     
     virtual void didStartTimer(Frame* frame, Timer<NavigationScheduler>* timer)
     {
         if (m_haveToldClient)
             return;
         m_haveToldClient = true;
 
@@ skipping 219 matching lines @@
 void NavigationScheduler::cancel(bool newLoadInProgress)
 {
     m_timer.stop();
 
     OwnPtr<ScheduledNavigation> redirect(m_redirect.release());
     if (redirect)
         redirect->didStopTimer(m_frame, newLoadInProgress);
 }
 
 } // namespace WebCore