-
darin@apple.com authored
Reviewed by Sam Weinig. WebCore: * WebCore.exp.in: Updated. * GNUmakefile.am: Removed BackForwardControllerClient.h. * WebCore.gypi: Ditto. * WebCore.pro: Ditto. * WebCore.vcproj/WebCore.vcproj: Ditto. * WebCore.xcodeproj/project.pbxproj: Ditto. * history/BackForwardControllerClient.h: Removed. * history/BackForwardController.cpp: (WebCore::BackForwardController::BackForwardController): Set up just m_client. (WebCore::BackForwardController::~BackForwardController): Removed call to backForwardControllerDestroyed. (WebCore::BackForwardController::canGoBackOrForward): Added. (WebCore::BackForwardController::goBackOrForward): Added. (WebCore::BackForwardController::goBack): Added. (WebCore::BackForwardController::goForward): Added. (WebCore::BackForwardController::addItem): Added. (WebCore::BackForwardController::setCurrentItem): Added. (WebCore::BackForwardController::count): Added. (WebCore::BackForwardController::backCount): Added. (WebCore::BackForwardController::forwardCount): Added. (WebCore::BackForwardController::itemAtIndex): Added. (WebCore::BackForwardController::isActive): Added. (WebCore::BackForwardController::close): Added. * history/BackForwardController.h: Added functions from Page and BackForwardList that should be called here instead. Note that BackForwardList is to be renamed BackForwardClient soon. * history/BackForwardList.h: Removed many now-unneeded virtual functions. * history/BackForwardListImpl.h: Moved BackForwardListClient in here. * history/PageCache.cpp: (WebCore::logCanCachePageDecision): Use backForward(). (WebCore::PageCache::canCache): Ditto. * loader/FrameLoader.cpp: (WebCore::FrameLoader::transitionToCommitted): Removed unneeded null check of backFowardList, which is never null. (WebCore::FrameLoader::checkLoadCompleteForThisFrame): Use backForward. (WebCore::FrameLoader::didFirstLayout): Ditto. (WebCore::FrameLoader::continueLoadAfterNavigationPolicy): Ditto. (WebCore::FrameLoader::checkDidPerformFirstNavigation): Ditto. * loader/HistoryController.cpp: (WebCore::HistoryController::goToItem): Ditto. (WebCore::HistoryController::updateForStandardLoad): Ditto. (WebCore::HistoryController::updateForRedirectWithLockedBackForwardList): Ditto. (WebCore::HistoryController::updateBackForwardListClippedAtTarget): Ditto. (WebCore::HistoryController::pushState): Ditto. * loader/NavigationScheduler.cpp: (WebCore::ScheduledHistoryNavigation::fire): Ditto. (WebCore::NavigationScheduler::scheduleHistoryNavigation): Ditto. * page/ContextMenuController.cpp: (WebCore::ContextMenuController::contextMenuItemSelected): Ditto. * page/DOMWindow.cpp: (WebCore::DOMWindow::close): Ditto. * page/History.cpp: (WebCore::History::length): Ditto. * page/Page.cpp: (WebCore::Page::Page): Use more adoptPtr. Use backForwardClient instead of backForwardControllerClient. (WebCore::Page::~Page): Use backForward. (WebCore::Page::backForwardList): Ditto. (WebCore::Page::goBack): Ditto. (WebCore::Page::goForward): Ditto. (WebCore::Page::canGoBackOrForward): Ditto. (WebCore::Page::goBackOrForward): Ditto. (WebCore::Page::getHistoryLength): Ditto. (WebCore::Page::PageClients::PageClients): Made non-inline. (WebCore::Page::PageClients::~PageClients): Ditto. * page/Page.h: Made PageClients constructor and destructor non-inline. Added backForward function. Marked old functions as deprecated. * page/Settings.cpp: (WebCore::Settings::setUsesPageCache): Use backForward. * platform/ContextMenu.cpp: (WebCore::ContextMenu::populate): Ditto. (WebCore::ContextMenu::checkOrEnableIfNeeded): Ditto. * wml/WMLDoElement.cpp: (WebCore::WMLDoElement::defaultEventHandler): Ditto. * wml/WMLDocument.cpp: (WebCore::WMLDocument::finishedParsing): Ditto. * wml/WMLPageState.cpp: (WebCore::WMLPageState::reset): Ditto. (WebCore::tryAccessHistoryURLs): Ditto. * wml/WMLPrevElement.cpp: (WebCore::WMLPrevElement::executeTask): Ditto. WebKit2: * WebKit2.pro: Removed WebBackForwardControllerClient.cpp and .h. * WebKit2.xcodeproj/project.pbxproj: Ditto. * WebProcess/WebCoreSupport/WebBackForwardControllerClient.cpp: Removed. * WebProcess/WebCoreSupport/WebBackForwardControllerClient.h: Removed. * WebProcess/InjectedBundle/InjectedBundleBackForwardList.cpp: (WebKit::InjectedBundleBackForwardList::itemAtIndex): Use backForward. (WebKit::InjectedBundleBackForwardList::backListCount): Ditto. (WebKit::InjectedBundleBackForwardList::forwardListCount): Ditto. (WebKit::InjectedBundleBackForwardList::clear): Ditto. * WebProcess/WebPage/WebBackForwardListProxy.h: Added newly-needed include. * WebProcess/WebPage/WebPage.cpp: (WebKit::WebPage::WebPage): Set up backForwardClient. git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70960 268f45cc-cd09-0410-ab3c-d52691b4dbfc
e10e1282