Merge 112184

Source/WebCore/page/History.cpp

 /*
  * Copyright (C) 2007 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 70 matching lines @@
 
     m_frame->navigationScheduler()->scheduleHistoryNavigation(distance);
 }
 
 void History::go(ScriptExecutionContext* context, int distance)
 {
     if (!m_frame)
         return;
 
     ASSERT(isMainThread());
-    Frame* activeFrame = static_cast<Document*>(context)->frame();
-    if (!activeFrame)
+    Document* activeDocument = static_cast<Document*>(context);
+    if (!activeDocument)
         return;
 
-    if (!activeFrame->loader()->shouldAllowNavigation(m_frame))
+    if (!activeDocument->canNavigate(m_frame))
         return;
 
     m_frame->navigationScheduler()->scheduleHistoryNavigation(distance);
 }
 
 KURL History::urlForState(const String& urlString)
 {
     KURL baseURL = m_frame->document()->baseURL();
     if (urlString.isEmpty())
         return baseURL;
@@ skipping 20 matching lines @@
     if (!urlString.isEmpty())
         m_frame->document()->updateURLForPushOrReplaceState(fullURL);
 
     if (stateObjectType == StateObjectPush)
         m_frame->loader()->client()->dispatchDidPushStateWithinPage();
     else if (stateObjectType == StateObjectReplace)
         m_frame->loader()->client()->dispatchDidReplaceStateWithinPage();
 }
 
 } // namespace WebCore