-
darin@apple.com authored
Reviewed by Sam Weinig. WebKitTestRunner needs to support layoutTestController.dumpBackForwardList https://bugs.webkit.org/show_bug.cgi?id=42322 rdar://problem/8193631 WebKitTestRunner needs to support layoutTestController.clearBackForwardList https://bugs.webkit.org/show_bug.cgi?id=42333 rdar://problem/8193643 * History/WebBackForwardList.mm: (core): Return BackForwardListImpl. (kit): Take BackForwardListImpl. (-[WebBackForwardList initWithBackForwardList:]): Use BackForwardListImpl. (-[WebBackForwardList dealloc]): Ditto. (-[WebBackForwardList finalize]): Ditto. (-[WebBackForwardList description]): Ditto. (-[WebBackForwardList setPageCacheSize:]): Ditto. (-[WebBackForwardList pageCacheSize]): Ditto. * History/WebBackForwardListInternal.h: Ditto. * WebView/WebFrameView.mm: (-[WebFrameView keyDown:]): Ditto. * WebView/WebView.mm: (-[WebView initWithCoder:]): Ditto. (-[WebView encodeWithCoder:]): Ditto. (-[WebView backForwardList]): Ditto. (-[WebView setMaintainsBackForwardList:]): Ditto. 2010-10-26 Darin Adler <darin@apple.com> Reviewed by Sam Weinig. WebKitTestRunner needs to support layoutTestController.dumpBackForwardList https://bugs.webkit.org/show_bug.cgi?id=42322 rdar://problem/8193631 WebKitTestRunner needs to support layoutTestController.clearBackForwardList https://bugs.webkit.org/show_bug.cgi?id=42333 rdar://problem/8193643 * WebCore.exp.in: Updated exports. * history/BackForwardList.h: Added comments about future refactoring. Moved functions that are not called inside WebCore into a separate section, to be removed later. Added an isActive function to replace the use of enabled() and entries(). * history/BackForwardListImpl.h: Removed isBackForwardListImpl. Marked virtual function overrides virtual explicitly, except for the ones that will be non-virtual once we make the changes above. Added the isActive function. * history/PageCache.cpp: (WebCore::logCanCachePageDecision): Use isActive. (WebCore::PageCache::canCache): Ditto. * loader/FrameLoader.cpp: (WebCore::FrameLoader::checkDidPerformFirstNavigation): Check using currentItem, backItem, and forwardItem instead of using entries. * page/Settings.cpp: (WebCore::Settings::setUsesPageCache): Loop through the back/forward list entries using backListCount and forwardListCount instead of using entries. 2010-10-26 Darin Adler <darin@apple.com> Reviewed by Sam Weinig. WebKitTestRunner needs to support layoutTestController.dumpBackForwardList https://bugs.webkit.org/show_bug.cgi?id=42322 rdar://problem/8193631 WebKitTestRunner needs to support layoutTestController.clearBackForwardList https://bugs.webkit.org/show_bug.cgi?id=42333 rdar://problem/8193643 * platform/mac-wk2/Skipped: Resorted some test lists. Removed the section listing all the tests that were blocked by dumpBackForwardList. 2010-10-26 Darin Adler <darin@apple.com> Reviewed by Sam Weinig. WebKitTestRunner needs to support layoutTestController.dumpBackForwardList https://bugs.webkit.org/show_bug.cgi?id=42322 rdar://problem/8193631 WebKitTestRunner needs to support layoutTestController.clearBackForwardList https://bugs.webkit.org/show_bug.cgi?id=42333 rdar://problem/8193643 * WebKitTestRunner/Configurations/InjectedBundle.xcconfig: Renamed the product to WebKitTestRunnerInjectedBundle to avoid name conflicts in the build directory. * WebKitTestRunner/InjectedBundle/Bindings/LayoutTestController.idl: Added dumpBackForwardList and clearBackForwardList. * WebKitTestRunner/InjectedBundle/InjectedBundle.cpp: (WTR::InjectedBundle::InjectedBundle): Removed initialization of m_mainPage. (WTR::InjectedBundle::didCreatePage): Removed unneeded underscore. (WTR::InjectedBundle::willDestroyPage): Ditto. (WTR::InjectedBundle::didReceiveMessage): Ditto. (WTR::InjectedBundle::initialize): Ditto. (WTR::InjectedBundle::didCreatePage): Changed code to use m_pages instead of m_mainPage and m_otherPages. (WTR::InjectedBundle::willDestroyPage): Ditto. (WTR::InjectedBundle::page): Ditto. (WTR::InjectedBundle::beginTesting): Ditto. (WTR::InjectedBundle::done): Ditto. (WTR::InjectedBundle::closeOtherPages): Ditto. (WTR::InjectedBundle::dumpBackForwardListsForAllPages): Added. * WebKitTestRunner/InjectedBundle/InjectedBundle.h: Changed page function to longer be inline, and pageCount function to use m_pages. Added dumpBackForwardListsForAllPages, and removed some underscores. Replaced m_mainPage and m_otherPageas with m_pages. * WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp: (WTR::adoptWK): Added. (WTR::hasPrefix): Added. (WTR::InjectedBundlePage::reset): Added code to set up m_previousTestBackForwardListItem. (WTR::InjectedBundlePage::dump): Added code to call dumpBackForwardListsForAllPages. (WTR::compareByTargetName): Added. (WTR::dumpBackForwardListItem): Added. (WTR::InjectedBundlePage::dumpBackForwardList): Added. * WebKitTestRunner/InjectedBundle/InjectedBundlePage.h: Added dumpBackForwardList and m_previousTestBackForwardListItem. * WebKitTestRunner/InjectedBundle/LayoutTestController.cpp: (WTR::LayoutTestController::LayoutTestController): Initialize m_shouldDumpBackForwardListsForAllWindows to false. (WTR::LayoutTestController::clearBackForwardList): Added. * WebKitTestRunner/InjectedBundle/LayoutTestController.h: Added dumpBackForwardList, clearBackForwardList, shouldDumpBackForwardListsForAllWindows, and m_shouldDumpBackForwardListsForAllWindows. * WebKitTestRunner/TestController.cpp: (WTR::TestController::initialize): Set up didReceiveSynchronousMessageFromInjectedBundle. (WTR::TestController::didReceiveSynchronousMessageFromInjectedBundle): Added. * WebKitTestRunner/TestController.h: Ditto. * WebKitTestRunner/TestInvocation.cpp: (WTR::TestInvocation::didReceiveSynchronousMessageFromInjectedBundle): Added. * WebKitTestRunner/TestInvocation.h: Ditto. * WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj: Renamed bundle to WebKitTestRunnerInjectedBundle (see above). * WebKitTestRunner/mac/TestControllerMac.mm: (WTR::TestController::initializeInjectedBundlePath): Ditto. 2010-10-26 Darin Adler <darin@apple.com> Reviewed by Sam Weinig. WebKitTestRunner needs to support layoutTestController.dumpBackForwardList https://bugs.webkit.org/show_bug.cgi?id=42322 rdar://problem/8193631 WebKitTestRunner needs to support layoutTestController.clearBackForwardList https://bugs.webkit.org/show_bug.cgi?id=42333 rdar://problem/8193643 * Shared/API/c/WKBase.h: Added WKBundleBackForwardListRef and WKBundleBackForwardListItemRef. * Shared/API/c/WKURL.cpp: (WKURLCopyString): Added. * Shared/API/c/WKURL.h: Added WKURLCopyString. * Shared/API/c/cf/WKURLCF.h: Fixed incorrect argument name. * Shared/APIObject.h: Added TypeBundleBackForwardList and TypeBundleBackForwardListItem. * Shared/ImmutableArray.h: Marked destructor virtual explicitly. * Shared/ImmutableDictionary.h: Ditto. * UIProcess/WebBackForwardListItem.h: Ditto. * UIProcess/WebContext.h: Ditto. * UIProcess/WebFrameProxy.h: Ditto. * UIProcess/WebNavigationData.h: Ditto. * UIProcess/WebPageNamespace.h: Ditto. * UIProcess/WebPreferences.h: Ditto. * WebProcess/InjectedBundle/InjectedBundleScriptWorld.h: Ditto. * WebProcess/InjectedBundle/DOM/InjectedBundleNodeHandle.h: Ditto. * WebProcess/InjectedBundle/DOM/InjectedBundleRangeHandle.h: Ditto. * UIProcess/WebBackForwardList.cpp: Removed unneeded backListWithLimit and forwardListWithLimit functions. (WebKit::WebBackForwardList::clear): Added. * UIProcess/WebBackForwardList.h: Marked destructor virtual explicitly. Added clear, removed backListWithLimit and forwardListWithLimit functions. * UIProcess/WebPageProxy.cpp: Removed unneeded backForwardBackItem, backForwardCurrentItem, and backForwardForwardItem functions. (WebKit::WebPageProxy::backForwardClear): Added. * UIProcess/WebPageProxy.h: Ditto. * UIProcess/WebPageProxy.messages.in: Ditto. * WebKit2.pro: Added new files. * WebKit2.xcodeproj/project.pbxproj: Ditto. * win/WebKit2.vcproj: Ditto. * WebProcess/InjectedBundle/API/c/WKBundleAPICast.h: Added WKBundleBackForwardListRef and WKBundleBackForwardListItemRef. * WebProcess/InjectedBundle/API/c/WKBundleBackForwardList.cpp: Started with a copy of from WebKit2/UIProcess/API/C/WKBackForwardList.cpp. * WebProcess/InjectedBundle/API/c/WKBundleBackForwardList.h: Started with a copy of WebKit2/UIProcess/API/C/WKBackForwardList.h. * WebProcess/InjectedBundle/API/c/WKBundleBackForwardListItem.cpp: Started with a copy of WebKit2/UIProcess/API/C/WKBackForwardListItem.cpp. * WebProcess/InjectedBundle/API/c/WKBundleBackForwardListItem.h: Started with a copy of WebKit2/UIProcess/API/C/WKBackForwardListItem.h. * WebProcess/InjectedBundle/API/c/WKBundlePage.cpp: (WKBundlePageGetBackForwardList): Added. * WebProcess/InjectedBundle/API/c/WKBundlePage.h: Ditto. * WebProcess/InjectedBundle/InjectedBundleBackForwardList.cpp: Started with a copy of WebKit2/UIProcess/WebBackForwardList.cpp. * WebProcess/InjectedBundle/InjectedBundleBackForwardList.h: Started with a copy of WebKit2/UIProcess/WebBackForwardList.h. * WebProcess/InjectedBundle/InjectedBundleBackForwardListItem.cpp: Started with a copy of WebKit2/UIProcess/WebBackForwardListItem.cpp. * WebProcess/InjectedBundle/InjectedBundleBackForwardListItem.h: Started with a copy of WebKit2/UIProcess/WebBackForwardListItem.h. * WebProcess/WebPage/WebBackForwardListProxy.cpp: Removed many unneeded functions. (WebKit::WebBackForwardListProxy::WebBackForwardListProxy): Removed unneeded initialization of m_closed. (WebKit::WebBackForwardListProxy::addItem): Added a check for the case of a capacity of 0. (WebKit::WebBackForwardListProxy::goToItem): Added a check for when the proxy outlives its page. (WebKit::WebBackForwardListProxy::itemAtIndex): Ditto. (WebKit::WebBackForwardListProxy::backListCount): Ditto. (WebKit::WebBackForwardListProxy::forwardListCount): Ditto. (WebKit::WebBackForwardListProxy::close): Removed unneeded code setting m_closed. (WebKit::WebBackForwardListProxy::isActive): Added. (WebKit::WebBackForwardListProxy::clear): Added. * WebProcess/WebPage/WebBackForwardListProxy.h: Added clear, isActive, and detach functions. Removed many other unneeded function and data members. * WebProcess/WebPage/WebPage.cpp: (WebKit::WebPage::~WebPage): Added call to detach on the back/forward list. (WebKit::WebPage::backForwardList): Added. * WebProcess/WebPage/WebPage.h: Added backForwardList function and m_backForwardList data member. git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70723 268f45cc-cd09-0410-ab3c-d52691b4dbfc
3c320e40