Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(268)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: Source/WebCore/page/History.cpp

Issue 9963061: Merge 112184 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1025/
Patch Set: Created 8 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/WebCore/page/DOMWindow.cpp ('k') | Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebCore/page/History.cpp
===================================================================
--- Source/WebCore/page/History.cpp (revision 112895)
+++ Source/WebCore/page/History.cpp (working copy)
@@ -88,11 +88,11 @@
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);
« no previous file with comments | « Source/WebCore/page/DOMWindow.cpp ('k') | Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698