Changeset 154558 in webkit

Timestamp:

Aug 24, 2013 7:28:06 PM (11 years ago)

Author:

Darin Adler

Message:

Frame::tree should return a reference instead of a pointer
​https://bugs.webkit.org/show_bug.cgi?id=120259

Reviewed by Andreas Kling.

Source/WebCore:

• page/Frame.h:

(WebCore::Frame::tree): Return a reference instead of a pointer.

• bindings/js/JSDOMWindowCustom.cpp:

(WebCore::childFrameGetter):
(WebCore::indexGetter):
(WebCore::JSDOMWindow::getOwnPropertySlot):
(WebCore::JSDOMWindow::getOwnPropertySlotByIndex):
(WebCore::JSDOMWindow::setLocation):

• bindings/js/PageScriptDebugServer.cpp:

(WebCore::PageScriptDebugServer::setJavaScriptPaused):

• dom/Document.cpp:

(WebCore::canAccessAncestor):
(WebCore::Document::adoptNode):
(WebCore::Document::canNavigate):
(WebCore::Document::findUnsafeParentScrollPropagationBoundary):
(WebCore::Document::notifySeamlessChildDocumentsOfStylesheetUpdate):
(WebCore::Document::openSearchDescriptionURL):
(WebCore::Document::setDesignMode):
(WebCore::Document::parentDocument):
(WebCore::Document::initSecurityContext):
(WebCore::Document::initContentSecurityPolicy):
(WebCore::Document::requestFullScreenForElement):
(WebCore::Document::webkitExitFullscreen):
(WebCore::Document::didRemoveTouchEventHandler):

• dom/TreeScope.cpp:

(WebCore::focusedFrameOwnerElement):

• editing/FrameSelection.cpp:

(WebCore::FrameSelection::selectFrameElementInParentIfFullySelected):

• history/CachedFrame.cpp:

(WebCore::CachedFrameBase::CachedFrameBase):
(WebCore::CachedFrameBase::restore):
(WebCore::CachedFrame::CachedFrame):

• history/CachedPage.cpp:

(WebCore::CachedPage::restore):

• history/PageCache.cpp:

(WebCore::logCanCacheFrameDecision):
(WebCore::PageCache::canCachePageContainingThisFrame):

• html/HTMLDocument.cpp:

(WebCore::HTMLDocument::hasFocus):

• html/HTMLPlugInImageElement.cpp:

(WebCore::HTMLPlugInImageElement::restartSimilarPlugIns):

• inspector/InspectorApplicationCacheAgent.cpp:

(WebCore::InspectorApplicationCacheAgent::getFramesWithManifests):

• inspector/InspectorCanvasAgent.cpp:

(WebCore::InspectorCanvasAgent::findFramesWithUninstrumentedCanvases):
(WebCore::InspectorCanvasAgent::frameNavigated):

• inspector/InspectorDOMAgent.cpp:

(WebCore::InspectorDOMAgent::documents):

• inspector/InspectorFileSystemAgent.cpp:

(WebCore::InspectorFileSystemAgent::assertScriptExecutionContextForOrigin):

• inspector/InspectorPageAgent.cpp:

(WebCore::InspectorPageAgent::getCookies):
(WebCore::InspectorPageAgent::deleteCookie):
(WebCore::InspectorPageAgent::searchInResources):
(WebCore::InspectorPageAgent::findFrameWithSecurityOrigin):
(WebCore::InspectorPageAgent::buildObjectForFrame):
(WebCore::InspectorPageAgent::buildObjectForFrameTree):

• inspector/PageRuntimeAgent.cpp:

(WebCore::PageRuntimeAgent::reportExecutionContextCreation):

• loader/DocumentLoader.cpp:

(WebCore::DocumentLoader::willSendRequest):
(WebCore::DocumentLoader::mainResource):

• loader/DocumentWriter.cpp:

(WebCore::DocumentWriter::createDecoderIfNeeded):

• loader/FrameLoader.cpp:

(WebCore::FrameLoader::submitForm):
(WebCore::FrameLoader::allChildrenAreComplete):
(WebCore::FrameLoader::allAncestorsAreComplete):
(WebCore::FrameLoader::loadURLIntoChildFrame):
(WebCore::FrameLoader::outgoingReferrer):
(WebCore::FrameLoader::updateFirstPartyForCookies):
(WebCore::FrameLoader::setFirstPartyForCookies):
(WebCore::FrameLoader::completed):
(WebCore::FrameLoader::started):
(WebCore::FrameLoader::loadURL):
(WebCore::FrameLoader::loadWithDocumentLoader):
(WebCore::FrameLoader::stopAllLoaders):
(WebCore::FrameLoader::commitProvisionalLoad):
(WebCore::FrameLoader::closeOldDataSources):
(WebCore::FrameLoader::prepareForCachedPageRestore):
(WebCore::FrameLoader::subframeIsLoading):
(WebCore::FrameLoader::subresourceCachePolicy):
(WebCore::FrameLoader::detachChildren):
(WebCore::FrameLoader::closeAndRemoveChild):
(WebCore::FrameLoader::checkLoadComplete):
(WebCore::FrameLoader::numPendingOrLoadingRequests):
(WebCore::FrameLoader::detachFromParent):
(WebCore::FrameLoader::shouldClose):
(WebCore::FrameLoader::handleBeforeUnloadEvent):
(WebCore::FrameLoader::continueLoadAfterNewWindowPolicy):
(WebCore::FrameLoader::shouldInterruptLoadForXFrameOptions):
(WebCore::FrameLoader::findFrameForNavigation):
(WebCore::FrameLoader::effectiveSandboxFlags):
(WebCore::createWindow):

• loader/HistoryController.cpp:

(WebCore::HistoryController::saveDocumentState):
(WebCore::HistoryController::saveDocumentAndScrollState):
(WebCore::HistoryController::restoreDocumentState):
(WebCore::HistoryController::goToItem):
(WebCore::HistoryController::updateForRedirectWithLockedBackForwardList):
(WebCore::HistoryController::recursiveUpdateForCommit):
(WebCore::HistoryController::recursiveUpdateForSameDocumentNavigation):
(WebCore::HistoryController::initializeItem):
(WebCore::HistoryController::createItemTree):
(WebCore::HistoryController::recursiveSetProvisionalItem):
(WebCore::HistoryController::recursiveGoToItem):
(WebCore::HistoryController::currentFramesMatchItem):

• loader/NavigationScheduler.cpp:

(WebCore::NavigationScheduler::mustLockBackForwardList):
(WebCore::NavigationScheduler::scheduleFormSubmission):

• loader/ProgressTracker.cpp:

(WebCore::ProgressTracker::progressStarted):
(WebCore::ProgressTracker::progressCompleted):
(WebCore::ProgressTracker::isMainLoadProgressing):

• loader/appcache/ApplicationCacheGroup.cpp:

(WebCore::ApplicationCacheGroup::selectCache):
(WebCore::ApplicationCacheGroup::selectCacheWithoutManifestURL):

• loader/archive/cf/LegacyWebArchive.cpp:

(WebCore::LegacyWebArchive::create):

• loader/cache/CachedResourceLoader.cpp:

(WebCore::CachedResourceLoader::checkInsecureContent):

• loader/icon/IconController.cpp:

(WebCore::IconController::urlsForTypes):
(WebCore::IconController::startLoader):

• page/Chrome.cpp:

(WebCore::canRunModalIfDuringPageDismissal):
(WebCore::Chrome::windowScreenDidChange):

• page/DOMWindow.cpp:

(WebCore::DOMWindow::length):
(WebCore::DOMWindow::name):
(WebCore::DOMWindow::setName):
(WebCore::DOMWindow::parent):
(WebCore::DOMWindow::top):
(WebCore::DOMWindow::open):

• page/EventHandler.cpp:

(WebCore::EventHandler::scrollRecursively):
(WebCore::EventHandler::logicalScrollRecursively):
(WebCore::EventHandler::handleMouseMoveEvent):

• page/FocusController.cpp:

(WebCore::FocusController::setContainingWindowIsVisible):

• page/Frame.cpp:

(WebCore::parentPageZoomFactor):
(WebCore::parentTextZoomFactor):
(WebCore::Frame::setPrinting):
(WebCore::Frame::shouldUsePrintingLayout):
(WebCore::Frame::dispatchVisibilityStateChangeEvent):
(WebCore::Frame::willDetachPage):
(WebCore::Frame::setPageAndTextZoomFactors):
(WebCore::Frame::deviceOrPageScaleFactorChanged):
(WebCore::Frame::notifyChromeClientWheelEventHandlerCountChanged):
(WebCore::Frame::isURLAllowed):

• page/FrameTree.cpp:

(WebCore::FrameTree::~FrameTree):
(WebCore::FrameTree::setName):
(WebCore::FrameTree::transferChild):
(WebCore::FrameTree::appendChild):
(WebCore::FrameTree::actuallyAppendChild):
(WebCore::FrameTree::removeChild):
(WebCore::FrameTree::uniqueChildName):
(WebCore::FrameTree::scopedChild):
(WebCore::FrameTree::scopedChildCount):
(WebCore::FrameTree::childCount):
(WebCore::FrameTree::child):
(WebCore::FrameTree::find):
(WebCore::FrameTree::isDescendantOf):
(WebCore::FrameTree::traverseNext):
(WebCore::FrameTree::traversePreviousWithWrap):
(WebCore::FrameTree::deepLastChild):
(WebCore::FrameTree::top):
(printFrames):
(showFrameTree):

• page/FrameView.cpp:

(WebCore::FrameView::setFrameRect):
(WebCore::FrameView::hasCompositedContentIncludingDescendants):
(WebCore::FrameView::hasCompositingAncestor):
(WebCore::FrameView::flushCompositingStateIncludingSubframes):
(WebCore::FrameView::updateCanBlitOnScrollRecursively):
(WebCore::FrameView::setIsOverlapped):
(WebCore::FrameView::shouldUseLoadTimeDeferredRepaintDelay):
(WebCore::FrameView::updateLayerFlushThrottlingInAllFrames):
(WebCore::FrameView::serviceScriptedAnimations):
(WebCore::FrameView::updateBackgroundRecursively):
(WebCore::FrameView::parentFrameView):
(WebCore::FrameView::paintContentsForSnapshot):
(WebCore::FrameView::setTracksRepaints):
(WebCore::FrameView::notifyWidgetsInAllFrames):

• page/Location.cpp:

(WebCore::Location::ancestorOrigins):

• page/Page.cpp:

(WebCore::networkStateChanged):
(WebCore::Page::~Page):
(WebCore::Page::renderTreeSize):
(WebCore::Page::updateStyleForAllPagesAfterGlobalChangeInEnvironment):
(WebCore::Page::setNeedsRecalcStyleInAllFrames):
(WebCore::Page::refreshPlugins):
(WebCore::Page::takeAnyMediaCanStartListener):
(WebCore::incrementFrame):
(WebCore::Page::setDefersLoading):
(WebCore::Page::setMediaVolume):
(WebCore::Page::setDeviceScaleFactor):
(WebCore::Page::setShouldSuppressScrollbarAnimations):
(WebCore::Page::didMoveOnscreen):
(WebCore::Page::willMoveOffscreen):
(WebCore::Page::setIsInWindow):
(WebCore::Page::suspendScriptedAnimations):
(WebCore::Page::resumeScriptedAnimations):
(WebCore::Page::userStyleSheetLocationChanged):
(WebCore::Page::allVisitedStateChanged):
(WebCore::Page::visitedStateChanged):
(WebCore::Page::setDebugger):
(WebCore::Page::setMemoryCacheClientCallsEnabled):
(WebCore::Page::setMinimumTimerInterval):
(WebCore::Page::setTimerAlignmentInterval):
(WebCore::Page::dnsPrefetchingStateChanged):
(WebCore::Page::collectPluginViews):
(WebCore::Page::storageBlockingStateChanged):
(WebCore::Page::privateBrowsingStateChanged):
(WebCore::Page::checkSubframeCountConsistency):
(WebCore::Page::suspendActiveDOMObjectsAndAnimations):
(WebCore::Page::resumeActiveDOMObjectsAndAnimations):
(WebCore::Page::captionPreferencesChanged):

• page/PageGroup.cpp:

(WebCore::PageGroup::invalidateInjectedStyleSheetCacheInAllFrames):

• page/PageGroupLoadDeferrer.cpp:

(WebCore::PageGroupLoadDeferrer::PageGroupLoadDeferrer):
(WebCore::PageGroupLoadDeferrer::~PageGroupLoadDeferrer):

• page/PageSerializer.cpp:

(WebCore::PageSerializer::serializeFrame):

• page/PageThrottler.cpp:

(WebCore::PageThrottler::throttlePage):
(WebCore::PageThrottler::unthrottlePage):

• page/Settings.cpp:

(WebCore::setImageLoadingSettings):
(WebCore::Settings::setTextAutosizingFontScaleFactor):

• page/SpatialNavigation.cpp:

(WebCore::rectToAbsoluteCoordinates):

• page/animation/AnimationController.cpp:

(WebCore::AnimationControllerPrivate::suspendAnimations):
(WebCore::AnimationControllerPrivate::resumeAnimations):

• page/mac/PageMac.cpp:

(WebCore::Page::addSchedulePair):
(WebCore::Page::removeSchedulePair):

• page/scrolling/ScrollingCoordinator.cpp:

(WebCore::ScrollingCoordinator::computeNonFastScrollableRegion):
(WebCore::ScrollingCoordinator::computeCurrentWheelEventHandlerCount):

• plugins/PluginView.cpp:

(WebCore::PluginView::performRequest):
(WebCore::PluginView::load):

• rendering/HitTestResult.cpp:

(WebCore::HitTestResult::targetFrame):

• rendering/RenderLayerCompositor.cpp:

(WebCore::RenderLayerCompositor::enclosingCompositorFlushingLayers):
(WebCore::RenderLayerCompositor::updateCompositingLayers):
(WebCore::RenderLayerCompositor::notifyIFramesOfCompositingChange):

• rendering/TextAutosizer.cpp:

(WebCore::TextAutosizer::processSubtree):

• storage/StorageEventDispatcher.cpp:

(WebCore::StorageEventDispatcher::dispatchSessionStorageEvents):
(WebCore::StorageEventDispatcher::dispatchLocalStorageEvents):

• svg/SVGSVGElement.cpp:

(WebCore::SVGSVGElement::currentScale):
(WebCore::SVGSVGElement::setCurrentScale):

• testing/Internals.cpp:

(WebCore::Internals::formControlStateOfPreviousHistoryItem):
(WebCore::Internals::setFormControlStateOfPreviousHistoryItem):
(WebCore::Internals::numberOfScrollableAreas):

• xml/parser/XMLDocumentParserLibxml2.cpp:

(WebCore::hasNoStyleInformation):
Use tree(). instead of tree()->.

Source/WebKit/blackberry:

• Api/WebPage.cpp:

(BlackBerry::WebKit::closeURLRecursively):
(BlackBerry::WebKit::enableCrossSiteXHRRecursively):
(BlackBerry::WebKit::WebPagePrivate::setScreenOrientation):

• WebCoreSupport/FrameLoaderClientBlackBerry.cpp:

(WebCore::FrameLoaderClientBlackBerry::createFrame):

• WebKitSupport/DOMSupport.cpp:

(BlackBerry::WebKit::DOMSupport::convertPointToFrame):
(BlackBerry::WebKit::DOMSupport::incrementFrame):
Use tree(). instead of tree()->.

Source/WebKit/efl:

• WebCoreSupport/DumpRenderTreeSupportEfl.cpp:

(DumpRenderTreeSupportEfl::clearFrameName):
(DumpRenderTreeSupportEfl::frameChildren):
(DumpRenderTreeSupportEfl::frameParent):

• ewk/ewk_frame.cpp:

(_ewk_frame_children_iterator_next):
(ewk_frame_child_find):
(ewk_frame_name_get):
(ewk_frame_child_add):

• ewk/ewk_view.cpp:

(ewk_view_frame_create):
Use tree(). instead of tree()->.

Source/WebKit/gtk:

• WebCoreSupport/DumpRenderTreeSupportGtk.cpp:

(DumpRenderTreeSupportGtk::getFrameChildren):
(DumpRenderTreeSupportGtk::clearMainFrameName):

• WebCoreSupport/FrameLoaderClientGtk.cpp:

(WebKit::FrameLoaderClient::createFrame):

• webkit/webkitwebframe.cpp:

(webkit_web_frame_get_name):
(webkit_web_frame_get_parent):
(webkit_web_frame_find_frame):

• webkit/webkitwebview.cpp:

(webkit_web_view_set_highlight_text_matches):
Use tree(). instead of tree()->.

Source/WebKit/mac:

• Plugins/Hosted/NetscapePluginInstanceProxy.mm:

(WebKit::NetscapePluginInstanceProxy::performRequest):

• Plugins/WebBaseNetscapePluginView.mm:

(-[WebBaseNetscapePluginView resolvedURLStringForURL:target:]):

• Plugins/WebNetscapePluginView.mm:

(-[WebNetscapePluginView loadPluginRequest:]):

• WebCoreSupport/WebFrameLoaderClient.mm:

(applyAppleDictionaryApplicationQuirkNonInlinePart):
(WebFrameLoaderClient::prepareForDataSourceReplacement):
(WebFrameLoaderClient::createFrame):

• WebView/WebFrame.mm:

(+[WebFrame _createFrameWithPage:frameName:frameView:ownerElement:]):
(-[WebFrame _updateBackgroundAndUpdatesWhileOffscreen]):
(-[WebFrame _unmarkAllBadGrammar]):
(-[WebFrame _unmarkAllMisspellings]):
(-[WebFrame _atMostOneFrameHasSelection]):
(-[WebFrame _findFrameWithSelection]):
(-[WebFrame _drawRect:contentsOnly:]):
(-[WebFrame _isDescendantOfFrame:]):
(-[WebFrame _recursive_resumeNullEventsForAllNetscapePlugins]):
(-[WebFrame _recursive_pauseNullEventsForAllNetscapePlugins]):
(-[WebFrame name]):
(-[WebFrame findFrameNamed:]):
(-[WebFrame parentFrame]):
(-[WebFrame childFrames]):

• WebView/WebView.mm:

(-[WebView _attachScriptDebuggerToAllFrames]):
(-[WebView _detachScriptDebuggerFromAllFrames]):
(-[WebView _clearMainFrameName]):
(-[WebView _isUsingAcceleratedCompositing]):
(-[WebView _isSoftwareRenderable]):
(-[WebView setHostWindow:]):
(incrementFrame):
Use tree(). instead of tree()->.

Source/WebKit/qt:

• WebCoreSupport/DumpRenderTreeSupportQt.cpp:

(DumpRenderTreeSupportQt::clearFrameName):

• WebCoreSupport/FrameLoaderClientQt.cpp:

(drtDescriptionSuitableForTestResult):
(WebCore::FrameLoaderClientQt::dispatchDidCommitLoad):
(WebCore::FrameLoaderClientQt::dispatchDidFinishDocumentLoad):
(WebCore::FrameLoaderClientQt::postProgressStartedNotification):
(WebCore::FrameLoaderClientQt::didPerformFirstNavigation):
(WebCore::FrameLoaderClientQt::createFrame):

• WebCoreSupport/QWebFrameAdapter.cpp:

(QWebFrameData::QWebFrameData):
(QWebFrameAdapter::load):
(QWebFrameAdapter::uniqueName):
(QWebFrameAdapter::childFrames):

• WebCoreSupport/QWebPageAdapter.cpp:

(QWebPageAdapter::findText):
Use tree(). instead of tree()->.

Source/WebKit/win:

• WebCoreSupport/WebFrameLoaderClient.cpp:

(WebFrameLoaderClient::createFrame):

• WebFrame.cpp:

(WebFrame::name):
(WebFrame::findFrameNamed):
(WebFrame::parentFrame):
(EnumChildFrames::EnumChildFrames):
(EnumChildFrames::Next):
(EnumChildFrames::Skip):
(EnumChildFrames::Reset):
(WebFrame::isDescendantOfFrame):
(WebFrame::unmarkAllMisspellings):
(WebFrame::unmarkAllBadGrammar):

• WebView.cpp:

(WebView::initWithFrame):
(incrementFrame):
(WebView::clearMainFrameName):
Use tree(). instead of tree()->.

Source/WebKit/wince:

• WebView.cpp:

(WebView::createFrame):
Use tree(). instead of tree()->.

Source/WebKit2:

• WebProcess/Plugins/PluginView.cpp:

(WebKit::PluginView::performJavaScriptURLRequest):

• WebProcess/Storage/StorageAreaMap.cpp:

(WebKit::StorageAreaMap::dispatchSessionStorageEvent):
(WebKit::StorageAreaMap::dispatchLocalStorageEvent):

• WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:

(WebKit::WebFrameLoaderClient::createFrame):

• WebProcess/WebCoreSupport/mac/WebContextMenuClientMac.mm:

(WebKit::WebContextMenuClient::searchWithSpotlight):

• WebProcess/WebPage/FindController.cpp:

(WebKit::frameWithSelection):
(WebKit::FindController::rectsForTextMatches):

• WebProcess/WebPage/WebFrame.cpp:

(WebKit::WebFrame::init):
(WebKit::WebFrame::contentsAsString):
(WebKit::WebFrame::name):
(WebKit::WebFrame::childFrames):

• WebProcess/WebPage/WebPage.cpp:

(WebKit::WebPage::clearMainFrameName):
(WebKit::WebPage::setDrawsBackground):
(WebKit::WebPage::setDrawsTransparentBackground):
(WebKit::WebPage::setWindowResizerSize):
(WebKit::frameWithSelection):
(WebKit::WebPage::unmarkAllMisspellings):
(WebKit::WebPage::unmarkAllBadGrammar):
(WebKit::pageContainsAnyHorizontalScrollbars):

• WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm:

(WebKit::TiledCoreAnimationDrawingArea::forceRepaint):
Use tree(). instead of tree()->.

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/bindings/js/JSDOMWindowCustom.cpp (modified) (6 diffs)
• WebCore/bindings/js/PageScriptDebugServer.cpp (modified) (1 diff)
• WebCore/dom/Document.cpp (modified) (15 diffs)
• WebCore/dom/TreeScope.cpp (modified) (1 diff)
• WebCore/editing/FrameSelection.cpp (modified) (1 diff)
• WebCore/history/CachedFrame.cpp (modified) (4 diffs)
• WebCore/history/CachedPage.cpp (modified) (1 diff)
• WebCore/history/PageCache.cpp (modified) (2 diffs)
• WebCore/html/HTMLDocument.cpp (modified) (1 diff)
• WebCore/html/HTMLPlugInImageElement.cpp (modified) (1 diff)
• WebCore/inspector/InspectorApplicationCacheAgent.cpp (modified) (1 diff)
• WebCore/inspector/InspectorCanvasAgent.cpp (modified) (2 diffs)
• WebCore/inspector/InspectorDOMAgent.cpp (modified) (1 diff)
• WebCore/inspector/InspectorFileSystemAgent.cpp (modified) (1 diff)
• WebCore/inspector/InspectorPageAgent.cpp (modified) (6 diffs)
• WebCore/inspector/PageRuntimeAgent.cpp (modified) (1 diff)
• WebCore/loader/DocumentLoader.cpp (modified) (2 diffs)
• WebCore/loader/DocumentWriter.cpp (modified) (1 diff)
• WebCore/loader/FrameLoader.cpp (modified) (37 diffs)
• WebCore/loader/HistoryController.cpp (modified) (13 diffs)
• WebCore/loader/NavigationScheduler.cpp (modified) (2 diffs)
• WebCore/loader/ProgressTracker.cpp (modified) (3 diffs)
• WebCore/loader/appcache/ApplicationCacheGroup.cpp (modified) (2 diffs)
• WebCore/loader/archive/cf/LegacyWebArchive.cpp (modified) (4 diffs)
• WebCore/loader/cache/CachedResourceLoader.cpp (modified) (1 diff)
• WebCore/loader/icon/IconController.cpp (modified) (2 diffs)
• WebCore/page/Chrome.cpp (modified) (2 diffs)
• WebCore/page/DOMWindow.cpp (modified) (7 diffs)
• WebCore/page/EventHandler.cpp (modified) (3 diffs)
• WebCore/page/FocusController.cpp (modified) (1 diff)
• WebCore/page/Frame.cpp (modified) (10 diffs)
• WebCore/page/Frame.h (modified) (2 diffs)
• WebCore/page/FrameTree.cpp (modified) (26 diffs)
• WebCore/page/FrameView.cpp (modified) (17 diffs)
• WebCore/page/Location.cpp (modified) (1 diff)
• WebCore/page/Page.cpp (modified) (32 diffs)
• WebCore/page/PageGroup.cpp (modified) (1 diff)
• WebCore/page/PageGroupLoadDeferrer.cpp (modified) (2 diffs)
• WebCore/page/PageSerializer.cpp (modified) (1 diff)
• WebCore/page/PageThrottler.cpp (modified) (2 diffs)
• WebCore/page/Settings.cpp (modified) (2 diffs)
• WebCore/page/SpatialNavigation.cpp (modified) (1 diff)
• WebCore/page/animation/AnimationController.cpp (modified) (2 diffs)
• WebCore/page/mac/PageMac.cpp (modified) (2 diffs)
• WebCore/page/scrolling/ScrollingCoordinator.cpp (modified) (2 diffs)
• WebCore/plugins/PluginView.cpp (modified) (3 diffs)
• WebCore/rendering/HitTestResult.cpp (modified) (1 diff)
• WebCore/rendering/RenderLayerCompositor.cpp (modified) (3 diffs)
• WebCore/rendering/TextAutosizer.cpp (modified) (1 diff)
• WebCore/storage/StorageEventDispatcher.cpp (modified) (2 diffs)
• WebCore/svg/SVGSVGElement.cpp (modified) (2 diffs)
• WebCore/testing/Internals.cpp (modified) (3 diffs)
• WebCore/xml/parser/XMLDocumentParserLibxml2.cpp (modified) (1 diff)
• WebKit/blackberry/Api/WebPage.cpp (modified) (3 diffs)
• WebKit/blackberry/ChangeLog (modified) (1 diff)
• WebKit/blackberry/WebCoreSupport/FrameLoaderClientBlackBerry.cpp (modified) (1 diff)
• WebKit/blackberry/WebKitSupport/DOMSupport.cpp (modified) (2 diffs)
• WebKit/efl/ChangeLog (modified) (1 diff)
• WebKit/efl/WebCoreSupport/DumpRenderTreeSupportEfl.cpp (modified) (3 diffs)
• WebKit/efl/ewk/ewk_frame.cpp (modified) (5 diffs)
• WebKit/efl/ewk/ewk_view.cpp (modified) (1 diff)
• WebKit/gtk/ChangeLog (modified) (1 diff)
• WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp (modified) (2 diffs)
• WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp (modified) (2 diffs)
• WebKit/gtk/webkit/webkitwebframe.cpp (modified) (3 diffs)
• WebKit/gtk/webkit/webkitwebview.cpp (modified) (1 diff)
• WebKit/mac/ChangeLog (modified) (1 diff)
• WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.mm (modified) (1 diff)
• WebKit/mac/Plugins/WebBaseNetscapePluginView.mm (modified) (1 diff)
• WebKit/mac/Plugins/WebNetscapePluginView.mm (modified) (1 diff)
• WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm (modified) (3 diffs)
• WebKit/mac/WebView/WebFrame.mm (modified) (14 diffs)
• WebKit/mac/WebView/WebView.mm (modified) (8 diffs)
• WebKit/qt/ChangeLog (modified) (1 diff)
• WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp (modified) (1 diff)
• WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp (modified) (6 diffs)
• WebKit/qt/WebCoreSupport/QWebFrameAdapter.cpp (modified) (5 diffs)
• WebKit/qt/WebCoreSupport/QWebPageAdapter.cpp (modified) (1 diff)
• WebKit/win/ChangeLog (modified) (1 diff)
• WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp (modified) (2 diffs)
• WebKit/win/WebFrame.cpp (modified) (10 diffs)
• WebKit/win/WebView.cpp (modified) (3 diffs)
• WebKit/wince/ChangeLog (modified) (1 diff)
• WebKit/wince/WebView.cpp (modified) (2 diffs)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/WebProcess/Plugins/PluginView.cpp (modified) (1 diff)
• WebKit2/WebProcess/Storage/StorageAreaMap.cpp (modified) (2 diffs)
• WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp (modified) (1 diff)
• WebKit2/WebProcess/WebCoreSupport/mac/WebContextMenuClientMac.mm (modified) (1 diff)
• WebKit2/WebProcess/WebPage/FindController.cpp (modified) (2 diffs)
• WebKit2/WebProcess/WebPage/WebFrame.cpp (modified) (5 diffs)
• WebKit2/WebProcess/WebPage/WebPage.cpp (modified) (8 diffs)
• WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-08-24  Darin Adler  <darin@apple.com>
+
+        Frame::tree should return a reference instead of a pointer
+        https://bugs.webkit.org/show_bug.cgi?id=120259
+
+        Reviewed by Andreas Kling.
+
+        * page/Frame.h:
+        (WebCore::Frame::tree): Return a reference instead of a pointer.
+
+        * bindings/js/JSDOMWindowCustom.cpp:
+        (WebCore::childFrameGetter):
+        (WebCore::indexGetter):
+        (WebCore::JSDOMWindow::getOwnPropertySlot):
+        (WebCore::JSDOMWindow::getOwnPropertySlotByIndex):
+        (WebCore::JSDOMWindow::setLocation):
+        * bindings/js/PageScriptDebugServer.cpp:
+        (WebCore::PageScriptDebugServer::setJavaScriptPaused):
+        * dom/Document.cpp:
+        (WebCore::canAccessAncestor):
+        (WebCore::Document::adoptNode):
+        (WebCore::Document::canNavigate):
+        (WebCore::Document::findUnsafeParentScrollPropagationBoundary):
+        (WebCore::Document::notifySeamlessChildDocumentsOfStylesheetUpdate):
+        (WebCore::Document::openSearchDescriptionURL):
+        (WebCore::Document::setDesignMode):
+        (WebCore::Document::parentDocument):
+        (WebCore::Document::initSecurityContext):
+        (WebCore::Document::initContentSecurityPolicy):
+        (WebCore::Document::requestFullScreenForElement):
+        (WebCore::Document::webkitExitFullscreen):
+        (WebCore::Document::didRemoveTouchEventHandler):
+        * dom/TreeScope.cpp:
+        (WebCore::focusedFrameOwnerElement):
+        * editing/FrameSelection.cpp:
+        (WebCore::FrameSelection::selectFrameElementInParentIfFullySelected):
+        * history/CachedFrame.cpp:
+        (WebCore::CachedFrameBase::CachedFrameBase):
+        (WebCore::CachedFrameBase::restore):
+        (WebCore::CachedFrame::CachedFrame):
+        * history/CachedPage.cpp:
+        (WebCore::CachedPage::restore):
+        * history/PageCache.cpp:
+        (WebCore::logCanCacheFrameDecision):
+        (WebCore::PageCache::canCachePageContainingThisFrame):
+        * html/HTMLDocument.cpp:
+        (WebCore::HTMLDocument::hasFocus):
+        * html/HTMLPlugInImageElement.cpp:
+        (WebCore::HTMLPlugInImageElement::restartSimilarPlugIns):
+        * inspector/InspectorApplicationCacheAgent.cpp:
+        (WebCore::InspectorApplicationCacheAgent::getFramesWithManifests):
+        * inspector/InspectorCanvasAgent.cpp:
+        (WebCore::InspectorCanvasAgent::findFramesWithUninstrumentedCanvases):
+        (WebCore::InspectorCanvasAgent::frameNavigated):
+        * inspector/InspectorDOMAgent.cpp:
+        (WebCore::InspectorDOMAgent::documents):
+        * inspector/InspectorFileSystemAgent.cpp:
+        (WebCore::InspectorFileSystemAgent::assertScriptExecutionContextForOrigin):
+        * inspector/InspectorPageAgent.cpp:
+        (WebCore::InspectorPageAgent::getCookies):
+        (WebCore::InspectorPageAgent::deleteCookie):
+        (WebCore::InspectorPageAgent::searchInResources):
+        (WebCore::InspectorPageAgent::findFrameWithSecurityOrigin):
+        (WebCore::InspectorPageAgent::buildObjectForFrame):
+        (WebCore::InspectorPageAgent::buildObjectForFrameTree):
+        * inspector/PageRuntimeAgent.cpp:
+        (WebCore::PageRuntimeAgent::reportExecutionContextCreation):
+        * loader/DocumentLoader.cpp:
+        (WebCore::DocumentLoader::willSendRequest):
+        (WebCore::DocumentLoader::mainResource):
+        * loader/DocumentWriter.cpp:
+        (WebCore::DocumentWriter::createDecoderIfNeeded):
+        * loader/FrameLoader.cpp:
+        (WebCore::FrameLoader::submitForm):
+        (WebCore::FrameLoader::allChildrenAreComplete):
+        (WebCore::FrameLoader::allAncestorsAreComplete):
+        (WebCore::FrameLoader::loadURLIntoChildFrame):
+        (WebCore::FrameLoader::outgoingReferrer):
+        (WebCore::FrameLoader::updateFirstPartyForCookies):
+        (WebCore::FrameLoader::setFirstPartyForCookies):
+        (WebCore::FrameLoader::completed):
+        (WebCore::FrameLoader::started):
+        (WebCore::FrameLoader::loadURL):
+        (WebCore::FrameLoader::loadWithDocumentLoader):
+        (WebCore::FrameLoader::stopAllLoaders):
+        (WebCore::FrameLoader::commitProvisionalLoad):
+        (WebCore::FrameLoader::closeOldDataSources):
+        (WebCore::FrameLoader::prepareForCachedPageRestore):
+        (WebCore::FrameLoader::subframeIsLoading):
+        (WebCore::FrameLoader::subresourceCachePolicy):
+        (WebCore::FrameLoader::detachChildren):
+        (WebCore::FrameLoader::closeAndRemoveChild):
+        (WebCore::FrameLoader::checkLoadComplete):
+        (WebCore::FrameLoader::numPendingOrLoadingRequests):
+        (WebCore::FrameLoader::detachFromParent):
+        (WebCore::FrameLoader::shouldClose):
+        (WebCore::FrameLoader::handleBeforeUnloadEvent):
+        (WebCore::FrameLoader::continueLoadAfterNewWindowPolicy):
+        (WebCore::FrameLoader::shouldInterruptLoadForXFrameOptions):
+        (WebCore::FrameLoader::findFrameForNavigation):
+        (WebCore::FrameLoader::effectiveSandboxFlags):
+        (WebCore::createWindow):
+        * loader/HistoryController.cpp:
+        (WebCore::HistoryController::saveDocumentState):
+        (WebCore::HistoryController::saveDocumentAndScrollState):
+        (WebCore::HistoryController::restoreDocumentState):
+        (WebCore::HistoryController::goToItem):
+        (WebCore::HistoryController::updateForRedirectWithLockedBackForwardList):
+        (WebCore::HistoryController::recursiveUpdateForCommit):
+        (WebCore::HistoryController::recursiveUpdateForSameDocumentNavigation):
+        (WebCore::HistoryController::initializeItem):
+        (WebCore::HistoryController::createItemTree):
+        (WebCore::HistoryController::recursiveSetProvisionalItem):
+        (WebCore::HistoryController::recursiveGoToItem):
+        (WebCore::HistoryController::currentFramesMatchItem):
+        * loader/NavigationScheduler.cpp:
+        (WebCore::NavigationScheduler::mustLockBackForwardList):
+        (WebCore::NavigationScheduler::scheduleFormSubmission):
+        * loader/ProgressTracker.cpp:
+        (WebCore::ProgressTracker::progressStarted):
+        (WebCore::ProgressTracker::progressCompleted):
+        (WebCore::ProgressTracker::isMainLoadProgressing):
+        * loader/appcache/ApplicationCacheGroup.cpp:
+        (WebCore::ApplicationCacheGroup::selectCache):
+        (WebCore::ApplicationCacheGroup::selectCacheWithoutManifestURL):
+        * loader/archive/cf/LegacyWebArchive.cpp:
+        (WebCore::LegacyWebArchive::create):
+        * loader/cache/CachedResourceLoader.cpp:
+        (WebCore::CachedResourceLoader::checkInsecureContent):
+        * loader/icon/IconController.cpp:
+        (WebCore::IconController::urlsForTypes):
+        (WebCore::IconController::startLoader):
+        * page/Chrome.cpp:
+        (WebCore::canRunModalIfDuringPageDismissal):
+        (WebCore::Chrome::windowScreenDidChange):
+        * page/DOMWindow.cpp:
+        (WebCore::DOMWindow::length):
+        (WebCore::DOMWindow::name):
+        (WebCore::DOMWindow::setName):
+        (WebCore::DOMWindow::parent):
+        (WebCore::DOMWindow::top):
+        (WebCore::DOMWindow::open):
+        * page/EventHandler.cpp:
+        (WebCore::EventHandler::scrollRecursively):
+        (WebCore::EventHandler::logicalScrollRecursively):
+        (WebCore::EventHandler::handleMouseMoveEvent):
+        * page/FocusController.cpp:
+        (WebCore::FocusController::setContainingWindowIsVisible):
+        * page/Frame.cpp:
+        (WebCore::parentPageZoomFactor):
+        (WebCore::parentTextZoomFactor):
+        (WebCore::Frame::setPrinting):
+        (WebCore::Frame::shouldUsePrintingLayout):
+        (WebCore::Frame::dispatchVisibilityStateChangeEvent):
+        (WebCore::Frame::willDetachPage):
+        (WebCore::Frame::setPageAndTextZoomFactors):
+        (WebCore::Frame::deviceOrPageScaleFactorChanged):
+        (WebCore::Frame::notifyChromeClientWheelEventHandlerCountChanged):
+        (WebCore::Frame::isURLAllowed):
+        * page/FrameTree.cpp:
+        (WebCore::FrameTree::~FrameTree):
+        (WebCore::FrameTree::setName):
+        (WebCore::FrameTree::transferChild):
+        (WebCore::FrameTree::appendChild):
+        (WebCore::FrameTree::actuallyAppendChild):
+        (WebCore::FrameTree::removeChild):
+        (WebCore::FrameTree::uniqueChildName):
+        (WebCore::FrameTree::scopedChild):
+        (WebCore::FrameTree::scopedChildCount):
+        (WebCore::FrameTree::childCount):
+        (WebCore::FrameTree::child):
+        (WebCore::FrameTree::find):
+        (WebCore::FrameTree::isDescendantOf):
+        (WebCore::FrameTree::traverseNext):
+        (WebCore::FrameTree::traversePreviousWithWrap):
+        (WebCore::FrameTree::deepLastChild):
+        (WebCore::FrameTree::top):
+        (printFrames):
+        (showFrameTree):
+        * page/FrameView.cpp:
+        (WebCore::FrameView::setFrameRect):
+        (WebCore::FrameView::hasCompositedContentIncludingDescendants):
+        (WebCore::FrameView::hasCompositingAncestor):
+        (WebCore::FrameView::flushCompositingStateIncludingSubframes):
+        (WebCore::FrameView::updateCanBlitOnScrollRecursively):
+        (WebCore::FrameView::setIsOverlapped):
+        (WebCore::FrameView::shouldUseLoadTimeDeferredRepaintDelay):
+        (WebCore::FrameView::updateLayerFlushThrottlingInAllFrames):
+        (WebCore::FrameView::serviceScriptedAnimations):
+        (WebCore::FrameView::updateBackgroundRecursively):
+        (WebCore::FrameView::parentFrameView):
+        (WebCore::FrameView::paintContentsForSnapshot):
+        (WebCore::FrameView::setTracksRepaints):
+        (WebCore::FrameView::notifyWidgetsInAllFrames):
+        * page/Location.cpp:
+        (WebCore::Location::ancestorOrigins):
+        * page/Page.cpp:
+        (WebCore::networkStateChanged):
+        (WebCore::Page::~Page):
+        (WebCore::Page::renderTreeSize):
+        (WebCore::Page::updateStyleForAllPagesAfterGlobalChangeInEnvironment):
+        (WebCore::Page::setNeedsRecalcStyleInAllFrames):
+        (WebCore::Page::refreshPlugins):
+        (WebCore::Page::takeAnyMediaCanStartListener):
+        (WebCore::incrementFrame):
+        (WebCore::Page::setDefersLoading):
+        (WebCore::Page::setMediaVolume):
+        (WebCore::Page::setDeviceScaleFactor):
+        (WebCore::Page::setShouldSuppressScrollbarAnimations):
+        (WebCore::Page::didMoveOnscreen):
+        (WebCore::Page::willMoveOffscreen):
+        (WebCore::Page::setIsInWindow):
+        (WebCore::Page::suspendScriptedAnimations):
+        (WebCore::Page::resumeScriptedAnimations):
+        (WebCore::Page::userStyleSheetLocationChanged):
+        (WebCore::Page::allVisitedStateChanged):
+        (WebCore::Page::visitedStateChanged):
+        (WebCore::Page::setDebugger):
+        (WebCore::Page::setMemoryCacheClientCallsEnabled):
+        (WebCore::Page::setMinimumTimerInterval):
+        (WebCore::Page::setTimerAlignmentInterval):
+        (WebCore::Page::dnsPrefetchingStateChanged):
+        (WebCore::Page::collectPluginViews):
+        (WebCore::Page::storageBlockingStateChanged):
+        (WebCore::Page::privateBrowsingStateChanged):
+        (WebCore::Page::checkSubframeCountConsistency):
+        (WebCore::Page::suspendActiveDOMObjectsAndAnimations):
+        (WebCore::Page::resumeActiveDOMObjectsAndAnimations):
+        (WebCore::Page::captionPreferencesChanged):
+        * page/PageGroup.cpp:
+        (WebCore::PageGroup::invalidateInjectedStyleSheetCacheInAllFrames):
+        * page/PageGroupLoadDeferrer.cpp:
+        (WebCore::PageGroupLoadDeferrer::PageGroupLoadDeferrer):
+        (WebCore::PageGroupLoadDeferrer::~PageGroupLoadDeferrer):
+        * page/PageSerializer.cpp:
+        (WebCore::PageSerializer::serializeFrame):
+        * page/PageThrottler.cpp:
+        (WebCore::PageThrottler::throttlePage):
+        (WebCore::PageThrottler::unthrottlePage):
+        * page/Settings.cpp:
+        (WebCore::setImageLoadingSettings):
+        (WebCore::Settings::setTextAutosizingFontScaleFactor):
+        * page/SpatialNavigation.cpp:
+        (WebCore::rectToAbsoluteCoordinates):
+        * page/animation/AnimationController.cpp:
+        (WebCore::AnimationControllerPrivate::suspendAnimations):
+        (WebCore::AnimationControllerPrivate::resumeAnimations):
+        * page/mac/PageMac.cpp:
+        (WebCore::Page::addSchedulePair):
+        (WebCore::Page::removeSchedulePair):
+        * page/scrolling/ScrollingCoordinator.cpp:
+        (WebCore::ScrollingCoordinator::computeNonFastScrollableRegion):
+        (WebCore::ScrollingCoordinator::computeCurrentWheelEventHandlerCount):
+        * plugins/PluginView.cpp:
+        (WebCore::PluginView::performRequest):
+        (WebCore::PluginView::load):
+        * rendering/HitTestResult.cpp:
+        (WebCore::HitTestResult::targetFrame):
+        * rendering/RenderLayerCompositor.cpp:
+        (WebCore::RenderLayerCompositor::enclosingCompositorFlushingLayers):
+        (WebCore::RenderLayerCompositor::updateCompositingLayers):
+        (WebCore::RenderLayerCompositor::notifyIFramesOfCompositingChange):
+        * rendering/TextAutosizer.cpp:
+        (WebCore::TextAutosizer::processSubtree):
+        * storage/StorageEventDispatcher.cpp:
+        (WebCore::StorageEventDispatcher::dispatchSessionStorageEvents):
+        (WebCore::StorageEventDispatcher::dispatchLocalStorageEvents):
+        * svg/SVGSVGElement.cpp:
+        (WebCore::SVGSVGElement::currentScale):
+        (WebCore::SVGSVGElement::setCurrentScale):
+        * testing/Internals.cpp:
+        (WebCore::Internals::formControlStateOfPreviousHistoryItem):
+        (WebCore::Internals::setFormControlStateOfPreviousHistoryItem):
+        (WebCore::Internals::numberOfScrollableAreas):
+        * xml/parser/XMLDocumentParserLibxml2.cpp:
+        (WebCore::hasNoStyleInformation):
+        Use tree(). instead of tree()->.
+
 2013-08-24  Andreas Kling  <akling@apple.com>
 

trunk/Source/WebCore/bindings/js/JSDOMWindowCustom.cpp

@@ -79 +79 @@
 static JSValue childFrameGetter(ExecState* exec, JSValue slotBase, PropertyName propertyName)
 {
-    return toJS(exec, jsCast<JSDOMWindow*>(asObject(slotBase))->impl()->frame()->tree()->scopedChild(propertyNameToAtomicString(propertyName))->document()->domWindow());
+    return toJS(exec, jsCast<JSDOMWindow*>(asObject(slotBase))->impl()->frame()->tree().scopedChild(propertyNameToAtomicString(propertyName))->document()->domWindow());
 }
 
 static JSValue indexGetter(ExecState* exec, JSValue slotBase, unsigned index)
 {
-    return toJS(exec, jsCast<JSDOMWindow*>(asObject(slotBase))->impl()->frame()->tree()->scopedChild(index)->document()->domWindow());
+    return toJS(exec, jsCast<JSDOMWindow*>(asObject(slotBase))->impl()->frame()->tree().scopedChild(index)->document()->domWindow());
 }
 
@@ -208 +208 @@
     // are in Moz but not IE. Since we have some of these, we have to do
     // it the Moz way.
-    if (thisObject->impl()->frame()->tree()->scopedChild(propertyNameToAtomicString(propertyName))) {
+    if (thisObject->impl()->frame()->tree().scopedChild(propertyNameToAtomicString(propertyName))) {
         slot.setCustom(thisObject, ReadOnly | DontDelete | DontEnum, childFrameGetter);
         return true;
@@ -231 +231 @@
     // allow window[1] or parent[1] etc. (#56983)
     unsigned i = propertyName.asIndex();
-    if (i < thisObject->impl()->frame()->tree()->scopedChildCount()) {
+    if (i < thisObject->impl()->frame()->tree().scopedChildCount()) {
         ASSERT(i != PropertyName::NotAnIndex);
         slot.setCustomIndex(thisObject, ReadOnly | DontDelete | DontEnum, i, indexGetter);
@@ -285 +285 @@
     // are in Moz but not IE. Since we have some of these, we have to do
     // it the Moz way.
-    if (thisObject->impl()->frame()->tree()->scopedChild(propertyNameToAtomicString(propertyName))) {
+    if (thisObject->impl()->frame()->tree().scopedChild(propertyNameToAtomicString(propertyName))) {
         slot.setCustom(thisObject, ReadOnly | DontDelete | DontEnum, childFrameGetter);
         return true;
@@ -307 +307 @@
 
     // allow window[1] or parent[1] etc. (#56983)
-    if (index < thisObject->impl()->frame()->tree()->scopedChildCount()) {
+    if (index < thisObject->impl()->frame()->tree().scopedChildCount()) {
         ASSERT(index != PropertyName::NotAnIndex);
         slot.setCustomIndex(thisObject, ReadOnly | DontDelete | DontEnum, index, indexGetter);
@@ -429 +429 @@
     // a property named "location" instead of performing a navigation (<rdar://problem/5688039>).
     if (Frame* activeFrame = activeDOMWindow(exec)->frame()) {
-        if (activeFrame->settings().usesDashboardBackwardCompatibilityMode() && !activeFrame->tree()->parent()) {
+        if (activeFrame->settings().usesDashboardBackwardCompatibilityMode() && !activeFrame->tree().parent()) {
             if (BindingSecurity::shouldAllowAccessToDOMWindow(exec, impl()))
                 putDirect(exec->vm(), Identifier(exec, "location"), value);

trunk/Source/WebCore/bindings/js/PageScriptDebugServer.cpp

@@ -190 +190 @@
     page->setDefersLoading(paused);
 
-    for (Frame* frame = page->mainFrame(); frame; frame = frame->tree()->traverseNext())
+    for (Frame* frame = page->mainFrame(); frame; frame = frame->tree().traverseNext())
         setJavaScriptPaused(frame, paused);
 }

trunk/Source/WebCore/dom/Document.cpp

@@ -353 +353 @@
 
     const bool isLocalActiveOrigin = activeSecurityOrigin->isLocal();
-    for (Frame* ancestorFrame = targetFrame; ancestorFrame; ancestorFrame = ancestorFrame->tree()->parent()) {
+    for (Frame* ancestorFrame = targetFrame; ancestorFrame; ancestorFrame = ancestorFrame->tree().parent()) {
         Document* ancestorDocument = ancestorFrame->document();
         // FIXME: Should be an ASSERT? Frames should alway have documents.
@@ -1039 +1039 @@
         if (source->isFrameOwnerElement()) {
             HTMLFrameOwnerElement* frameOwnerElement = toFrameOwnerElement(source.get());
-            if (frame() && frame()->tree()->isDescendantOf(frameOwnerElement->contentFrame())) {
+            if (frame() && frame()->tree().isDescendantOf(frameOwnerElement->contentFrame())) {
                 ec = HIERARCHY_REQUEST_ERR;
                 return 0;
@@ -2675 +2675 @@
 
     // Frame-busting is generally allowed, but blocked for sandboxed frames lacking the 'allow-top-navigation' flag.
-    if (!isSandboxed(SandboxTopNavigation) && targetFrame == m_frame->tree()->top())
+    if (!isSandboxed(SandboxTopNavigation) && targetFrame == m_frame->tree().top())
         return true;
 
     if (isSandboxed(SandboxNavigation)) {
-        if (targetFrame->tree()->isDescendantOf(m_frame))
+        if (targetFrame->tree().isDescendantOf(m_frame))
             return true;
 
         const char* reason = "The frame attempting navigation is sandboxed, and is therefore disallowed from navigating its ancestors.";
-        if (isSandboxed(SandboxTopNavigation) && targetFrame == m_frame->tree()->top())
+        if (isSandboxed(SandboxTopNavigation) && targetFrame == m_frame->tree().top())
             reason = "The frame attempting navigation of the top-level window is sandboxed, but the 'allow-top-navigation' flag is not set.";
 
@@ -2711 +2711 @@
     // and/or "parent" relation). Requiring some sort of relation prevents a
     // document from navigating arbitrary, unrelated top-level frames.
-    if (!targetFrame->tree()->parent()) {
+    if (!targetFrame->tree().parent()) {
         if (targetFrame == m_frame->loader().opener())
             return true;
@@ -2729 +2729 @@
         return 0;
 
-    Frame* ancestorFrame = currentFrame->tree()->parent();
+    Frame* ancestorFrame = currentFrame->tree().parent();
 
     while (ancestorFrame) {
@@ -2735 +2735 @@
             return currentFrame;
         currentFrame = ancestorFrame;
-        ancestorFrame = ancestorFrame->tree()->parent();
+        ancestorFrame = ancestorFrame->tree().parent();
     }
     return 0;
@@ -3172 +3172 @@
 
     // Seamless child frames are expected to notify their seamless children recursively, so we only do direct children.
-    for (Frame* child = frame()->tree()->firstChild(); child; child = child->tree()->nextSibling()) {
+    for (Frame* child = frame()->tree().firstChild(); child; child = child->tree().nextSibling()) {
         Document* childDocument = child->document();
         if (childDocument->shouldDisplaySeamlesslyWithParent()) {
@@ -4148 +4148 @@
 
     // FIXME: Why do only top-level frames have openSearchDescriptionURLs?
-    if (!frame() || frame()->tree()->parent())
+    if (!frame() || frame()->tree().parent())
         return KURL();
 
@@ -4212 +4212 @@
 {
     m_designMode = value;
-    for (Frame* frame = m_frame; frame && frame->document(); frame = frame->tree()->traverseNext(m_frame))
+    for (Frame* frame = m_frame; frame && frame->document(); frame = frame->tree().traverseNext(m_frame))
         frame->document()->scheduleForcedStyleRecalc();
 }
@@ -4234 +4234 @@
     if (!m_frame)
         return 0;
-    Frame* parent = m_frame->tree()->parent();
+    Frame* parent = m_frame->tree().parent();
     if (!parent)
         return 0;
@@ -4550 +4550 @@
     // find one via the frame hierarchy.
 
-    Frame* ownerFrame = m_frame->tree()->parent();
+    Frame* ownerFrame = m_frame->tree().parent();
     if (!ownerFrame)
         ownerFrame = m_frame->loader().opener();
@@ -4577 +4577 @@
 void Document::initContentSecurityPolicy()
 {
-    if (!m_frame->tree()->parent() || (!shouldInheritSecurityOriginFromOwner(m_url) && !isPluginDocument()))
-        return;
-
-    contentSecurityPolicy()->copyStateFrom(m_frame->tree()->parent()->document()->contentSecurityPolicy());
+    if (!m_frame->tree().parent() || (!shouldInheritSecurityOriginFromOwner(m_url) && !isPluginDocument()))
+        return;
+
+    contentSecurityPolicy()->copyStateFrom(m_frame->tree().parent()->document()->contentSecurityPolicy());
 }
 
@@ -4949 +4949 @@
         // A descendant browsing context's document has a non-empty fullscreen element stack.
         bool descendentHasNonEmptyStack = false;
-        for (Frame* descendant = frame() ? frame()->tree()->traverseNext() : 0; descendant; descendant = descendant->tree()->traverseNext()) {
+        for (Frame* descendant = frame() ? frame()->tree().traverseNext() : 0; descendant; descendant = descendant->tree().traverseNext()) {
             if (descendant->document()->webkitFullscreenElement()) {
                 descendentHasNonEmptyStack = true;
@@ -5072 +5072 @@
     // away from the doc is first.
     Deque<RefPtr<Document> > descendants;
-    for (Frame* descendant = frame() ? frame()->tree()->traverseNext() : 0; descendant; descendant = descendant->tree()->traverseNext()) {
+    for (Frame* descendant = frame() ? frame()->tree().traverseNext() : 0; descendant; descendant = descendant->tree().traverseNext()) {
         if (descendant->document()->webkitFullscreenElement())
             descendants.prepend(descendant->document());
@@ -5569 +5569 @@
     if (m_touchEventTargets->size())
         return;
-    for (const Frame* frame = page->mainFrame(); frame; frame = frame->tree()->traverseNext()) {
+    for (const Frame* frame = page->mainFrame(); frame; frame = frame->tree().traverseNext()) {
         if (frame->document() && frame->document()->hasTouchEventHandlers())
             return;

trunk/Source/WebCore/dom/TreeScope.cpp

@@ -377 +377 @@
 static Element* focusedFrameOwnerElement(Frame* focusedFrame, Frame* currentFrame)
 {
-    for (; focusedFrame; focusedFrame = focusedFrame->tree()->parent()) {
-        if (focusedFrame->tree()->parent() == currentFrame)
+    for (; focusedFrame; focusedFrame = focusedFrame->tree().parent()) {
+        if (focusedFrame->tree().parent() == currentFrame)
             return focusedFrame->ownerElement();
     }

trunk/Source/WebCore/editing/FrameSelection.cpp

@@ -1592 +1592 @@
 {
     // Find the parent frame; if there is none, then we have nothing to do.
-    Frame* parent = m_frame->tree()->parent();
+    Frame* parent = m_frame->tree().parent();
     if (!parent)
         return;

trunk/Source/WebCore/history/CachedFrame.cpp

@@ -79 +79 @@
     , m_mousePressNode(frame->eventHandler().mousePressNode())
     , m_url(frame->document()->url())
-    , m_isMainFrame(!frame->tree()->parent())
+    , m_isMainFrame(!frame->tree().parent())
 #if USE(ACCELERATED_COMPOSITING)
     , m_isComposited(frame->view()->hasCompositedContent())
@@ -128 +128 @@
     // Reconstruct the FrameTree
     for (unsigned i = 0; i < m_childFrames.size(); ++i)
-        frame.tree()->appendChild(&m_childFrames[i]->view()->frame());
+        frame.tree().appendChild(&m_childFrames[i]->view()->frame());
 
     // Open the child CachedFrames in their respective FrameLoaders.
@@ -170 +170 @@
 
     // Create the CachedFrames for all Frames in the FrameTree.
-    for (Frame* child = frame->tree()->firstChild(); child; child = child->tree()->nextSibling())
+    for (Frame* child = frame->tree().firstChild(); child; child = child->tree().nextSibling())
         m_childFrames.append(CachedFrame::create(child));
 
@@ -199 +199 @@
     // 2 - It's much easier to destroy a CachedFrame while it resides in the PageCache if it is disconnected from its parent.
     for (unsigned i = 0; i < m_childFrames.size(); ++i)
-        frame->tree()->removeChild(&m_childFrames[i]->view()->frame());
+        frame->tree().removeChild(&m_childFrames[i]->view()->frame());
 
     if (!m_isMainFrame)

trunk/Source/WebCore/history/CachedPage.cpp

@@ -90 +90 @@
 
     if (m_needStyleRecalcForVisitedLinks) {
-        for (Frame* frame = page->mainFrame(); frame; frame = frame->tree()->traverseNext())
+        for (Frame* frame = page->mainFrame(); frame; frame = frame->tree().traverseNext())
             frame->document()->visitedLinkState().invalidateStyleForAllLinks();
     }

trunk/Source/WebCore/history/PageCache.cpp

@@ -176 +176 @@
     HistogramSupport::histogramEnumeration("PageCache.FrameRejectReasonCount", reasonCount, 1 + NumberOfReasonsFramesCannotBeInPageCache);
 
-    for (Frame* child = frame->tree()->firstChild(); child; child = child->tree()->nextSibling())
+    for (Frame* child = frame->tree().firstChild(); child; child = child->tree().nextSibling())
         rejectReasons |= logCanCacheFrameDecision(child, indentLevel + 1);
     
@@ -304 +304 @@
 bool PageCache::canCachePageContainingThisFrame(Frame* frame)
 {
-    for (Frame* child = frame->tree()->firstChild(); child; child = child->tree()->nextSibling()) {
+    for (Frame* child = frame->tree().firstChild(); child; child = child->tree().nextSibling()) {
         if (!canCachePageContainingThisFrame(child))
             return false;

trunk/Source/WebCore/html/HTMLDocument.cpp

@@ -154 +154 @@
         return false;
     if (Frame* focusedFrame = page->focusController().focusedFrame()) {
-        if (focusedFrame->tree()->isDescendantOf(frame()))
+        if (focusedFrame->tree().isDescendantOf(frame()))
             return true;
     }

trunk/Source/WebCore/html/HTMLPlugInImageElement.cpp

@@ -452 +452 @@
         return;
 
-    for (Frame* frame = document()->page()->mainFrame(); frame; frame = frame->tree()->traverseNext()) {
+    for (Frame* frame = document()->page()->mainFrame(); frame; frame = frame->tree().traverseNext()) {
         if (!frame->loader().subframeLoader()->containsPlugins())
             continue;

trunk/Source/WebCore/inspector/InspectorApplicationCacheAgent.cpp

@@ -110 +110 @@
 
     Frame* mainFrame = m_pageAgent->mainFrame();
-    for (Frame* frame = mainFrame; frame; frame = frame->tree()->traverseNext(mainFrame)) {
+    for (Frame* frame = mainFrame; frame; frame = frame->tree().traverseNext(mainFrame)) {
         DocumentLoader* documentLoader = frame->loader().documentLoader();
         if (!documentLoader)

trunk/Source/WebCore/inspector/InspectorCanvasAgent.cpp

@@ -267 +267 @@
     m_framesWithUninstrumentedCanvases.clear();
 
-    for (Frame* frame = m_pageAgent->page()->mainFrame(); frame; frame = frame->tree()->traverseNext()) {
+    for (Frame* frame = m_pageAgent->page()->mainFrame(); frame; frame = frame->tree().traverseNext()) {
         if (!frame->document())
             continue;
@@ -314 +314 @@
                 m_frontend->traceLogsRemoved(&frameId, 0);
             }
-            frame = frame->tree()->traverseNext();
+            frame = frame->tree().traverseNext();
         }
     }

trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp

@@ -280 +280 @@
 {
     Vector<Document*> result;
-    for (Frame* frame = m_document->frame(); frame; frame = frame->tree()->traverseNext()) {
+    for (Frame* frame = m_document->frame(); frame; frame = frame->tree().traverseNext()) {
         Document* document = frame->document();
         if (!document)

trunk/Source/WebCore/inspector/InspectorFileSystemAgent.cpp

@@ -729 +729 @@
 ScriptExecutionContext* InspectorFileSystemAgent::assertScriptExecutionContextForOrigin(ErrorString* error, SecurityOrigin* origin)
 {
-    for (Frame* frame = m_pageAgent->mainFrame(); frame; frame = frame->tree()->traverseNext()) {
+    for (Frame* frame = m_pageAgent->mainFrame(); frame; frame = frame->tree().traverseNext()) {
         if (frame->document() && frame->document()->securityOrigin()->isSameSchemeHostPort(origin))
             return frame->document();

trunk/Source/WebCore/inspector/InspectorPageAgent.cpp

@@ -584 +584 @@
     bool rawCookiesImplemented = false;
 
-    for (Frame* frame = mainFrame(); frame; frame = frame->tree()->traverseNext(mainFrame())) {
+    for (Frame* frame = mainFrame(); frame; frame = frame->tree().traverseNext(mainFrame())) {
         Document* document = frame->document();
         Vector<KURL> allURLs = allResourcesURLsForFrame(frame);
@@ -619 +619 @@
 {
     KURL parsedURL(ParsedURLString, url);
-    for (Frame* frame = m_page->mainFrame(); frame; frame = frame->tree()->traverseNext(m_page->mainFrame()))
+    for (Frame* frame = m_page->mainFrame(); frame; frame = frame->tree().traverseNext(m_page->mainFrame()))
         WebCore::deleteCookie(frame->document(), parsedURL, cookieName);
 }
@@ -701 +701 @@
     RegularExpression regex = ContentSearchUtils::createSearchRegex(text, caseSensitive, isRegex);
 
-    for (Frame* frame = m_page->mainFrame(); frame; frame = frame->tree()->traverseNext(m_page->mainFrame())) {
+    for (Frame* frame = m_page->mainFrame(); frame; frame = frame->tree().traverseNext(m_page->mainFrame())) {
         String content;
         Vector<CachedResource*> allResources = cachedResourcesForFrame(frame);
@@ -962 +962 @@
 Frame* InspectorPageAgent::findFrameWithSecurityOrigin(const String& originRawString)
 {
-    for (Frame* frame = m_page->mainFrame(); frame; frame = frame->tree()->traverseNext()) {
+    for (Frame* frame = m_page->mainFrame(); frame; frame = frame->tree().traverseNext()) {
         RefPtr<SecurityOrigin> documentOrigin = frame->document()->securityOrigin();
         if (documentOrigin->toRawString() == originRawString)
@@ -1103 +1103 @@
         .setMimeType(frame->loader().documentLoader()->responseMIMEType())
         .setSecurityOrigin(frame->document()->securityOrigin()->toRawString());
-    if (frame->tree()->parent())
-        frameObject->setParentId(frameId(frame->tree()->parent()));
+    if (frame->tree().parent())
+        frameObject->setParentId(frameId(frame->tree().parent()));
     if (frame->ownerElement()) {
         String name = frame->ownerElement()->getNameAttribute();
@@ -1142 +1142 @@
 
     RefPtr<TypeBuilder::Array<TypeBuilder::Page::FrameResourceTree> > childrenArray;
-    for (Frame* child = frame->tree()->firstChild(); child; child = child->tree()->nextSibling()) {
+    for (Frame* child = frame->tree().firstChild(); child; child = child->tree().nextSibling()) {
         if (!childrenArray) {
             childrenArray = TypeBuilder::Array<TypeBuilder::Page::FrameResourceTree>::create();

trunk/Source/WebCore/inspector/PageRuntimeAgent.cpp

@@ -161 +161 @@
 {
     Vector<std::pair<ScriptState*, SecurityOrigin*> > isolatedContexts;
-    for (Frame* frame = m_inspectedPage->mainFrame(); frame; frame = frame->tree()->traverseNext()) {
+    for (Frame* frame = m_inspectedPage->mainFrame(); frame; frame = frame->tree().traverseNext()) {
         if (!frame->script().canExecuteScripts(NotAboutToExecuteScript))
             continue;

trunk/Source/WebCore/loader/DocumentLoader.cpp

@@ -505 +505 @@
         newRequest.setCachePolicy(ReloadIgnoringCacheData);
 
-    Frame* top = m_frame->tree()->top();
+    Frame* top = m_frame->tree().top();
     if (top != m_frame) {
         if (!frameLoader()->mixedContentChecker()->canDisplayInsecureContent(top->document()->securityOrigin(), newRequest.url())) {
@@ -1048 +1048 @@
         data = SharedBuffer::create();
         
-    return ArchiveResource::create(data, r.url(), r.mimeType(), r.textEncodingName(), frame()->tree()->uniqueName());
+    return ArchiveResource::create(data, r.url(), r.mimeType(), r.textEncodingName(), frame()->tree().uniqueName());
 }
 

trunk/Source/WebCore/loader/DocumentWriter.cpp

@@ -173 +173 @@
             m_frame->settings().defaultTextEncodingName(),
             m_frame->settings().usesEncodingDetector());
-        Frame* parentFrame = m_frame->tree()->parent();
+        Frame* parentFrame = m_frame->tree().parent();
         // Set the hint encoding to the parent frame encoding only if
         // the parent and the current frames share the security origin.

trunk/Source/WebCore/loader/FrameLoader.cpp

@@ -382 +382 @@
     // needed any more now that we reset m_submittedFormURL on each mouse or key down event.
 
-    if (m_frame.tree()->isDescendantOf(targetFrame)) {
+    if (m_frame.tree().isDescendantOf(targetFrame)) {
         if (m_submittedFormURL == submission->requestURL())
             return;
@@ -740 +740 @@
 bool FrameLoader::allChildrenAreComplete() const
 {
-    for (Frame* child = m_frame.tree()->firstChild(); child; child = child->tree()->nextSibling()) {
+    for (Frame* child = m_frame.tree().firstChild(); child; child = child->tree().nextSibling()) {
         if (!child->loader().m_isComplete)
             return false;
@@ -749 +749 @@
 bool FrameLoader::allAncestorsAreComplete() const
 {
-    for (Frame* ancestor = &m_frame; ancestor; ancestor = ancestor->tree()->parent()) {
+    for (Frame* ancestor = &m_frame; ancestor; ancestor = ancestor->tree().parent()) {
         if (!ancestor->loader().m_isComplete)
             return false;
@@ -854 +854 @@
 
 #if ENABLE(WEB_ARCHIVE) || ENABLE(MHTML)
-    RefPtr<Archive> subframeArchive = activeDocumentLoader()->popArchiveForSubframe(childFrame->tree()->uniqueName(), url);    
+    RefPtr<Archive> subframeArchive = activeDocumentLoader()->popArchiveForSubframe(childFrame->tree().uniqueName(), url);
     if (subframeArchive) {
         childFrame->loader().loadArchive(subframeArchive.release());
@@ -866 +866 @@
     if (parentItem && parentItem->children().size() && isBackForwardLoadType(loadType()) 
         && !m_frame.document()->loadEventFinished()) {
-        HistoryItem* childItem = parentItem->childItemWithTarget(childFrame->tree()->uniqueName());
+        HistoryItem* childItem = parentItem->childItemWithTarget(childFrame->tree().uniqueName());
         if (childItem) {
             childFrame->loader().m_requestedHistoryItem = childItem;
@@ -939 +939 @@
     Frame* frame = &m_frame;
     while (frame->document()->isSrcdocDocument()) {
-        frame = frame->tree()->parent();
+        frame = frame->tree().parent();
         // Srcdoc documents cannot be top-level documents, by definition,
         // because they need to be contained in iframes with the srcdoc.
@@ -1004 +1004 @@
 void FrameLoader::updateFirstPartyForCookies()
 {
-    if (m_frame.tree()->parent())
-        setFirstPartyForCookies(m_frame.tree()->parent()->document()->firstPartyForCookies());
+    if (m_frame.tree().parent())
+        setFirstPartyForCookies(m_frame.tree().parent()->document()->firstPartyForCookies());
     else
         setFirstPartyForCookies(m_frame.document()->url());
@@ -1012 +1012 @@
 void FrameLoader::setFirstPartyForCookies(const KURL& url)
 {
-    for (Frame* frame = &m_frame; frame; frame = frame->tree()->traverseNext(&m_frame))
+    for (Frame* frame = &m_frame; frame; frame = frame->tree().traverseNext(&m_frame))
         frame->document()->setFirstPartyForCookies(url);
 }
@@ -1092 +1092 @@
     RefPtr<Frame> protect(&m_frame);
 
-    for (Frame* descendant = m_frame.tree()->traverseNext(&m_frame); descendant; descendant = descendant->tree()->traverseNext(&m_frame))
+    for (Frame* descendant = m_frame.tree().traverseNext(&m_frame); descendant; descendant = descendant->tree().traverseNext(&m_frame))
         descendant->navigationScheduler().startTimer();
 
-    if (Frame* parent = m_frame.tree()->parent())
+    if (Frame* parent = m_frame.tree().parent())
         parent->loader().checkCompleted();
 
@@ -1107 +1107 @@
     if (m_frame.page())
         m_activityAssertion = m_frame.page()->createActivityToken();
-    for (Frame* frame = &m_frame; frame; frame = frame->tree()->parent())
+    for (Frame* frame = &m_frame; frame; frame = frame->tree().parent())
         frame->loader().m_isComplete = false;
 }
@@ -1214 +1214 @@
     }
 #if ENABLE(CACHE_PARTITIONING)
-    if (m_frame.tree()->top() != &m_frame)
-        request.setCachePartition(m_frame.tree()->top()->document()->securityOrigin()->cachePartition());
+    if (m_frame.tree().top() != &m_frame)
+        request.setCachePartition(m_frame.tree().top()->document()->securityOrigin()->cachePartition());
 #endif
     addExtraFieldsToRequest(request, newLoadType, true);
@@ -1397 +1397 @@
             callContinueFragmentScrollAfterNavigationPolicy, this);
     } else {
-        if (Frame* parent = m_frame.tree()->parent())
+        if (Frame* parent = m_frame.tree().parent())
             loader->setOverrideEncoding(parent->loader().documentLoader()->overrideEncoding());
 
@@ -1574 +1574 @@
         history().setProvisionalItem(0);
 
-    for (RefPtr<Frame> child = m_frame.tree()->firstChild(); child; child = child->tree()->nextSibling())
+    for (RefPtr<Frame> child = m_frame.tree().firstChild(); child; child = child->tree().nextSibling())
         child->loader().stopAllLoaders(clearProvisionalItemPolicy);
     if (m_provisionalDocumentLoader)
@@ -1703 +1703 @@
     RefPtr<Frame> protect(&m_frame);
 
-    LOG(PageCache, "WebCoreLoading %s: About to commit provisional load from previous URL '%s' to new URL '%s'", m_frame.tree()->uniqueName().string().utf8().data(),
+    LOG(PageCache, "WebCoreLoading %s: About to commit provisional load from previous URL '%s' to new URL '%s'", m_frame.tree().uniqueName().string().utf8().data(),
         m_frame.document() ? m_frame.document()->url().stringCenterEllipsizedToLength().utf8().data() : "",
         pdl ? pdl->url().stringCenterEllipsizedToLength().utf8().data() : "<no provisional DocumentLoader>");
@@ -1712 +1712 @@
     // We are doing this here because we know for sure that a new page is about to be loaded.
     HistoryItem* item = history().currentItem();
-    if (!m_frame.tree()->parent() && pageCache()->canCache(m_frame.page()) && !item->isInPageCache())
+    if (!m_frame.tree().parent() && pageCache()->canCache(m_frame.page()) && !item->isInPageCache())
         pageCache()->add(item, m_frame.page());
 
@@ -1757 +1757 @@
     }
 
-    LOG(Loading, "WebCoreLoading %s: Finished committing provisional load to URL %s", m_frame.tree()->uniqueName().string().utf8().data(),
+    LOG(Loading, "WebCoreLoading %s: Finished committing provisional load to URL %s", m_frame.tree().uniqueName().string().utf8().data(),
         m_frame.document() ? m_frame.document()->url().stringCenterEllipsizedToLength().utf8().data() : "");
 
@@ -1947 +1947 @@
     // If so, add helpers for postorder traversal, and use them. If not, then lets not
     // use a recursive algorithm here.
-    for (Frame* child = m_frame.tree()->firstChild(); child; child = child->tree()->nextSibling())
+    for (Frame* child = m_frame.tree().firstChild(); child; child = child->tree().nextSibling())
         child->loader().closeOldDataSources();
     
@@ -1958 +1958 @@
 void FrameLoader::prepareForCachedPageRestore()
 {
-    ASSERT(!m_frame.tree()->parent());
+    ASSERT(!m_frame.tree().parent());
     ASSERT(m_frame.page());
     ASSERT(m_frame.page()->mainFrame() == &m_frame);
@@ -2045 +2045 @@
 {
     // It's most likely that the last added frame is the last to load so we walk backwards.
-    for (Frame* child = m_frame.tree()->lastChild(); child; child = child->tree()->previousSibling()) {
+    for (Frame* child = m_frame.tree().lastChild(); child; child = child->tree().previousSibling()) {
         FrameLoader& childLoader = child->loader();
         DocumentLoader* documentLoader = childLoader.documentLoader();
@@ -2078 +2078 @@
         return CachePolicyReload;
 
-    if (Frame* parentFrame = m_frame.tree()->parent()) {
+    if (Frame* parentFrame = m_frame.tree().parent()) {
         CachePolicy parentCachePolicy = parentFrame->loader().subresourceCachePolicy();
         if (parentCachePolicy != CachePolicyVerify)
@@ -2321 +2321 @@
     typedef Vector<RefPtr<Frame> > FrameVector;
     FrameVector childrenToDetach;
-    childrenToDetach.reserveCapacity(m_frame.tree()->childCount());
-    for (Frame* child = m_frame.tree()->lastChild(); child; child = child->tree()->previousSibling())
+    childrenToDetach.reserveCapacity(m_frame.tree().childCount());
+    for (Frame* child = m_frame.tree().lastChild(); child; child = child->tree().previousSibling())
         childrenToDetach.append(child);
     FrameVector::iterator end = childrenToDetach.end();
@@ -2331 +2331 @@
 void FrameLoader::closeAndRemoveChild(Frame* child)
 {
-    child->tree()->detachFromParent();
+    child->tree().detachFromParent();
 
     child->setView(0);
@@ -2339 +2339 @@
     child->detachFromPage();
 
-    m_frame.tree()->removeChild(child);
+    m_frame.tree().removeChild(child);
 }
 
@@ -2353 +2353 @@
     if (Page* page = m_frame.page()) {
         Vector<RefPtr<Frame>, 10> frames;
-        for (RefPtr<Frame> frame = page->mainFrame(); frame; frame = frame->tree()->traverseNext())
+        for (RefPtr<Frame> frame = page->mainFrame(); frame; frame = frame->tree().traverseNext())
             frames.append(frame);
         // To process children before their parents, iterate the vector backwards.
@@ -2367 +2367 @@
 
     int count = 0;
-    for (Frame* frame = &m_frame; frame; frame = frame->tree()->traverseNext(&m_frame))
+    for (Frame* frame = &m_frame; frame; frame = frame->tree().traverseNext(&m_frame))
         count += frame->document()->cachedResourceLoader()->requestCount();
     return count;
@@ -2412 +2412 @@
     m_progressTracker.clear();
 
-    if (Frame* parent = m_frame.tree()->parent()) {
+    if (Frame* parent = m_frame.tree().parent()) {
         parent->loader().closeAndRemoveChild(&m_frame);
         parent->loader().scheduleCheckCompleted();
@@ -2725 +2725 @@
     Vector<RefPtr<Frame> > targetFrames;
     targetFrames.append(&m_frame);
-    for (Frame* child = m_frame.tree()->firstChild(); child; child = child->tree()->traverseNext(&m_frame))
+    for (Frame* child = m_frame.tree().firstChild(); child; child = child->tree().traverseNext(&m_frame))
         targetFrames.append(child);
 
@@ -2734 +2734 @@
 
         for (i = 0; i < targetFrames.size(); i++) {
-            if (!targetFrames[i]->tree()->isDescendantOf(&m_frame))
+            if (!targetFrames[i]->tree().isDescendantOf(&m_frame))
                 continue;
             if (!targetFrames[i]->loader().handleBeforeUnloadEvent(page->chrome(), this))
@@ -2787 +2787 @@
     // ancestor frame SecurityOrigins up through the navigating FrameLoader.
     if (frameLoaderBeingNavigated != this) {
-        Frame* parentFrame = m_frame.tree()->parent();
+        Frame* parentFrame = m_frame.tree().parent();
         while (parentFrame) {
             Document* parentDocument = parentFrame->document();
@@ -2800 +2800 @@
                 break;
             
-            parentFrame = parentFrame->tree()->parent();
+            parentFrame = parentFrame->tree().parent();
         }
         
@@ -2904 +2904 @@
 
     if (frameName != "_blank")
-        mainFrame->tree()->setName(frameName);
+        mainFrame->tree().setName(frameName);
 
     mainFrame->page()->setOpenedByDOM();
@@ -2982 +2982 @@
     FeatureObserver::observe(m_frame.document(), FeatureObserver::XFrameOptions);
 
-    Frame* topFrame = m_frame.tree()->top();
+    Frame* topFrame = m_frame.tree().top();
     if (&m_frame == topFrame)
         return false;
@@ -2994 +2994 @@
         if (!origin->isSameSchemeHostPort(topFrame->document()->securityOrigin()))
             return true;
-        for (Frame* frame = m_frame.tree()->parent(); frame; frame = frame->tree()->parent()) {
+        for (Frame* frame = m_frame.tree().parent(); frame; frame = frame->tree().parent()) {
             if (!origin->isSameSchemeHostPort(frame->document()->securityOrigin())) {
                 FeatureObserver::observe(m_frame.document(), FeatureObserver::XFrameOptionsSameOriginWithBadAncestorChain);
@@ -3069 +3069 @@
 Frame* FrameLoader::findFrameForNavigation(const AtomicString& name, Document* activeDocument)
 {
-    Frame* frame = m_frame.tree()->find(name);
+    Frame* frame = m_frame.tree().find(name);
 
     // From http://www.whatwg.org/specs/web-apps/current-work/#seamlessLinks:
@@ -3081 +3081 @@
     // browsing context was the one that was going to be navigated instead.
     if (frame == &m_frame && name != "_self" && m_frame.document()->shouldDisplaySeamlesslyWithParent()) {
-        for (Frame* ancestor = &m_frame; ancestor; ancestor = ancestor->tree()->parent()) {
+        for (Frame* ancestor = &m_frame; ancestor; ancestor = ancestor->tree().parent()) {
             if (!ancestor->document()->shouldDisplaySeamlesslyWithParent()) {
                 frame = ancestor;
@@ -3290 +3290 @@
 {
     SandboxFlags flags = m_forcedSandboxFlags;
-    if (Frame* parentFrame = m_frame.tree()->parent())
+    if (Frame* parentFrame = m_frame.tree().parent())
         flags |= parentFrame->document()->sandboxFlags();
     if (HTMLFrameOwnerElement* ownerElement = m_frame.ownerElement())
@@ -3432 +3432 @@
 
     if (request.frameName() != "_blank")
-        frame->tree()->setName(request.frameName());
+        frame->tree().setName(request.frameName());
 
     page->chrome().setToolbarsVisible(features.toolBarVisible || features.locationBarVisible);

trunk/Source/WebCore/loader/HistoryController.cpp

@@ -180 +180 @@
     
     if (item->isCurrentDocument(document) && document->attached()) {
-        LOG(Loading, "WebCoreLoading %s: saving form state to %p", m_frame.tree()->uniqueName().string().utf8().data(), item);
+        LOG(Loading, "WebCoreLoading %s: saving form state to %p", m_frame.tree().uniqueName().string().utf8().data(), item);
         item->setDocumentState(document->formElementsState());
     }
@@ -189 +189 @@
 void HistoryController::saveDocumentAndScrollState()
 {
-    for (Frame* frame = &m_frame; frame; frame = frame->tree()->traverseNext(&m_frame)) {
+    for (Frame* frame = &m_frame; frame; frame = frame->tree().traverseNext(&m_frame)) {
         frame->loader().history().saveDocumentState();
         frame->loader().history().saveScrollPositionAndViewStateToItem(frame->loader().history().currentItem());
@@ -219 +219 @@
         return;
 
-    LOG(Loading, "WebCoreLoading %s: restoring form state from %p", m_frame.tree()->uniqueName().string().utf8().data(), m_currentItem.get());
+    LOG(Loading, "WebCoreLoading %s: restoring form state from %p", m_frame.tree().uniqueName().string().utf8().data(), m_currentItem.get());
     m_frame.document()->setStateForNewFormElements(m_currentItem->documentState());
 }
@@ -258 +258 @@
 void HistoryController::goToItem(HistoryItem* targetItem, FrameLoadType type)
 {
-    ASSERT(!m_frame.tree()->parent());
+    ASSERT(!m_frame.tree().parent());
     
     // shouldGoToHistoryItem is a private delegate method. This is needed to fix:
@@ -388 +388 @@
 
     if (m_frame.loader().documentLoader()->isClientRedirect()) {
-        if (!m_currentItem && !m_frame.tree()->parent()) {
+        if (!m_currentItem && !m_frame.tree().parent()) {
             if (!historyURL.isEmpty()) {
                 updateBackForwardListClippedAtTarget(true);
@@ -404 +404 @@
         updateCurrentItem();
     } else {
-        Frame* parentFrame = m_frame.tree()->parent();
+        Frame* parentFrame = m_frame.tree().parent();
         if (parentFrame && parentFrame->loader().history().currentItem())
             parentFrame->loader().history().currentItem()->setChildItem(createItem());
@@ -515 +515 @@
 
     // Iterate over the rest of the tree
-    for (Frame* child = m_frame.tree()->firstChild(); child; child = child->tree()->nextSibling())
+    for (Frame* child = m_frame.tree().firstChild(); child; child = child->tree().nextSibling())
         child->loader().history().recursiveUpdateForCommit();
 }
@@ -559 +559 @@
 
     // Iterate over the rest of the tree.
-    for (Frame* child = m_frame.tree()->firstChild(); child; child = child->tree()->nextSibling())
+    for (Frame* child = m_frame.tree().firstChild(); child; child = child->tree().nextSibling())
         child->loader().history().recursiveUpdateForSameDocumentNavigation();
 }
@@ -627 +627 @@
         originalURL = blankURL();
     
-    Frame* parentFrame = m_frame.tree()->parent();
-    String parent = parentFrame ? parentFrame->tree()->uniqueName() : "";
+    Frame* parentFrame = m_frame.tree().parent();
+    String parent = parentFrame ? parentFrame->tree().uniqueName() : "";
     StringWithDirection title = documentLoader->title();
 
     item->setURL(url);
-    item->setTarget(m_frame.tree()->uniqueName());
+    item->setTarget(m_frame.tree().uniqueName());
     item->setParent(parent);
     // FIXME: should store title directionality in history as well.
@@ -678 +678 @@
         }
 
-        for (Frame* child = m_frame.tree()->firstChild(); child; child = child->tree()->nextSibling()) {
+        for (Frame* child = m_frame.tree().firstChild(); child; child = child->tree().nextSibling()) {
             FrameLoader& childLoader = child->loader();
             bool hasChildLoaded = childLoader.frameHasLoaded();
@@ -716 +716 @@
             HistoryItem* fromChildItem = fromItem->childItemWithTarget(childFrameName);
             ASSERT(fromChildItem);
-            Frame* childFrame = m_frame.tree()->child(childFrameName);
+            Frame* childFrame = m_frame.tree().child(childFrameName);
             ASSERT(childFrame);
             childFrame->loader().history().recursiveSetProvisionalItem(childItems[i].get(), fromChildItem, type);
@@ -738 +738 @@
             HistoryItem* fromChildItem = fromItem->childItemWithTarget(childFrameName);
             ASSERT(fromChildItem);
-            Frame* childFrame = m_frame.tree()->child(childFrameName);
+            Frame* childFrame = m_frame.tree().child(childFrameName);
             ASSERT(childFrame);
             childFrame->loader().history().recursiveGoToItem(childItems[i].get(), fromChildItem, type);
@@ -767 +767 @@
 bool HistoryController::currentFramesMatchItem(HistoryItem* item) const
 {
-    if ((!m_frame.tree()->uniqueName().isEmpty() || !item->target().isEmpty()) && m_frame.tree()->uniqueName() != item->target())
+    if ((!m_frame.tree().uniqueName().isEmpty() || !item->target().isEmpty()) && m_frame.tree().uniqueName() != item->target())
         return false;
         
     const HistoryItemVector& childItems = item->children();
-    if (childItems.size() != m_frame.tree()->childCount())
+    if (childItems.size() != m_frame.tree().childCount())
         return false;
     
     unsigned size = childItems.size();
     for (unsigned i = 0; i < size; ++i) {
-        if (!m_frame.tree()->child(childItems[i]->target()))
+        if (!m_frame.tree().child(childItems[i]->target()))
             return false;
     }

trunk/Source/WebCore/loader/NavigationScheduler.cpp

@@ -329 +329 @@
     // The definition of "during load" is any time before all handlers for the load event have been run.
     // See https://bugs.webkit.org/show_bug.cgi?id=14957 for the original motivation for this.
-    for (Frame* ancestor = targetFrame->tree()->parent(); ancestor; ancestor = ancestor->tree()->parent()) {
+    for (Frame* ancestor = targetFrame->tree().parent(); ancestor; ancestor = ancestor->tree().parent()) {
         Document* document = ancestor->document();
         if (!ancestor->loader().isComplete() || (document && document->processingLoadEvent()))
@@ -379 +379 @@
     bool lockBackForwardList = mustLockBackForwardList(m_frame)
         || (submission->state()->formSubmissionTrigger() == SubmittedByJavaScript
-            && m_frame->tree()->parent() && !ScriptController::processingUserGesture());
+            && m_frame->tree().parent() && !ScriptController::processingUserGesture());
 
     schedule(adoptPtr(new ScheduledFormSubmission(submission, lockBackForwardList, duringLoad)));

trunk/Source/WebCore/loader/ProgressTracker.cpp

@@ -122 +122 @@
 void ProgressTracker::progressStarted(Frame* frame)
 {
-    LOG(Progress, "Progress started (%p) - frame %p(\"%s\"), value %f, tracked frames %d, originating frame %p", this, frame, frame->tree()->uniqueName().string().utf8().data(), m_progressValue, m_numProgressTrackedFrames, m_originatingProgressFrame.get());
+    LOG(Progress, "Progress started (%p) - frame %p(\"%s\"), value %f, tracked frames %d, originating frame %p", this, frame, frame->tree().uniqueName().string().utf8().data(), m_progressValue, m_numProgressTrackedFrames, m_originatingProgressFrame.get());
 
     frame->loader().client().willChangeEstimatedProgress();
@@ -144 +144 @@
 void ProgressTracker::progressCompleted(Frame* frame)
 {
-    LOG(Progress, "Progress completed (%p) - frame %p(\"%s\"), value %f, tracked frames %d, originating frame %p", this, frame, frame->tree()->uniqueName().string().utf8().data(), m_progressValue, m_numProgressTrackedFrames, m_originatingProgressFrame.get());
+    LOG(Progress, "Progress completed (%p) - frame %p(\"%s\"), value %f, tracked frames %d, originating frame %p", this, frame, frame->tree().uniqueName().string().utf8().data(), m_progressValue, m_numProgressTrackedFrames, m_originatingProgressFrame.get());
     
     if (m_numProgressTrackedFrames <= 0)
@@ -289 +289 @@
         return false;
     // See if the load originated from a subframe.
-    if (m_originatingProgressFrame->tree()->parent())
+    if (m_originatingProgressFrame->tree().parent())
         return false;
     return m_progressValue && m_progressValue < finalProgressValue && m_heartbeatsWithNoProgress < loadStalledHeartbeatCount;

trunk/Source/WebCore/loader/appcache/ApplicationCacheGroup.cpp

@@ -142 +142 @@
         return;
 
-    if (!frame->document()->securityOrigin()->canAccessApplicationCache(frame->tree()->top()->document()->securityOrigin()))
+    if (!frame->document()->securityOrigin()->canAccessApplicationCache(frame->tree().top()->document()->securityOrigin()))
         return;
     
@@ -218 +218 @@
         return;
 
-    if (!frame->document()->securityOrigin()->canAccessApplicationCache(frame->tree()->top()->document()->securityOrigin()))
+    if (!frame->document()->securityOrigin()->canAccessApplicationCache(frame->tree().top()->document()->securityOrigin()))
         return;
 

trunk/Source/WebCore/loader/archive/cf/LegacyWebArchive.cpp

@@ -462 +462 @@
     Vector<PassRefPtr<LegacyWebArchive> > subframeArchives;
     
-    unsigned children = frame->tree()->childCount();
+    unsigned children = frame->tree().childCount();
     for (unsigned i = 0; i < children; ++i) {
-        RefPtr<LegacyWebArchive> childFrameArchive = create(frame->tree()->child(i));
+        RefPtr<LegacyWebArchive> childFrameArchive = create(frame->tree().child(i));
         if (childFrameArchive)
             subframeArchives.append(childFrameArchive.release());
@@ -512 +512 @@
         responseURL = KURL(ParsedURLString, emptyString());
         
-    PassRefPtr<ArchiveResource> mainResource = ArchiveResource::create(utf8Buffer(markupString), responseURL, response.mimeType(), "UTF-8", frame->tree()->uniqueName());
+    RefPtr<ArchiveResource> mainResource = ArchiveResource::create(utf8Buffer(markupString), responseURL, response.mimeType(), "UTF-8", frame->tree().uniqueName());
 
     Vector<PassRefPtr<LegacyWebArchive> > subframeArchives;
@@ -532 +532 @@
                 subframeArchives.append(subframeArchive);
             else
-                LOG_ERROR("Unabled to archive subframe %s", childFrame->tree()->uniqueName().string().utf8().data());
+                LOG_ERROR("Unabled to archive subframe %s", childFrame->tree().uniqueName().string().utf8().data());
         } else {
             ListHashSet<KURL> subresourceURLs;
@@ -583 +583 @@
     }
 
-    return create(mainResource, subresources, subframeArchives);
+    return create(mainResource.release(), subresources, subframeArchives);
 }
 

trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp

@@ -287 +287 @@
         // These resources can corrupt only the frame's pixels.
         if (Frame* f = frame()) {
-            Frame* top = f->tree()->top();
+            Frame* top = f->tree().top();
             if (!top->loader().mixedContentChecker()->canDisplayInsecureContent(top->document()->securityOrigin(), url))
                 return false;

trunk/Source/WebCore/loader/icon/IconController.cpp

@@ -83 +83 @@
 {
     IconURLs iconURLs;
-    if (m_frame->tree() && m_frame->tree()->parent())
+    if (m_frame->tree().parent())
         return iconURLs;
         
@@ -137 +137 @@
         return;
 
-    ASSERT(!m_frame->tree()->parent());
+    ASSERT(!m_frame->tree().parent());
     if (!documentCanHaveIcon(m_frame->document()->url()))
         return;

trunk/Source/WebCore/page/Chrome.cpp

@@ -213 +213 @@
 static bool canRunModalIfDuringPageDismissal(Page* page, ChromeClient::DialogType dialog, const String& message)
 {
-    for (Frame* frame = page->mainFrame(); frame; frame = frame->tree()->traverseNext()) {
+    for (Frame* frame = page->mainFrame(); frame; frame = frame->tree().traverseNext()) {
         FrameLoader::PageDismissalType dismissal = frame->loader().pageDismissalEventBeingDispatched();
         if (dismissal != FrameLoader::NoDismissal)
@@ -543 +543 @@
     m_displayID = displayID;
 
-    for (Frame* frame = m_page->mainFrame(); frame; frame = frame->tree()->traverseNext()) {
+    for (Frame* frame = m_page->mainFrame(); frame; frame = frame->tree().traverseNext()) {
         if (frame->document())
             frame->document()->windowScreenDidChange(displayID);

trunk/Source/WebCore/page/DOMWindow.cpp

@@ -1254 +1254 @@
         return 0;
 
-    return m_frame->tree()->scopedChildCount();
+    return m_frame->tree().scopedChildCount();
 }
 
@@ -1262 +1262 @@
         return String();
 
-    return m_frame->tree()->name();
+    return m_frame->tree().name();
 }
 
@@ -1270 +1270 @@
         return;
 
-    m_frame->tree()->setName(string);
+    m_frame->tree().setName(string);
     m_frame->loader().client().didChangeName(string);
 }
@@ -1329 +1329 @@
         return 0;
 
-    Frame* parent = m_frame->tree()->parent();
+    Frame* parent = m_frame->tree().parent();
     if (parent)
         return parent->document()->domWindow();
@@ -1345 +1345 @@
         return 0;
 
-    return m_frame->tree()->top()->document()->domWindow();
+    return m_frame->tree().top()->document()->domWindow();
 }
 
@@ -1955 +1955 @@
         // Because FrameTree::find() returns true for empty strings, we must check for empty frame names.
         // Otherwise, illegitimate window.open() calls with no name will pass right through the popup blocker.
-        if (frameName.isEmpty() || !m_frame->tree()->find(frameName))
+        if (frameName.isEmpty() || !m_frame->tree().find(frameName))
             return 0;
     }
@@ -1963 +1963 @@
     Frame* targetFrame = 0;
     if (frameName == "_top")
-        targetFrame = m_frame->tree()->top();
+        targetFrame = m_frame->tree().top();
     else if (frameName == "_parent") {
-        if (Frame* parent = m_frame->tree()->parent())
+        if (Frame* parent = m_frame->tree().parent())
             targetFrame = parent;
         else

trunk/Source/WebCore/page/EventHandler.cpp

@@ -1133 +1133 @@
     if (view && view->scroll(direction, granularity))
         return true;
-    frame = frame->tree()->parent();
+    frame = frame->tree().parent();
     if (!frame)
         return false;
@@ -1161 +1161 @@
         return true;
     
-    frame = frame->tree()->parent();
+    frame = frame->tree().parent();
     if (!frame)
         return false;
@@ -1805 +1805 @@
  
     // We want mouseouts to happen first, from the inside out.  First send a move event to the last subframe so that it will fire mouseouts.
-    if (m_lastMouseMoveEventSubframe && m_lastMouseMoveEventSubframe->tree()->isDescendantOf(m_frame) && m_lastMouseMoveEventSubframe != newSubframe)
+    if (m_lastMouseMoveEventSubframe && m_lastMouseMoveEventSubframe->tree().isDescendantOf(m_frame) && m_lastMouseMoveEventSubframe != newSubframe)
         passMouseMoveEventToSubframe(mev, m_lastMouseMoveEventSubframe.get());
 

trunk/Source/WebCore/page/FocusController.cpp

@@ -688 +688 @@
     contentAreaDidShowOrHide(view, containingWindowIsVisible);
 
-    for (Frame* frame = m_page->mainFrame(); frame; frame = frame->tree()->traverseNext()) {
+    for (Frame* frame = m_page->mainFrame(); frame; frame = frame->tree().traverseNext()) {
         FrameView* frameView = frame->view();
         if (!frameView)

trunk/Source/WebCore/page/Frame.cpp

@@ -137 +137 @@
 static inline float parentPageZoomFactor(Frame* frame)
 {
-    Frame* parent = frame->tree()->parent();
+    Frame* parent = frame->tree().parent();
     if (!parent)
         return 1;
@@ -145 +145 @@
 static inline float parentTextZoomFactor(Frame* frame)
 {
-    Frame* parent = frame->tree()->parent();
+    Frame* parent = frame->tree().parent();
     if (!parent)
         return 1;
@@ -522 +522 @@
 
     // Subframes of the one we're printing don't lay out to the page size.
-    for (RefPtr<Frame> child = tree()->firstChild(); child; child = child->tree()->nextSibling())
+    for (RefPtr<Frame> child = tree().firstChild(); child; child = child->tree().nextSibling())
         child->setPrinting(printing, FloatSize(), FloatSize(), 0, shouldAdjustViewSize);
 }
@@ -530 +530 @@
     // Only top frame being printed should be fit to page size.
     // Subframes should be constrained by parents only.
-    return m_doc->printing() && (!tree()->parent() || !tree()->parent()->m_doc->printing());
+    return m_doc->printing() && (!tree().parent() || !tree().parent()->m_doc->printing());
 }
 
@@ -648 +648 @@
 
     Vector<RefPtr<Frame> > childFrames;
-    for (Frame* child = tree()->firstChild(); child; child = child->tree()->nextSibling())
+    for (Frame* child = tree().firstChild(); child; child = child->tree().nextSibling())
         childFrames.append(child);
 
@@ -658 +658 @@
 void Frame::willDetachPage()
 {
-    if (Frame* parent = tree()->parent())
+    if (Frame* parent = tree().parent())
         parent->loader().checkLoadComplete();
 
@@ -927 +927 @@
     document->recalcStyle(Style::Force);
 
-    for (RefPtr<Frame> child = tree()->firstChild(); child; child = child->tree()->nextSibling())
+    for (RefPtr<Frame> child = tree().firstChild(); child; child = child->tree().nextSibling())
         child->setPageAndTextZoomFactors(m_pageZoomFactor, m_textZoomFactor);
 
@@ -989 +989 @@
 void Frame::deviceOrPageScaleFactorChanged()
 {
-    for (RefPtr<Frame> child = tree()->firstChild(); child; child = child->tree()->nextSibling())
+    for (RefPtr<Frame> child = tree().firstChild(); child; child = child->tree().nextSibling())
         child->deviceOrPageScaleFactorChanged();
 
@@ -1002 +1002 @@
 
     unsigned count = 0;
-    for (const Frame* frame = this; frame; frame = frame->tree()->traverseNext()) {
+    for (const Frame* frame = this; frame; frame = frame->tree().traverseNext()) {
         if (frame->document())
             count += frame->document()->wheelEventHandlerCount();
@@ -1017 +1017 @@
         return false;
     bool foundSelfReference = false;
-    for (const Frame* frame = this; frame; frame = frame->tree()->parent()) {
+    for (const Frame* frame = this; frame; frame = frame->tree().parent()) {
         if (equalIgnoringFragmentIdentifier(frame->document()->url(), url)) {
             if (foundSelfReference)

trunk/Source/WebCore/page/Frame.h

@@ -120 +120 @@
         NavigationScheduler& navigationScheduler() const;
         FrameSelection& selection() const;
-        FrameTree* tree() const;
+        FrameTree& tree() const;
         AnimationController& animation() const;
         ScriptController& script();
@@ -317 +317 @@
     }
 
-    inline FrameTree* Frame::tree() const
-    {
-        return &m_treeNode;
+    inline FrameTree& Frame::tree() const
+    {
+        return m_treeNode;
     }
 

trunk/Source/WebCore/page/FrameTree.cpp

@@ -39 +39 @@
 FrameTree::~FrameTree()
 {
-    for (Frame* child = firstChild(); child; child = child->tree()->nextSibling())
+    for (Frame* child = firstChild(); child; child = child->tree().nextSibling())
         child->setView(0);
 }
@@ -51 +51 @@
     }
     m_uniqueName = AtomicString(); // Remove our old frame name so it's not considered in uniqueChildName.
-    m_uniqueName = parent()->tree()->uniqueChildName(name);
+    m_uniqueName = parent()->tree().uniqueChildName(name);
 }
 
@@ -67 +67 @@
 bool FrameTree::transferChild(PassRefPtr<Frame> child)
 {
-    Frame* oldParent = child->tree()->parent();
+    Frame* oldParent = child->tree().parent();
     if (oldParent == m_thisFrame)
         return false; // |child| is already a child of m_thisFrame.
 
     if (oldParent)
-        oldParent->tree()->removeChild(child.get());
+        oldParent->tree().removeChild(child.get());
 
     ASSERT(child->page() == m_thisFrame->page());
-    child->tree()->m_parent = m_thisFrame;
+    child->tree().m_parent = m_thisFrame;
 
     // We need to ensure that the child still has a unique frame name with respect to its new parent.
-    child->tree()->setName(child->tree()->m_name);
+    child->tree().setName(child->tree().m_name);
 
     actuallyAppendChild(child); // Note, on return |child| is null.
@@ -87 +87 @@
 {
     ASSERT(child->page() == m_thisFrame->page());
-    child->tree()->m_parent = m_thisFrame;
+    child->tree().m_parent = m_thisFrame;
     actuallyAppendChild(child); // Note, on return |child| is null.
 }
@@ -93 +93 @@
 void FrameTree::actuallyAppendChild(PassRefPtr<Frame> child)
 {
-    ASSERT(child->tree()->m_parent == m_thisFrame);
+    ASSERT(child->tree().m_parent == m_thisFrame);
     Frame* oldLast = m_lastChild;
     m_lastChild = child.get();
 
     if (oldLast) {
-        child->tree()->m_previousSibling = oldLast;
-        oldLast->tree()->m_nextSibling = child;
+        child->tree().m_previousSibling = oldLast;
+        oldLast->tree().m_nextSibling = child;
     } else
         m_firstChild = child;
@@ -105 +105 @@
     m_scopedChildCount = invalidCount;
 
-    ASSERT(!m_lastChild->tree()->m_nextSibling);
+    ASSERT(!m_lastChild->tree().m_nextSibling);
 }
 
 void FrameTree::removeChild(Frame* child)
 {
-    child->tree()->m_parent = 0;
+    child->tree().m_parent = 0;
 
     // Slightly tricky way to prevent deleting the child until we are done with it, w/o
@@ -116 +116 @@
     // previous and next will then finally deref it.
 
-    RefPtr<Frame>& newLocationForNext = m_firstChild == child ? m_firstChild : child->tree()->m_previousSibling->tree()->m_nextSibling;
-    Frame*& newLocationForPrevious = m_lastChild == child ? m_lastChild : child->tree()->m_nextSibling->tree()->m_previousSibling;
-    swap(newLocationForNext, child->tree()->m_nextSibling);
+    RefPtr<Frame>& newLocationForNext = m_firstChild == child ? m_firstChild : child->tree().m_previousSibling->tree().m_nextSibling;
+    Frame*& newLocationForPrevious = m_lastChild == child ? m_lastChild : child->tree().m_nextSibling->tree().m_previousSibling;
+    swap(newLocationForNext, child->tree().m_nextSibling);
     // For some inexplicable reason, the following line does not compile without the explicit std:: namespace
-    std::swap(newLocationForPrevious, child->tree()->m_previousSibling);
-
-    child->tree()->m_previousSibling = 0;
-    child->tree()->m_nextSibling = 0;
+    std::swap(newLocationForPrevious, child->tree().m_previousSibling);
+
+    child->tree().m_previousSibling = 0;
+    child->tree().m_nextSibling = 0;
 
     m_scopedChildCount = invalidCount;
@@ -147 +147 @@
     Vector<Frame*, 16> chain;
     Frame* frame;
-    for (frame = m_thisFrame; frame; frame = frame->tree()->parent()) {
-        if (frame->tree()->uniqueName().startsWith(framePathPrefix))
+    for (frame = m_thisFrame; frame; frame = frame->tree().parent()) {
+        if (frame->tree().uniqueName().startsWith(framePathPrefix))
             break;
         chain.append(frame);
@@ -155 +155 @@
     name.append(framePathPrefix);
     if (frame) {
-        name.append(frame->tree()->uniqueName().string().substring(framePathPrefixLength,
-            frame->tree()->uniqueName().length() - framePathPrefixLength - framePathSuffixLength));
+        name.append(frame->tree().uniqueName().string().substring(framePathPrefixLength,
+            frame->tree().uniqueName().length() - framePathPrefixLength - framePathSuffixLength));
     }
     for (int i = chain.size() - 1; i >= 0; --i) {
         frame = chain[i];
         name.append('/');
-        name.append(frame->tree()->uniqueName());
+        name.append(frame->tree().uniqueName());
     }
 
@@ -177 +177 @@
 
     unsigned scopedIndex = 0;
-    for (Frame* result = firstChild(); result; result = result->tree()->nextSibling()) {
+    for (Frame* result = firstChild(); result; result = result->tree().nextSibling()) {
         if (result->inScope(scope)) {
             if (scopedIndex == index)
@@ -193 +193 @@
         return 0;
 
-    for (Frame* child = firstChild(); child; child = child->tree()->nextSibling())
-        if (child->tree()->uniqueName() == name && child->inScope(scope))
+    for (Frame* child = firstChild(); child; child = child->tree().nextSibling())
+        if (child->tree().uniqueName() == name && child->inScope(scope))
             return child;
     return 0;
@@ -205 +205 @@
 
     unsigned scopedCount = 0;
-    for (Frame* result = firstChild(); result; result = result->tree()->nextSibling()) {
+    for (Frame* result = firstChild(); result; result = result->tree().nextSibling()) {
         if (result->inScope(scope))
             scopedCount++;
@@ -233 +233 @@
 {
     unsigned count = 0;
-    for (Frame* result = firstChild(); result; result = result->tree()->nextSibling())
+    for (Frame* result = firstChild(); result; result = result->tree().nextSibling())
         ++count;
     return count;
@@ -242 +242 @@
     Frame* result = firstChild();
     for (unsigned i = 0; result && i != index; ++i)
-        result = result->tree()->nextSibling();
+        result = result->tree().nextSibling();
     return result;
 }
@@ -248 +248 @@
 Frame* FrameTree::child(const AtomicString& name) const
 {
-    for (Frame* child = firstChild(); child; child = child->tree()->nextSibling())
-        if (child->tree()->uniqueName() == name)
+    for (Frame* child = firstChild(); child; child = child->tree().nextSibling())
+        if (child->tree().uniqueName() == name)
             return child;
     return 0;
@@ -270 +270 @@
 
     // Search subtree starting with this frame first.
-    for (Frame* frame = m_thisFrame; frame; frame = frame->tree()->traverseNext(m_thisFrame))
-        if (frame->tree()->uniqueName() == name)
+    for (Frame* frame = m_thisFrame; frame; frame = frame->tree().traverseNext(m_thisFrame))
+        if (frame->tree().uniqueName() == name)
             return frame;
 
@@ -281 +281 @@
         return 0;
 
-    for (Frame* frame = page->mainFrame(); frame; frame = frame->tree()->traverseNext())
-        if (frame->tree()->uniqueName() == name)
+    for (Frame* frame = page->mainFrame(); frame; frame = frame->tree().traverseNext())
+        if (frame->tree().uniqueName() == name)
             return frame;
 
@@ -292 +292 @@
         Page* otherPage = *it;
         if (otherPage != page) {
-            for (Frame* frame = otherPage->mainFrame(); frame; frame = frame->tree()->traverseNext()) {
-                if (frame->tree()->uniqueName() == name)
+            for (Frame* frame = otherPage->mainFrame(); frame; frame = frame->tree().traverseNext()) {
+                if (frame->tree().uniqueName() == name)
                     return frame;
             }
@@ -310 +310 @@
         return false;
 
-    for (Frame* frame = m_thisFrame; frame; frame = frame->tree()->parent())
+    for (Frame* frame = m_thisFrame; frame; frame = frame->tree().parent())
         if (frame == ancestor)
             return true;
@@ -320 +320 @@
     Frame* child = firstChild();
     if (child) {
-        ASSERT(!stayWithin || child->tree()->isDescendantOf(stayWithin));
+        ASSERT(!stayWithin || child->tree().isDescendantOf(stayWithin));
         return child;
     }
@@ -329 +329 @@
     Frame* sibling = nextSibling();
     if (sibling) {
-        ASSERT(!stayWithin || sibling->tree()->isDescendantOf(stayWithin));
+        ASSERT(!stayWithin || sibling->tree().isDescendantOf(stayWithin));
         return sibling;
     }
 
     Frame* frame = m_thisFrame;
-    while (!sibling && (!stayWithin || frame->tree()->parent() != stayWithin)) {
-        frame = frame->tree()->parent();
+    while (!sibling && (!stayWithin || frame->tree().parent() != stayWithin)) {
+        frame = frame->tree().parent();
         if (!frame)
             return 0;
-        sibling = frame->tree()->nextSibling();
+        sibling = frame->tree().nextSibling();
     }
 
     if (frame) {
-        ASSERT(!stayWithin || !sibling || sibling->tree()->isDescendantOf(stayWithin));
+        ASSERT(!stayWithin || !sibling || sibling->tree().isDescendantOf(stayWithin));
         return sibling;
     }
@@ -365 +365 @@
 
     if (Frame* prevSibling = previousSibling())
-        return prevSibling->tree()->deepLastChild();
+        return prevSibling->tree().deepLastChild();
     if (Frame* parentFrame = parent())
         return parentFrame;
@@ -380 +380 @@
 {
     Frame* result = m_thisFrame;
-    for (Frame* last = lastChild(); last; last = last->tree()->lastChild())
+    for (Frame* last = lastChild(); last; last = last->tree().lastChild())
         result = last;
 
@@ -389 +389 @@
 {
     Frame* frame = m_thisFrame;
-    for (Frame* parent = m_thisFrame; parent; parent = parent->tree()->parent())
+    for (Frame* parent = m_thisFrame; parent; parent = parent->tree().parent())
         frame = parent;
     return frame;
@@ -423 +423 @@
     printf("  uri=%s\n\n", frame->document()->documentURI().utf8().data());
 
-    for (WebCore::Frame* child = frame->tree()->firstChild(); child; child = child->tree()->nextSibling())
+    for (WebCore::Frame* child = frame->tree().firstChild(); child; child = child->tree().nextSibling())
         printFrames(child, targetFrame, indent + 1);
 }
@@ -434 +434 @@
     }
 
-    printFrames(frame->tree()->top(), frame, 0);
+    printFrames(frame->tree().top(), frame, 0);
 }
 

trunk/Source/WebCore/page/FrameView.cpp

@@ -450 +450 @@
         Page* page = frame().page();
         if (isMainFrameView() && page->settings().textAutosizingEnabled()) {
-            for (Frame* frame = page->mainFrame(); frame; frame = frame->tree()->traverseNext())
+            for (Frame* frame = page->mainFrame(); frame; frame = frame->tree().traverseNext())
                 frame().document()->textAutosizer()->recalculateMultipliers();
         }
@@ -956 +956 @@
 {
 #if USE(ACCELERATED_COMPOSITING)
-    for (Frame* frame = m_frame.get(); frame; frame = frame->tree()->traverseNext(m_frame.get())) {
+    for (Frame* frame = m_frame.get(); frame; frame = frame->tree().traverseNext(m_frame.get())) {
         RenderView* renderView = frame->contentRenderer();
         if (RenderLayerCompositor* compositor = renderView ? &renderView->compositor() : 0) {
@@ -973 +973 @@
 {
 #if USE(ACCELERATED_COMPOSITING)
-    for (Frame* frame = this->frame().tree()->parent(); frame; frame = frame->tree()->parent()) {
+    for (Frame* frame = this->frame().tree().parent(); frame; frame = frame->tree().parent()) {
         if (FrameView* view = frame->view()) {
             if (view->hasCompositedContent())
@@ -1013 +1013 @@
     bool allFramesFlushed = flushCompositingStateForThisFrame(&frame());
     
-    for (Frame* child = frame().tree()->firstChild(); child; child = child->tree()->traverseNext(&frame())) {
+    for (Frame* child = frame().tree().firstChild(); child; child = child->tree().traverseNext(&frame())) {
         bool flushed = child->view()->flushCompositingStateForThisFrame(&frame());
         allFramesFlushed &= flushed;
@@ -1482 +1482 @@
 void FrameView::updateCanBlitOnScrollRecursively()
 {
-    for (Frame* frame = m_frame.get(); frame; frame = frame->tree()->traverseNext(m_frame.get())) {
+    for (Frame* frame = m_frame.get(); frame; frame = frame->tree().traverseNext(m_frame.get())) {
         if (FrameView* view = frame->view())
             view->setCanBlitOnScroll(!view->useSlowRepaints());
@@ -1779 +1779 @@
         // Overlap can affect compositing tests, so if it changes, we need to trigger
         // a layer update in the parent document.
-        if (Frame* parentFrame = frame().tree()->parent()) {
+        if (Frame* parentFrame = frame().tree().parent()) {
             if (RenderView* parentView = parentFrame->contentRenderer()) {
                 RenderLayerCompositor& compositor = parentView->compositor();
@@ -1790 +1790 @@
             // We also need to trigger reevaluation for this and all descendant frames,
             // since a frame uses compositing if any ancestor is compositing.
-            for (Frame* frame = m_frame.get(); frame; frame = frame->tree()->traverseNext(m_frame.get())) {
+            for (Frame* frame = m_frame.get(); frame; frame = frame->tree().traverseNext(m_frame.get())) {
                 if (RenderView* view = frame->contentRenderer()) {
                     RenderLayerCompositor& compositor = view->compositor();
@@ -2281 +2281 @@
 {
     // Don't defer after the initial load of the page has been completed.
-    if (frame().tree()->top()->loader().isComplete())
+    if (frame().tree().top()->loader().isComplete())
         return false;
     Document* document = frame().document();
@@ -2346 +2346 @@
 #if USE(ACCELERATED_COMPOSITING)
     bool isMainLoadProgressing = frame().page()->progress().isMainLoadProgressing();
-    for (Frame* frame = m_frame.get(); frame; frame = frame->tree()->traverseNext(m_frame.get())) {
+    for (Frame* frame = m_frame.get(); frame; frame = frame->tree().traverseNext(m_frame.get())) {
         if (RenderView* renderView = frame->contentRenderer())
             renderView->compositor().setLayerFlushThrottlingEnabled(isMainLoadProgressing);
@@ -2505 +2505 @@
 void FrameView::serviceScriptedAnimations(double monotonicAnimationStartTime)
 {
-    for (Frame* frame = m_frame.get(); frame; frame = frame->tree()->traverseNext()) {
+    for (Frame* frame = m_frame.get(); frame; frame = frame->tree().traverseNext()) {
         frame->view()->serviceScrollAnimations();
         frame->animation().serviceAnimations();
@@ -2511 +2511 @@
 
     Vector<RefPtr<Document> > documents;
-    for (Frame* frame = m_frame.get(); frame; frame = frame->tree()->traverseNext())
+    for (Frame* frame = m_frame.get(); frame; frame = frame->tree().traverseNext())
         documents.append(frame->document());
 
@@ -2551 +2551 @@
 void FrameView::updateBackgroundRecursively(const Color& backgroundColor, bool transparent)
 {
-    for (Frame* frame = m_frame.get(); frame; frame = frame->tree()->traverseNext(m_frame.get())) {
+    for (Frame* frame = m_frame.get(); frame; frame = frame->tree().traverseNext(m_frame.get())) {
         if (FrameView* view = frame->view()) {
             view->setTransparent(transparent);
@@ -3386 +3386 @@
         return 0;
 
-    if (Frame* parentFrame = frame().tree()->parent())
+    if (Frame* parentFrame = frame().tree().parent())
         return parentFrame->view();
 
@@ -3624 +3624 @@
     // after we paint the snapshot.
     if (shouldPaintSelection == ExcludeSelection) {
-        for (Frame* frame = m_frame.get(); frame; frame = frame->tree()->traverseNext(m_frame.get())) {
+        for (Frame* frame = m_frame.get(); frame; frame = frame->tree().traverseNext(m_frame.get())) {
             if (RenderView* root = frame->contentRenderer())
                 root->clearSelection();
@@ -3640 +3640 @@
     // Restore selection.
     if (shouldPaintSelection == ExcludeSelection) {
-        for (Frame* frame = m_frame.get(); frame; frame = frame->tree()->traverseNext(m_frame.get()))
+        for (Frame* frame = m_frame.get(); frame; frame = frame->tree().traverseNext(m_frame.get()))
             frame->selection().updateAppearance();
     }
@@ -4017 +4017 @@
 
 #if USE(ACCELERATED_COMPOSITING)
-    for (Frame* frame = m_frame->tree()->top(); frame; frame = frame->tree()->traverseNext()) {
+    for (Frame* frame = m_frame->tree().top(); frame; frame = frame->tree().traverseNext()) {
         if (RenderView* renderView = frame->contentRenderer())
             renderView->compositor().setTracksRepaints(trackRepaints);
@@ -4146 +4146 @@
 void FrameView::notifyWidgetsInAllFrames(WidgetNotification notification)
 {
-    for (Frame* frame = m_frame.get(); frame; frame = frame->tree()->traverseNext(m_frame.get())) {
+    for (Frame* frame = m_frame.get(); frame; frame = frame->tree().traverseNext(m_frame.get())) {
         if (RenderView* root = frame->contentRenderer())
             root->notifyWidgets(notification);

trunk/Source/WebCore/page/Location.cpp

@@ -130 +130 @@
     if (!m_frame)
         return origins.release();
-    for (Frame* frame = m_frame->tree()->parent(); frame; frame = frame->tree()->parent())
+    for (Frame* frame = m_frame->tree().parent(); frame; frame = frame->tree().parent())
         origins->append(frame->document()->securityOrigin()->toString());
     return origins.release();

trunk/Source/WebCore/page/Page.cpp

@@ -104 +104 @@
     HashSet<Page*>::iterator end = allPages->end();
     for (HashSet<Page*>::iterator it = allPages->begin(); it != end; ++it) {
-        for (Frame* frame = (*it)->mainFrame(); frame; frame = frame->tree()->traverseNext())
+        for (Frame* frame = (*it)->mainFrame(); frame; frame = frame->tree().traverseNext())
             frames.append(frame);
         InspectorInstrumentation::networkStateChanged(*it);
@@ -213 +213 @@
     allPages->remove(this);
     
-    for (Frame* frame = mainFrame(); frame; frame = frame->tree()->traverseNext()) {
+    for (Frame* frame = mainFrame(); frame; frame = frame->tree().traverseNext()) {
         frame->willDetachPage();
         frame->detachFromPage();
@@ -243 +243 @@
 {
     ArenaSize total(0, 0);
-    for (Frame* frame = mainFrame(); frame; frame = frame->tree()->traverseNext()) {
+    for (Frame* frame = mainFrame(); frame; frame = frame->tree().traverseNext()) {
         if (!frame->document())
             continue;
@@ -474 +474 @@
     HashSet<Page*>::iterator end = allPages->end();
     for (HashSet<Page*>::iterator it = allPages->begin(); it != end; ++it)
-        for (Frame* frame = (*it)->mainFrame(); frame; frame = frame->tree()->traverseNext()) {
+        for (Frame* frame = (*it)->mainFrame(); frame; frame = frame->tree().traverseNext()) {
             // If a change in the global environment has occurred, we need to
             // make sure all the properties a recomputed, therefore we invalidate
@@ -486 +486 @@
 void Page::setNeedsRecalcStyleInAllFrames()
 {
-    for (Frame* frame = mainFrame(); frame; frame = frame->tree()->traverseNext())
+    for (Frame* frame = mainFrame(); frame; frame = frame->tree().traverseNext())
         frame->document()->styleResolverChanged(DeferRecalcStyle);
 }
@@ -510 +510 @@
             continue;
         
-        for (Frame* frame = (*it)->mainFrame(); frame; frame = frame->tree()->traverseNext()) {
+        for (Frame* frame = (*it)->mainFrame(); frame; frame = frame->tree().traverseNext()) {
             if (frame->loader().subframeLoader()->containsPlugins())
                 framesNeedingReload.append(frame);
@@ -529 +529 @@
 inline MediaCanStartListener* Page::takeAnyMediaCanStartListener()
 {
-    for (Frame* frame = mainFrame(); frame; frame = frame->tree()->traverseNext()) {
+    for (Frame* frame = mainFrame(); frame; frame = frame->tree().traverseNext()) {
         if (MediaCanStartListener* listener = frame->document()->takeAnyMediaCanStartListener())
             return listener;
@@ -554 +554 @@
 {
     return forward
-        ? curr->tree()->traverseNextWithWrap(wrapFlag)
-        : curr->tree()->traversePreviousWithWrap(wrapFlag);
+        ? curr->tree().traverseNextWithWrap(wrapFlag)
+        : curr->tree().traversePreviousWithWrap(wrapFlag);
 }
 
@@ -727 +727 @@
 
     m_defersLoading = defers;
-    for (Frame* frame = mainFrame(); frame; frame = frame->tree()->traverseNext())
+    for (Frame* frame = mainFrame(); frame; frame = frame->tree().traverseNext())
         frame->loader().setDefersLoading(defers);
 }
@@ -755 +755 @@
 
     m_mediaVolume = volume;
-    for (Frame* frame = mainFrame(); frame; frame = frame->tree()->traverseNext()) {
+    for (Frame* frame = mainFrame(); frame; frame = frame->tree().traverseNext()) {
         frame->document()->mediaVolumeDidChange();
     }
@@ -816 +816 @@
 #endif
 
-    for (Frame* frame = mainFrame(); frame; frame = frame->tree()->traverseNext())
+    for (Frame* frame = mainFrame(); frame; frame = frame->tree().traverseNext())
         frame->editor().deviceScaleFactorChanged();
 
@@ -842 +842 @@
     view->finishCurrentScrollAnimations();
     
-    for (Frame* frame = mainFrame(); frame; frame = frame->tree()->traverseNext()) {
+    for (Frame* frame = mainFrame(); frame; frame = frame->tree().traverseNext()) {
         FrameView* frameView = frame->view();
         if (!frameView)
@@ -917 +917 @@
     m_isOnscreen = true;
 
-    for (Frame* frame = mainFrame(); frame; frame = frame->tree()->traverseNext()) {
+    for (Frame* frame = mainFrame(); frame; frame = frame->tree().traverseNext()) {
         if (FrameView* frameView = frame->view())
             frameView->didMoveOnscreen();
@@ -929 +929 @@
     m_isOnscreen = false;
 
-    for (Frame* frame = mainFrame(); frame; frame = frame->tree()->traverseNext()) {
+    for (Frame* frame = mainFrame(); frame; frame = frame->tree().traverseNext()) {
         if (FrameView* frameView = frame->view())
             frameView->willMoveOffscreen();
@@ -944 +944 @@
     m_isInWindow = isInWindow;
 
-    for (Frame* frame = mainFrame(); frame; frame = frame->tree()->traverseNext()) {
+    for (Frame* frame = mainFrame(); frame; frame = frame->tree().traverseNext()) {
         if (FrameView* frameView = frame->view())
             frameView->setIsInWindow(isInWindow);
@@ -953 +953 @@
 {
     m_scriptedAnimationsSuspended = true;
-    for (Frame* frame = mainFrame(); frame; frame = frame->tree()->traverseNext()) {
+    for (Frame* frame = mainFrame(); frame; frame = frame->tree().traverseNext()) {
         if (frame->document())
             frame->document()->suspendScriptedAnimationControllerCallbacks();
@@ -962 +962 @@
 {
     m_scriptedAnimationsSuspended = false;
-    for (Frame* frame = mainFrame(); frame; frame = frame->tree()->traverseNext()) {
+    for (Frame* frame = mainFrame(); frame; frame = frame->tree().traverseNext()) {
         if (frame->document())
             frame->document()->resumeScriptedAnimationControllerCallbacks();
@@ -999 +999 @@
     }
 
-    for (Frame* frame = mainFrame(); frame; frame = frame->tree()->traverseNext()) {
+    for (Frame* frame = mainFrame(); frame; frame = frame->tree().traverseNext()) {
         if (frame->document())
             frame->document()->styleSheetCollection()->updatePageUserSheet();
@@ -1072 +1072 @@
         if (page->m_group != group)
             continue;
-        for (Frame* frame = page->m_mainFrame.get(); frame; frame = frame->tree()->traverseNext())
+        for (Frame* frame = page->m_mainFrame.get(); frame; frame = frame->tree().traverseNext())
             frame->document()->visitedLinkState().invalidateStyleForAllLinks();
     }
@@ -1088 +1088 @@
         if (page->m_group != group)
             continue;
-        for (Frame* frame = page->m_mainFrame.get(); frame; frame = frame->tree()->traverseNext())
+        for (Frame* frame = page->m_mainFrame.get(); frame; frame = frame->tree().traverseNext())
             frame->document()->visitedLinkState().invalidateStyleForLink(linkHash);
     }
@@ -1109 +1109 @@
     m_debugger = debugger;
 
-    for (Frame* frame = m_mainFrame.get(); frame; frame = frame->tree()->traverseNext())
+    for (Frame* frame = m_mainFrame.get(); frame; frame = frame->tree().traverseNext())
         frame->script().attachDebugger(m_debugger);
 }
@@ -1153 +1153 @@
         return;
 
-    for (RefPtr<Frame> frame = mainFrame(); frame; frame = frame->tree()->traverseNext())
+    for (RefPtr<Frame> frame = mainFrame(); frame; frame = frame->tree().traverseNext())
         frame->loader().tellClientAboutPastMemoryCacheLoads();
 }
@@ -1161 +1161 @@
     double oldTimerInterval = m_minimumTimerInterval;
     m_minimumTimerInterval = minimumTimerInterval;
-    for (Frame* frame = mainFrame(); frame; frame = frame->tree()->traverseNextWithWrap(false)) {
+    for (Frame* frame = mainFrame(); frame; frame = frame->tree().traverseNextWithWrap(false)) {
         if (frame->document())
             frame->document()->adjustMinimumTimerInterval(oldTimerInterval);
@@ -1178 +1178 @@
 
     m_timerAlignmentInterval = interval;
-    for (Frame* frame = mainFrame(); frame; frame = frame->tree()->traverseNextWithWrap(false)) {
+    for (Frame* frame = mainFrame(); frame; frame = frame->tree().traverseNextWithWrap(false)) {
         if (frame->document())
             frame->document()->didChangeTimerAlignmentInterval();
@@ -1191 +1191 @@
 void Page::dnsPrefetchingStateChanged()
 {
-    for (Frame* frame = mainFrame(); frame; frame = frame->tree()->traverseNext())
+    for (Frame* frame = mainFrame(); frame; frame = frame->tree().traverseNext())
         frame->document()->initDNSPrefetch();
 }
@@ -1197 +1197 @@
 void Page::collectPluginViews(Vector<RefPtr<PluginViewBase>, 32>& pluginViewBases)
 {
-    for (Frame* frame = mainFrame(); frame; frame = frame->tree()->traverseNext()) {
+    for (Frame* frame = mainFrame(); frame; frame = frame->tree().traverseNext()) {
         FrameView* view = frame->view();
         if (!view)
@@ -1216 +1216 @@
 void Page::storageBlockingStateChanged()
 {
-    for (Frame* frame = mainFrame(); frame; frame = frame->tree()->traverseNext())
+    for (Frame* frame = mainFrame(); frame; frame = frame->tree().traverseNext())
         frame->document()->storageBlockingStateDidChange();
 
@@ -1232 +1232 @@
     bool privateBrowsingEnabled = m_settings->privateBrowsingEnabled();
 
-    for (Frame* frame = mainFrame(); frame; frame = frame->tree()->traverseNext())
+    for (Frame* frame = mainFrame(); frame; frame = frame->tree().traverseNext())
         frame->document()->privateBrowsingStateDidChange();
 
@@ -1250 +1250 @@
 
     int subframeCount = 0;
-    for (Frame* frame = mainFrame(); frame; frame = frame->tree()->traverseNext())
+    for (Frame* frame = mainFrame(); frame; frame = frame->tree().traverseNext())
         ++subframeCount;
 
@@ -1477 +1477 @@
 void Page::suspendActiveDOMObjectsAndAnimations()
 {
-    for (Frame* frame = mainFrame(); frame; frame = frame->tree()->traverseNext())
+    for (Frame* frame = mainFrame(); frame; frame = frame->tree().traverseNext())
         frame->suspendActiveDOMObjectsAndAnimations();
 }
@@ -1483 +1483 @@
 void Page::resumeActiveDOMObjectsAndAnimations()
 {
-    for (Frame* frame = mainFrame(); frame; frame = frame->tree()->traverseNext())
+    for (Frame* frame = mainFrame(); frame; frame = frame->tree().traverseNext())
         frame->resumeActiveDOMObjectsAndAnimations();
 }
@@ -1560 +1560 @@
 void Page::captionPreferencesChanged()
 {
-    for (Frame* frame = mainFrame(); frame; frame = frame->tree()->traverseNext())
+    for (Frame* frame = mainFrame(); frame; frame = frame->tree().traverseNext())
         frame->document()->captionPreferencesChanged();
 }

trunk/Source/WebCore/page/PageGroup.cpp

@@ -404 +404 @@
     HashSet<Page*>::const_iterator end = m_pages.end();
     for (HashSet<Page*>::const_iterator it = m_pages.begin(); it != end; ++it) {
-        for (Frame* frame = (*it)->mainFrame(); frame; frame = frame->tree()->traverseNext()) {
+        for (Frame* frame = (*it)->mainFrame(); frame; frame = frame->tree().traverseNext()) {
             frame->document()->styleSheetCollection()->invalidateInjectedStyleSheetCache();
             frame->document()->styleResolverChanged(DeferRecalcStyle);

trunk/Source/WebCore/page/PageGroupLoadDeferrer.cpp

@@ -47 +47 @@
                 // This code is not logically part of load deferring, but we do not want JS code executed beneath modal
                 // windows or sheets, which is exactly when PageGroupLoadDeferrer is used.
-                for (Frame* frame = otherPage->mainFrame(); frame; frame = frame->tree()->traverseNext())
+                for (Frame* frame = otherPage->mainFrame(); frame; frame = frame->tree().traverseNext())
                     frame->document()->suspendScheduledTasks(ActiveDOMObject::WillDeferLoading);
             }
@@ -65 +65 @@
             page->setDefersLoading(false);
 
-            for (Frame* frame = page->mainFrame(); frame; frame = frame->tree()->traverseNext())
+            for (Frame* frame = page->mainFrame(); frame; frame = frame->tree().traverseNext())
                 frame->document()->resumeScheduledTasks(ActiveDOMObject::WillDeferLoading);
         }

trunk/Source/WebCore/page/PageSerializer.cpp

@@ -250 +250 @@
     }
 
-    for (Frame* childFrame = frame->tree()->firstChild(); childFrame; childFrame = childFrame->tree()->nextSibling())
+    for (Frame* childFrame = frame->tree().firstChild(); childFrame; childFrame = childFrame->tree().nextSibling())
         serializeFrame(childFrame);
 }

trunk/Source/WebCore/page/PageThrottler.cpp

@@ -62 +62 @@
     m_page->chrome().client().decrementActivePageCount();
 
-    for (Frame* frame = m_page->mainFrame(); frame; frame = frame->tree()->traverseNext()) {
+    for (Frame* frame = m_page->mainFrame(); frame; frame = frame->tree().traverseNext()) {
         if (frame->document())
             frame->document()->scriptedAnimationControllerSetThrottled(true);
@@ -81 +81 @@
         m_page->chrome().client().incrementActivePageCount();
     
-    for (Frame* frame = m_page->mainFrame(); frame; frame = frame->tree()->traverseNext()) {
+    for (Frame* frame = m_page->mainFrame(); frame; frame = frame->tree().traverseNext()) {
         if (frame->document())
             frame->document()->scriptedAnimationControllerSetThrottled(false);

trunk/Source/WebCore/page/Settings.cpp

@@ -53 +53 @@
 static void setImageLoadingSettings(Page* page)
 {
-    for (Frame* frame = page->mainFrame(); frame; frame = frame->tree()->traverseNext()) {
+    for (Frame* frame = page->mainFrame(); frame; frame = frame->tree().traverseNext()) {
         frame->document()->cachedResourceLoader()->setImagesEnabled(page->settings().areImagesEnabled());
         frame->document()->cachedResourceLoader()->setAutoLoadImages(page->settings().loadsImagesAutomatically());
@@ -322 +322 @@
 
     // FIXME: I wonder if this needs to traverse frames like in WebViewImpl::resize, or whether there is only one document per Settings instance?
-    for (Frame* frame = m_page->mainFrame(); frame; frame = frame->tree()->traverseNext())
+    for (Frame* frame = m_page->mainFrame(); frame; frame = frame->tree().traverseNext())
         frame->document()->textAutosizer()->recalculateMultipliers();
 

trunk/Source/WebCore/page/SpatialNavigation.cpp

@@ -507 +507 @@
 {
     LayoutRect rect = initialRect;
-    for (Frame* frame = initialFrame; frame; frame = frame->tree()->parent()) {
+    for (Frame* frame = initialFrame; frame; frame = frame->tree().parent()) {
         if (Element* element = frame->ownerElement()) {
             do {

trunk/Source/WebCore/page/animation/AnimationController.cpp

@@ -270 +270 @@
 
     // Traverse subframes
-    for (Frame* child = m_frame->tree()->firstChild(); child; child = child->tree()->nextSibling())
+    for (Frame* child = m_frame->tree().firstChild(); child; child = child->tree().nextSibling())
         child->animation().suspendAnimations();
 
@@ -284 +284 @@
 
     // Traverse subframes
-    for (Frame* child = m_frame->tree()->firstChild(); child; child = child->tree()->nextSibling())
+    for (Frame* child = m_frame->tree().firstChild(); child; child = child->tree().nextSibling())
         child->animation().resumeAnimations();
 

trunk/Source/WebCore/page/mac/PageMac.cpp

@@ -44 +44 @@
     m_scheduledRunLoopPairs->add(pair);
 
-    for (Frame* frame = m_mainFrame.get(); frame; frame = frame->tree()->traverseNext()) {
+    for (Frame* frame = m_mainFrame.get(); frame; frame = frame->tree().traverseNext()) {
         if (DocumentLoader* documentLoader = frame->loader().documentLoader())
             documentLoader->schedule(pair.get());
@@ -63 +63 @@
     m_scheduledRunLoopPairs->remove(pair);
 
-    for (Frame* frame = m_mainFrame.get(); frame; frame = frame->tree()->traverseNext()) {
+    for (Frame* frame = m_mainFrame.get(); frame; frame = frame->tree().traverseNext()) {
         if (DocumentLoader* documentLoader = frame->loader().documentLoader())
             documentLoader->unschedule(pair.get());

trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.cpp

@@ -152 +152 @@
     }
 
-    FrameTree* tree = frame->tree();
-    for (Frame* subFrame = tree->firstChild(); subFrame; subFrame = subFrame->tree()->nextSibling())
-        nonFastScrollableRegion.unite(computeNonFastScrollableRegion(subFrame, offset));
+    for (Frame* subframe = frame->tree().firstChild(); subframe; subframe = subframe->tree().nextSibling())
+        nonFastScrollableRegion.unite(computeNonFastScrollableRegion(subframe, offset));
 
     return nonFastScrollableRegion;
@@ -236 +235 @@
     unsigned wheelEventHandlerCount = 0;
 
-    for (Frame* frame = m_page->mainFrame(); frame; frame = frame->tree()->traverseNext()) {
+    for (Frame* frame = m_page->mainFrame(); frame; frame = frame->tree().traverseNext()) {
         if (frame->document())
             wheelEventHandlerCount += frame->document()->wheelEventHandlerCount();

trunk/Source/WebCore/plugins/PluginView.cpp

@@ -423 +423 @@
     // displayed unless the loads are in the same frame as the plugin.
     const String& targetFrameName = request->frameLoadRequest().frameName();
-    if (m_parentFrame->loader().documentLoader() != m_parentFrame->loader().activeDocumentLoader() && (targetFrameName.isNull() || m_parentFrame->tree()->find(targetFrameName) != m_parentFrame))
+    if (m_parentFrame->loader().documentLoader() != m_parentFrame->loader().activeDocumentLoader() && (targetFrameName.isNull() || m_parentFrame->tree().find(targetFrameName) != m_parentFrame))
         return;
 
@@ -461 +461 @@
     // Targeted JavaScript requests are only allowed on the frame that contains the JavaScript plugin
     // and this has been made sure in ::load.
-    ASSERT(targetFrameName.isEmpty() || m_parentFrame->tree()->find(targetFrameName) == m_parentFrame);
+    ASSERT(targetFrameName.isEmpty() || m_parentFrame->tree().find(targetFrameName) == m_parentFrame);
     
     // Executing a script can cause the plugin view to be destroyed, so we keep a reference to it.
@@ -529 +529 @@
 
         // For security reasons, only allow JS requests to be made on the frame that contains the plug-in.
-        if (!targetFrameName.isNull() && m_parentFrame->tree()->find(targetFrameName) != m_parentFrame)
+        if (!targetFrameName.isNull() && m_parentFrame->tree().find(targetFrameName) != m_parentFrame)
             return NPERR_INVALID_PARAM;
     } else if (!m_parentFrame->document()->securityOrigin()->canDisplay(url))

trunk/Source/WebCore/rendering/HitTestResult.cpp

@@ -174 +174 @@
         return 0;
 
-    return frame->tree()->find(m_innerURLElement->target());
+    return frame->tree().find(m_innerURLElement->target());
 }
 

trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp

@@ -464 +464 @@
 RenderLayerCompositor* RenderLayerCompositor::enclosingCompositorFlushingLayers() const
 {
-    for (Frame* frame = &m_renderView.frameView().frame(); frame; frame = frame->tree()->parent()) {
+    for (Frame* frame = &m_renderView.frameView().frame(); frame; frame = frame->tree().parent()) {
         RenderLayerCompositor* compositor = frame->contentRenderer() ? &frame->contentRenderer()->compositor() : 0;
         if (compositor->isFlushingLayers())
@@ -573 +573 @@
         Frame& frame = m_renderView.frameView().frame();
         bool isMainFrame = !m_renderView.document()->ownerElement();
-        LOG(Compositing, "\nUpdate %d of %s.\n", m_rootLayerUpdateCount, isMainFrame ? "main frame" : frame.tree()->uniqueName().string().utf8().data());
+        LOG(Compositing, "\nUpdate %d of %s.\n", m_rootLayerUpdateCount, isMainFrame ? "main frame" : frame.tree().uniqueName().string().utf8().data());
     }
 #endif
@@ -2979 +2979 @@
     Frame& frame = m_renderView.frameView().frame();
 
-    for (Frame* child = frame.tree()->firstChild(); child; child = child->tree()->traverseNext(&frame)) {
+    for (Frame* child = frame.tree().firstChild(); child; child = child->tree().traverseNext(&frame)) {
         if (child->document() && child->document()->ownerElement())
             child->document()->ownerElement()->scheduleSetNeedsStyleRecalc(SyntheticStyleChange);

trunk/Source/WebCore/rendering/TextAutosizer.cpp

@@ -123 +123 @@
     // frame doesn't get scaled to less than overview scale), in CSS pixels.
     windowInfo.minLayoutSize = mainFrame->view()->layoutSize();
-    for (Frame* frame = m_document->frame(); frame; frame = frame->tree()->parent()) {
+    for (Frame* frame = m_document->frame(); frame; frame = frame->tree().parent()) {
         if (!frame->view()->isInChildFrameWithFrameFlattening())
             windowInfo.minLayoutSize = windowInfo.minLayoutSize.shrunkTo(frame->view()->layoutSize());

trunk/Source/WebCore/storage/StorageEventDispatcher.cpp

@@ -48 +48 @@
 
     // Send events only to our page.
-    for (Frame* frame = page->mainFrame(); frame; frame = frame->tree()->traverseNext()) {
+    for (Frame* frame = page->mainFrame(); frame; frame = frame->tree().traverseNext()) {
         if (sourceFrame != frame && frame->document()->securityOrigin()->equal(securityOrigin))
             frames.append(frame);
@@ -67 +67 @@
     const HashSet<Page*>& pages = page->group().pages();
     for (HashSet<Page*>::const_iterator it = pages.begin(), end = pages.end(); it != end; ++it) {
-        for (Frame* frame = (*it)->mainFrame(); frame; frame = frame->tree()->traverseNext()) {
+        for (Frame* frame = (*it)->mainFrame(); frame; frame = frame->tree().traverseNext()) {
             if (sourceFrame != frame && frame->document()->securityOrigin()->equal(securityOrigin))
                 frames.append(frame);

trunk/Source/WebCore/svg/SVGSVGElement.cpp

@@ -189 +189 @@
         return 1;
 
-    FrameTree* frameTree = frame->tree();
-    ASSERT(frameTree);
-
     // The behaviour of currentScale() is undefined, when we're dealing with non-standalone SVG documents.
     // If the svg is embedded, the scaling is handled by the host renderer, so when asking from inside
     // the SVG document, a scale value of 1 seems reasonable, as it doesn't know anything about the parent scale.
-    return frameTree->parent() ? 1 : frame->pageZoomFactor();
+    return frame->tree().parent() ? 1 : frame->pageZoomFactor();
 }
 
@@ -207 +204 @@
         return;
 
-    FrameTree* frameTree = frame->tree();
-    ASSERT(frameTree);
-
     // The behaviour of setCurrentScale() is undefined, when we're dealing with non-standalone SVG documents.
     // We choose the ignore this call, it's pretty useless to support calling setCurrentScale() from within
     // an embedded SVG document, for the same reasons as in currentScale() - needs resolution by SVG WG.
-    if (frameTree->parent())
+    if (frame->tree().parent())
         return;
 

trunk/Source/WebCore/testing/Internals.cpp

@@ -706 +706 @@
         return Vector<String>();
     }
-    String uniqueName = frame()->tree()->uniqueName();
+    String uniqueName = frame()->tree().uniqueName();
     if (mainItem->target() != uniqueName && !mainItem->childItemWithTarget(uniqueName)) {
         ec = INVALID_ACCESS_ERR;
@@ -721 +721 @@
         return;
     }
-    String uniqueName = frame()->tree()->uniqueName();
+    String uniqueName = frame()->tree().uniqueName();
     if (mainItem->target() == uniqueName)
         mainItem->setDocumentState(state);
@@ -1579 +1579 @@
         count += frame->view()->scrollableAreas()->size();
 
-    for (Frame* child = frame->tree()->firstChild(); child; child = child->tree()->nextSibling()) {
+    for (Frame* child = frame->tree().firstChild(); child; child = child->tree().nextSibling()) {
         if (child->view() && child->view()->scrollableAreas())
             count += child->view()->scrollableAreas()->size();

trunk/Source/WebCore/xml/parser/XMLDocumentParserLibxml2.cpp

@@ -91 +91 @@
         return false;
 
-    if (document->frame()->tree()->parent())
+    if (document->frame()->tree().parent())
         return false; // This document is not in a top frame
 

trunk/Source/WebKit/blackberry/Api/WebPage.cpp

@@ -944 +944 @@
     Vector<RefPtr<Frame>, 10> childFrames;
 
-    for (RefPtr<Frame> childFrame = frame->tree()->firstChild(); childFrame; childFrame = childFrame->tree()->nextSibling())
+    for (RefPtr<Frame> childFrame = frame->tree().firstChild(); childFrame; childFrame = childFrame->tree().nextSibling())
         childFrames.append(childFrame);
 
@@ -975 +975 @@
 
     Vector<RefPtr<Frame>, 10> childFrames;
-    for (RefPtr<Frame> childFrame = frame->tree()->firstChild(); childFrame; childFrame = childFrame->tree()->nextSibling())
+    for (RefPtr<Frame> childFrame = frame->tree().firstChild(); childFrame; childFrame = childFrame->tree().nextSibling())
         childFrames.append(childFrame);
 
@@ -3522 +3522 @@
     if (m_mainFrame->orientation() == orientation)
         return;
-    for (RefPtr<Frame> frame = m_mainFrame; frame; frame = frame->tree()->traverseNext())
+    for (RefPtr<Frame> frame = m_mainFrame; frame; frame = frame->tree().traverseNext())
         frame->sendOrientationChangeEvent(orientation);
 #endif

trunk/Source/WebKit/blackberry/ChangeLog

@@ +1 @@
+2013-08-24  Darin Adler  <darin@apple.com>
+
+        Frame::tree should return a reference instead of a pointer
+        https://bugs.webkit.org/show_bug.cgi?id=120259
+
+        Reviewed by Andreas Kling.
+
+        * Api/WebPage.cpp:
+        (BlackBerry::WebKit::closeURLRecursively):
+        (BlackBerry::WebKit::enableCrossSiteXHRRecursively):
+        (BlackBerry::WebKit::WebPagePrivate::setScreenOrientation):
+        * WebCoreSupport/FrameLoaderClientBlackBerry.cpp:
+        (WebCore::FrameLoaderClientBlackBerry::createFrame):
+        * WebKitSupport/DOMSupport.cpp:
+        (BlackBerry::WebKit::DOMSupport::convertPointToFrame):
+        (BlackBerry::WebKit::DOMSupport::incrementFrame):
+        Use tree(). instead of tree()->.
+
 2013-08-20  Pratik Solanki  <psolanki@apple.com>
 

trunk/Source/WebKit/blackberry/WebCoreSupport/FrameLoaderClientBlackBerry.cpp

@@ -801 +801 @@
         frameView->setMarginHeight(marginHeight);
 
-    childFrame->tree()->setName(name);
-    m_frame->tree()->appendChild(childFrame);
+    childFrame->tree().setName(name);
+    m_frame->tree().appendChild(childFrame);
     childFrame->init();
 
-    if (!childFrame->tree()->parent())
+    if (!childFrame->tree().parent())
         return 0;
 
     m_frame->loader().loadURLIntoChildFrame(url, referrer, childFrame.get());
 
-    if (!childFrame->tree()->parent())
+    if (!childFrame->tree().parent())
         return 0;
 

trunk/Source/WebKit/blackberry/WebKitSupport/DOMSupport.cpp

@@ -460 +460 @@
 
     ASSERT(sourceFrame->view() && targetFrame->view());
-    ASSERT(targetFrame->tree());
-
-    Frame* targetFrameParent = targetFrame->tree()->parent();
+
+    Frame* targetFrameParent = targetFrame->tree().parent();
     IntRect targetFrameRect = targetFrame->view()->frameRect();
     IntPoint targetPoint = point;
@@ -570 +569 @@
 {
     return forward
-        ? curr->tree()->traverseNextWithWrap(wrapFlag)
-        : curr->tree()->traversePreviousWithWrap(wrapFlag);
+        ? curr->tree().traverseNextWithWrap(wrapFlag)
+        : curr->tree().traversePreviousWithWrap(wrapFlag);
 }
 

trunk/Source/WebKit/efl/ChangeLog

@@ +1 @@
+2013-08-24  Darin Adler  <darin@apple.com>
+
+        Frame::tree should return a reference instead of a pointer
+        https://bugs.webkit.org/show_bug.cgi?id=120259
+
+        Reviewed by Andreas Kling.
+
+        * WebCoreSupport/DumpRenderTreeSupportEfl.cpp:
+        (DumpRenderTreeSupportEfl::clearFrameName):
+        (DumpRenderTreeSupportEfl::frameChildren):
+        (DumpRenderTreeSupportEfl::frameParent):
+        * ewk/ewk_frame.cpp:
+        (_ewk_frame_children_iterator_next):
+        (ewk_frame_child_find):
+        (ewk_frame_name_get):
+        (ewk_frame_child_add):
+        * ewk/ewk_view.cpp:
+        (ewk_view_frame_create):
+        Use tree(). instead of tree()->.
+
 2013-08-22  Andreas Kling  <akling@apple.com>
 

trunk/Source/WebKit/efl/WebCoreSupport/DumpRenderTreeSupportEfl.cpp

@@ -113 +113 @@
     DRT_SUPPORT_FRAME_GET_OR_RETURN(ewkFrame, frame);
 
-    frame->tree()->clearName();
+    frame->tree().clearName();
 }
 
@@ -136 +136 @@
     Eina_List* childFrames = 0;
 
-    for (unsigned index = 0; index < frame->tree()->childCount(); index++) {
-        WebCore::Frame *childFrame = frame->tree()->child(index);
+    for (unsigned index = 0; index < frame->tree().childCount(); index++) {
+        WebCore::Frame *childFrame = frame->tree().child(index);
         WebCore::FrameLoaderClientEfl& client = static_cast<WebCore::FrameLoaderClientEfl&>(childFrame->loader().client());
 
@@ -150 +150 @@
     DRT_SUPPORT_FRAME_GET_OR_RETURN(ewkFrame, frame, 0);
 
-    return frame->tree()->parent();
+    return frame->tree().parent();
 }
 

trunk/Source/WebKit/efl/ewk/ewk_frame.cpp

@@ -162 +162 @@
     EINA_SAFETY_ON_NULL_RETURN_VAL(smartData->frame, false);
 
-    WebCore::FrameTree* tree = smartData->frame->tree(); // check if it's still valid
-    EINA_SAFETY_ON_NULL_RETURN_VAL(tree, false);
-
-    if (iterator->currentIndex < tree->childCount()) {
-        *data = EWKPrivate::kitFrame(tree->child(iterator->currentIndex++));
+    if (iterator->currentIndex < smartData->frame->tree().childCount()) {
+        *data = EWKPrivate::kitFrame(smartData->frame->tree().child(iterator->currentIndex++));
         return true;
     }
@@ -333 +330 @@
     EINA_SAFETY_ON_NULL_RETURN_VAL(smartData->frame, 0);
     WTF::String frameName = WTF::String::fromUTF8(name);
-    return EWKPrivate::kitFrame(smartData->frame->tree()->find(WTF::AtomicString(frameName)));
+    return EWKPrivate::kitFrame(smartData->frame->tree().find(WTF::AtomicString(frameName)));
 }
 
@@ -367 +364 @@
     }
 
-    const WTF::String frameName = smartData->frame->tree()->uniqueName();
+    const WTF::String frameName = smartData->frame->tree().uniqueName();
 
     if ((smartData->name) && (smartData->name == frameName))
@@ -1142 +1139 @@
 
     coreFrame = child.get();
-    if (coreFrame->tree())
-        coreFrame->tree()->setName(name);
-    else
-        ERR("no tree for child object");
-    smartData->frame->tree()->appendChild(child);
+    coreFrame->tree().setName(name);
+    smartData->frame->tree().appendChild(child);
 
     if (!ewk_frame_init(frame, smartData->view, coreFrame)) {
@@ -1168 +1162 @@
     // The frame's onload handler may have removed it from the document.
     // See fast/dom/null-page-show-modal-dialog-crash.html for an example.
-    if (!coreFrame->tree()->parent()) {
+    if (!coreFrame->tree().parent()) {
         evas_object_del(frame);
         return true;

trunk/Source/WebKit/efl/ewk/ewk_view.cpp

@@ -3683 +3683 @@
 
     // The creation of the frame may have removed itself already.
-    if (!coreFrame->page() || !coreFrame->tree() || !coreFrame->tree()->parent())
+    if (!coreFrame->page() || !coreFrame->tree().parent())
         return 0;
 

trunk/Source/WebKit/gtk/ChangeLog

@@ +1 @@
+2013-08-24  Darin Adler  <darin@apple.com>
+
+        Frame::tree should return a reference instead of a pointer
+        https://bugs.webkit.org/show_bug.cgi?id=120259
+
+        Reviewed by Andreas Kling.
+
+        * WebCoreSupport/DumpRenderTreeSupportGtk.cpp:
+        (DumpRenderTreeSupportGtk::getFrameChildren):
+        (DumpRenderTreeSupportGtk::clearMainFrameName):
+        * WebCoreSupport/FrameLoaderClientGtk.cpp:
+        (WebKit::FrameLoaderClient::createFrame):
+        * webkit/webkitwebframe.cpp:
+        (webkit_web_frame_get_name):
+        (webkit_web_frame_get_parent):
+        (webkit_web_frame_find_frame):
+        * webkit/webkitwebview.cpp:
+        (webkit_web_view_set_highlight_text_matches):
+        Use tree(). instead of tree()->.
+
 2013-08-21  Zan Dobersek  <zdobersek@igalia.com>
 

trunk/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp

@@ -128 +128 @@
 
     GSList* children = 0;
-    for (Frame* child = coreFrame->tree()->firstChild(); child; child = child->tree()->nextSibling()) {
+    for (Frame* child = coreFrame->tree().firstChild(); child; child = child->tree().nextSibling()) {
         WebKitWebFrame* kitFrame = kit(child);
         if (kitFrame)
@@ -233 +233 @@
     g_return_if_fail(WEBKIT_IS_WEB_FRAME(frame));
 
-    core(frame)->tree()->clearName();
+    core(frame)->tree().clearName();
 }
 

trunk/Source/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp

@@ -533 +533 @@
     framePrivate->coreFrame = childFrame.get();
 
-    childFrame->tree()->setName(name);
-    parentFrame->tree()->appendChild(childFrame);
+    childFrame->tree().setName(name);
+    parentFrame->tree().appendChild(childFrame);
     childFrame->init();
 
@@ -546 +546 @@
 
     // The frame's onload handler may have removed it from the document.
-    if (!childFrame->tree()->parent())
+    if (!childFrame->tree().parent())
         return 0;
 

trunk/Source/WebKit/gtk/webkit/webkitwebframe.cpp

@@ -631 +631 @@
 
     WebKitWebFramePrivate* priv = frame->priv;
-    CString frameName = coreFrame->tree()->uniqueName().string().utf8();
+    CString frameName = coreFrame->tree().uniqueName().string().utf8();
     if (!g_strcmp0(frameName.data(), priv->name))
         return priv->name;
@@ -656 +656 @@
         return 0;
 
-    return kit(coreFrame->tree()->parent());
+    return kit(coreFrame->tree().parent());
 }
 
@@ -829 +829 @@
 
     String nameString = String::fromUTF8(name);
-    return kit(coreFrame->tree()->find(AtomicString(nameString)));
+    return kit(coreFrame->tree().find(AtomicString(nameString)));
 }
 

trunk/Source/WebKit/gtk/webkit/webkitwebview.cpp

@@ -4395 +4395 @@
     do {
         frame->editor().setMarkedTextMatchesAreHighlighted(shouldHighlight);
-        frame = frame->tree()->traverseNextWithWrap(false);
+        frame = frame->tree().traverseNextWithWrap(false);
     } while (frame);
 }

trunk/Source/WebKit/mac/ChangeLog

@@ +1 @@
+2013-08-24  Darin Adler  <darin@apple.com>
+
+        Frame::tree should return a reference instead of a pointer
+        https://bugs.webkit.org/show_bug.cgi?id=120259
+
+        Reviewed by Andreas Kling.
+
+        * Plugins/Hosted/NetscapePluginInstanceProxy.mm:
+        (WebKit::NetscapePluginInstanceProxy::performRequest):
+        * Plugins/WebBaseNetscapePluginView.mm:
+        (-[WebBaseNetscapePluginView resolvedURLStringForURL:target:]):
+        * Plugins/WebNetscapePluginView.mm:
+        (-[WebNetscapePluginView loadPluginRequest:]):
+        * WebCoreSupport/WebFrameLoaderClient.mm:
+        (applyAppleDictionaryApplicationQuirkNonInlinePart):
+        (WebFrameLoaderClient::prepareForDataSourceReplacement):
+        (WebFrameLoaderClient::createFrame):
+        * WebView/WebFrame.mm:
+        (+[WebFrame _createFrameWithPage:frameName:frameView:ownerElement:]):
+        (-[WebFrame _updateBackgroundAndUpdatesWhileOffscreen]):
+        (-[WebFrame _unmarkAllBadGrammar]):
+        (-[WebFrame _unmarkAllMisspellings]):
+        (-[WebFrame _atMostOneFrameHasSelection]):
+        (-[WebFrame _findFrameWithSelection]):
+        (-[WebFrame _drawRect:contentsOnly:]):
+        (-[WebFrame _isDescendantOfFrame:]):
+        (-[WebFrame _recursive_resumeNullEventsForAllNetscapePlugins]):
+        (-[WebFrame _recursive_pauseNullEventsForAllNetscapePlugins]):
+        (-[WebFrame name]):
+        (-[WebFrame findFrameNamed:]):
+        (-[WebFrame parentFrame]):
+        (-[WebFrame childFrames]):
+        * WebView/WebView.mm:
+        (-[WebView _attachScriptDebuggerToAllFrames]):
+        (-[WebView _detachScriptDebuggerFromAllFrames]):
+        (-[WebView _clearMainFrameName]):
+        (-[WebView _isUsingAcceleratedCompositing]):
+        (-[WebView _isSoftwareRenderable]):
+        (-[WebView setHostWindow:]):
+        (incrementFrame):
+        Use tree(). instead of tree()->.
+
 2013-08-23  Beth Dakin  <bdakin@apple.com>
 

trunk/Source/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.mm

@@ -665 +665 @@
             
             frame = [newWebView mainFrame];
-            core(frame)->tree()->setName(frameName);
+            core(frame)->tree().setName(frameName);
             [[newWebView _UIDelegateForwarder] webViewShow:newWebView];
         }

trunk/Source/WebKit/mac/Plugins/WebBaseNetscapePluginView.mm

@@ -841 +841 @@
         return CString();
 
-    Frame* targetFrame = frame->tree()->find(String::fromUTF8(target));
+    Frame* targetFrame = frame->tree().find(String::fromUTF8(target));
     if (!targetFrame)
         return CString();

trunk/Source/WebKit/mac/Plugins/WebNetscapePluginView.mm

@@ -1680 +1680 @@
             
             frame = [newWebView mainFrame];
-            core(frame)->tree()->setName(frameName);
+            core(frame)->tree().setName(frameName);
             [[newWebView _UIDelegateForwarder] webViewShow:newWebView];
         }

trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm

@@ -179 +179 @@
     if (!frame)
         return;
-    if (frame->tree()->parent())
+    if (frame->tree().parent())
         return;
     Document* document = frame->document();
@@ -1159 +1159 @@
 {
     if (![m_webFrame.get() _dataSource]) {
-        ASSERT(!core(m_webFrame.get())->tree()->childCount());
+        ASSERT(!core(m_webFrame.get())->tree().childCount());
         return;
     }
@@ -1414 +1414 @@
 
     // The frame's onload handler may have removed it from the document.
-    if (!result->tree()->parent())
+    if (!result->tree().parent())
         return 0;
 

trunk/Source/WebKit/mac/WebView/WebFrame.mm

@@ -269 +269 @@
     frame->_private->coreFrame = coreFrame.get();
 
-    coreFrame->tree()->setName(name);
+    coreFrame->tree().setName(name);
     if (ownerElement) {
         ASSERT(ownerElement->document()->frame());
-        ownerElement->document()->frame()->tree()->appendChild(coreFrame.get());
+        ownerElement->document()->frame()->tree().appendChild(coreFrame.get());
     }
 
@@ -363 +363 @@
 
     Frame* coreFrame = _private->coreFrame;
-    for (Frame* frame = coreFrame; frame; frame = frame->tree()->traverseNext(coreFrame)) {
+    for (Frame* frame = coreFrame; frame; frame = frame->tree().traverseNext(coreFrame)) {
         // Don't call setDrawsBackground:YES here because it may be NO because of a load
         // in progress; WebFrameLoaderClient keeps it set to NO during the load process.
@@ -392 +392 @@
 {
     Frame* coreFrame = _private->coreFrame;
-    for (Frame* frame = coreFrame; frame; frame = frame->tree()->traverseNext(coreFrame)) {
+    for (Frame* frame = coreFrame; frame; frame = frame->tree().traverseNext(coreFrame)) {
         if (Document* document = frame->document())
             document->markers().removeMarkers(DocumentMarker::Grammar);
@@ -401 +401 @@
 {
     Frame* coreFrame = _private->coreFrame;
-    for (Frame* frame = coreFrame; frame; frame = frame->tree()->traverseNext(coreFrame)) {
+    for (Frame* frame = coreFrame; frame; frame = frame->tree().traverseNext(coreFrame)) {
         if (Document* document = frame->document())
             document->markers().removeMarkers(DocumentMarker::Spelling);
@@ -435 +435 @@
     BOOL found = NO;
     Frame* coreFrame = _private->coreFrame;
-    for (Frame* frame = coreFrame; frame; frame = frame->tree()->traverseNext(coreFrame))
+    for (Frame* frame = coreFrame; frame; frame = frame->tree().traverseNext(coreFrame))
         if ([kit(frame) _hasSelection]) {
             if (found)
@@ -448 +448 @@
 {
     Frame* coreFrame = _private->coreFrame;
-    for (Frame* frame = coreFrame; frame; frame = frame->tree()->traverseNext(coreFrame)) {
+    for (Frame* frame = coreFrame; frame; frame = frame->tree().traverseNext(coreFrame)) {
         WebFrame *webFrame = kit(frame);
         if ([webFrame _hasSelection])
@@ -542 +542 @@
     
     bool shouldFlatten = false;
-    if (Frame* parentFrame = _private->coreFrame->tree()->parent()) {
+    if (Frame* parentFrame = _private->coreFrame->tree().parent()) {
         // For subframes, we need to inherit the paint behavior from our parent
         FrameView* parentView = parentFrame ? parentFrame->view() : 0;
@@ -845 +845 @@
 {
     Frame* coreFrame = _private->coreFrame;
-    return coreFrame && coreFrame->tree()->isDescendantOf(core(ancestor));
+    return coreFrame && coreFrame->tree().isDescendantOf(core(ancestor));
 }
 
@@ -920 +920 @@
 {
     Frame* coreFrame = core(self);
-    for (Frame* frame = coreFrame; frame; frame = frame->tree()->traverseNext(coreFrame)) {
+    for (Frame* frame = coreFrame; frame; frame = frame->tree().traverseNext(coreFrame)) {
         NSView <WebDocumentView> *documentView = [[kit(frame) frameView] documentView];
         if ([documentView isKindOfClass:[WebHTMLView class]])
@@ -930 +930 @@
 {
     Frame* coreFrame = core(self);
-    for (Frame* frame = coreFrame; frame; frame = frame->tree()->traverseNext(coreFrame)) {
+    for (Frame* frame = coreFrame; frame; frame = frame->tree().traverseNext(coreFrame)) {
         NSView <WebDocumentView> *documentView = [[kit(frame) frameView] documentView];
         if ([documentView isKindOfClass:[WebHTMLView class]])
@@ -1284 +1284 @@
     if (!coreFrame)
         return nil;
-    return coreFrame->tree()->uniqueName();
+    return coreFrame->tree().uniqueName();
 }
 
@@ -1460 +1460 @@
     if (!coreFrame)
         return nil;
-    return kit(coreFrame->tree()->find(name));
+    return kit(coreFrame->tree().find(name));
 }
 
@@ -1468 +1468 @@
     if (!coreFrame)
         return nil;
-    return [[kit(coreFrame->tree()->parent()) retain] autorelease];
+    return [[kit(coreFrame->tree().parent()) retain] autorelease];
 }
 
@@ -1476 +1476 @@
     if (!coreFrame)
         return [NSArray array];
-    NSMutableArray *children = [NSMutableArray arrayWithCapacity:coreFrame->tree()->childCount()];
-    for (Frame* child = coreFrame->tree()->firstChild(); child; child = child->tree()->nextSibling())
+    NSMutableArray *children = [NSMutableArray arrayWithCapacity:coreFrame->tree().childCount()];
+    for (Frame* child = coreFrame->tree().firstChild(); child; child = child->tree().nextSibling())
         [children addObject:kit(child)];
     return children;

trunk/Source/WebKit/mac/WebView/WebView.mm

@@ -2333 +2333 @@
 - (void)_attachScriptDebuggerToAllFrames
 {
-    for (Frame* frame = [self _mainCoreFrame]; frame; frame = frame->tree()->traverseNext())
+    for (Frame* frame = [self _mainCoreFrame]; frame; frame = frame->tree().traverseNext())
         [kit(frame) _attachScriptDebugger];
 }
@@ -2339 +2339 @@
 - (void)_detachScriptDebuggerFromAllFrames
 {
-    for (Frame* frame = [self _mainCoreFrame]; frame; frame = frame->tree()->traverseNext())
+    for (Frame* frame = [self _mainCoreFrame]; frame; frame = frame->tree().traverseNext())
         [kit(frame) _detachScriptDebugger];
 }
@@ -2455 +2455 @@
 - (void)_clearMainFrameName
 {
-    _private->page->mainFrame()->tree()->clearName();
+    _private->page->mainFrame()->tree().clearName();
 }
 
@@ -2506 +2506 @@
 #if USE(ACCELERATED_COMPOSITING)
     Frame* coreFrame = [self _mainCoreFrame];
-    for (Frame* frame = coreFrame; frame; frame = frame->tree()->traverseNext(coreFrame)) {
+    for (Frame* frame = coreFrame; frame; frame = frame->tree().traverseNext(coreFrame)) {
         NSView *documentView = [[kit(frame) frameView] documentView];
         if ([documentView isKindOfClass:[WebHTMLView class]] && [(WebHTMLView *)documentView _isUsingAcceleratedCompositing])
@@ -2544 +2544 @@
 #if USE(ACCELERATED_COMPOSITING)
     Frame* coreFrame = [self _mainCoreFrame];
-    for (Frame* frame = coreFrame; frame; frame = frame->tree()->traverseNext(coreFrame)) {
+    for (Frame* frame = coreFrame; frame; frame = frame->tree().traverseNext(coreFrame)) {
         if (FrameView* view = frame->view()) {
             if (!view->isSoftwareRenderable())
@@ -4213 +4213 @@
 
     Frame* coreFrame = [self _mainCoreFrame];
-    for (Frame* frame = coreFrame; frame; frame = frame->tree()->traverseNext(coreFrame))
+    for (Frame* frame = coreFrame; frame; frame = frame->tree().traverseNext(coreFrame))
         [[[kit(frame) frameView] documentView] viewWillMoveToHostWindow:hostWindow];
     if (_private->hostWindow && [self window] != _private->hostWindow)
@@ -4221 +4221 @@
     [_private->hostWindow release];
     _private->hostWindow = [hostWindow retain];
-    for (Frame* frame = coreFrame; frame; frame = frame->tree()->traverseNext(coreFrame))
+    for (Frame* frame = coreFrame; frame; frame = frame->tree().traverseNext(coreFrame))
         [[[kit(frame) frameView] documentView] viewDidMoveToHostWindow];
     _private->page->setDeviceScaleFactor([self _deviceScaleFactor]);
@@ -4417 +4417 @@
     Frame* coreFrame = core(frame);
     return kit((options & WebFindOptionsBackwards)
-        ? coreFrame->tree()->traversePreviousWithWrap(options & WebFindOptionsWrapAround)
-        : coreFrame->tree()->traverseNextWithWrap(options & WebFindOptionsWrapAround));
+        ? coreFrame->tree().traversePreviousWithWrap(options & WebFindOptionsWrapAround)
+        : coreFrame->tree().traverseNextWithWrap(options & WebFindOptionsWrapAround));
 }
 

trunk/Source/WebKit/qt/ChangeLog

@@ +1 @@
+2013-08-24  Darin Adler  <darin@apple.com>
+
+        Frame::tree should return a reference instead of a pointer
+        https://bugs.webkit.org/show_bug.cgi?id=120259
+
+        Reviewed by Andreas Kling.
+
+        * WebCoreSupport/DumpRenderTreeSupportQt.cpp:
+        (DumpRenderTreeSupportQt::clearFrameName):
+        * WebCoreSupport/FrameLoaderClientQt.cpp:
+        (drtDescriptionSuitableForTestResult):
+        (WebCore::FrameLoaderClientQt::dispatchDidCommitLoad):
+        (WebCore::FrameLoaderClientQt::dispatchDidFinishDocumentLoad):
+        (WebCore::FrameLoaderClientQt::postProgressStartedNotification):
+        (WebCore::FrameLoaderClientQt::didPerformFirstNavigation):
+        (WebCore::FrameLoaderClientQt::createFrame):
+        * WebCoreSupport/QWebFrameAdapter.cpp:
+        (QWebFrameData::QWebFrameData):
+        (QWebFrameAdapter::load):
+        (QWebFrameAdapter::uniqueName):
+        (QWebFrameAdapter::childFrames):
+        * WebCoreSupport/QWebPageAdapter.cpp:
+        (QWebPageAdapter::findText):
+        Use tree(). instead of tree()->.
+
 2013-08-23  Allan Sandfeld Jensen  <allan.jensen@digia.com>
 

trunk/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp

@@ -280 +280 @@
 {
     Frame* coreFrame = adapter->frame;
-    coreFrame->tree()->clearName();
+    coreFrame->tree().clearName();
 }
 

trunk/Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp

@@ -100 +100 @@
 {
     QWebFrameAdapter* frame = QWebFrameAdapter::kit(webCoreFrame);
-    QString name = webCoreFrame->tree()->uniqueName();
+    QString name = webCoreFrame->tree().uniqueName();
 
     bool isMainFrame = frame == frame->pageAdapter->mainFrameAdapter();
@@ -482 +482 @@
         printf("%s - didCommitLoadForFrame\n", qPrintable(drtDescriptionSuitableForTestResult(m_frame)));
 
-    if (m_frame->tree()->parent() || !m_webFrame)
+    if (m_frame->tree().parent() || !m_webFrame)
         return;
 
@@ -512 +512 @@
     }
 
-    if (m_frame->tree()->parent() || !m_webFrame)
+    if (m_frame->tree().parent() || !m_webFrame)
         return;
 
@@ -564 +564 @@
     if (m_webFrame && m_frame->page())
         m_isOriginatingLoad = true;
-    if (m_frame->tree()->parent() || !m_webFrame)
+    if (m_frame->tree().parent() || !m_webFrame)
         return;
     m_webFrame->pageAdapter->updateNavigationActions();
@@ -747 +747 @@
 void FrameLoaderClientQt::didPerformFirstNavigation() const
 {
-    if (m_frame->tree()->parent() || !m_webFrame)
+    if (m_frame->tree().parent() || !m_webFrame)
         return;
     m_webFrame->pageAdapter->updateNavigationActions();
@@ -1328 +1328 @@
 
     // The frame's onload handler may have removed it from the document.
-    if (!frameData.frame->tree()->parent())
+    if (!frameData.frame->tree().parent())
         return 0;
 

trunk/Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.cpp

@@ -95 +95 @@
 
     // FIXME: All of the below should probably be moved over into WebCore
-    frame->tree()->setName(name);
+    frame->tree().setName(name);
     if (parentFrame)
-        parentFrame->tree()->appendChild(frame);
+        parentFrame->tree().appendChild(frame);
 }
 
@@ -120 +120 @@
 void QWebFrameAdapter::load(const QNetworkRequest& req, QNetworkAccessManager::Operation operation, const QByteArray& body)
 {
-    if (frame->tree()->parent())
+    if (frame->tree().parent())
         pageAdapter->insideOpenCall = true;
 
@@ -170 +170 @@
     frame->loader().load(WebCore::FrameLoadRequest(frame, request));
 
-    if (frame->tree()->parent())
+    if (frame->tree().parent())
         pageAdapter->insideOpenCall = false;
 }
@@ -465 +465 @@
 QString QWebFrameAdapter::uniqueName() const
 {
-    return frame->tree()->uniqueName();
+    return frame->tree().uniqueName();
 }
 
@@ -691 +691 @@
     QList<QObject*> originatingObjects;
     if (frame) {
-        FrameTree* tree = frame->tree();
-        for (Frame* child = tree->firstChild(); child; child = child->tree()->nextSibling()) {
+        for (Frame* child = frame->tree().firstChild(); child; child = child->tree().nextSibling()) {
             FrameLoader& loader = child->loader();
             originatingObjects.append(loader.networkingContext()->originatingObject());

trunk/Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.cpp

@@ -423 +423 @@
     if (subString.isEmpty()) {
         page->mainFrame()->selection().clear();
-        Frame* frame = page->mainFrame()->tree()->firstChild();
+        Frame* frame = page->mainFrame()->tree().firstChild();
         while (frame) {
             frame->selection().clear();
-            frame = frame->tree()->traverseNextWithWrap(false);
+            frame = frame->tree().traverseNextWithWrap(false);
         }
     }

trunk/Source/WebKit/win/ChangeLog

@@ +1 @@
+2013-08-24  Darin Adler  <darin@apple.com>
+
+        Frame::tree should return a reference instead of a pointer
+        https://bugs.webkit.org/show_bug.cgi?id=120259
+
+        Reviewed by Andreas Kling.
+
+        * WebCoreSupport/WebFrameLoaderClient.cpp:
+        (WebFrameLoaderClient::createFrame):
+        * WebFrame.cpp:
+        (WebFrame::name):
+        (WebFrame::findFrameNamed):
+        (WebFrame::parentFrame):
+        (EnumChildFrames::EnumChildFrames):
+        (EnumChildFrames::Next):
+        (EnumChildFrames::Skip):
+        (EnumChildFrames::Reset):
+        (WebFrame::isDescendantOfFrame):
+        (WebFrame::unmarkAllMisspellings):
+        (WebFrame::unmarkAllBadGrammar):
+        * WebView.cpp:
+        (WebView::initWithFrame):
+        (incrementFrame):
+        (WebView::clearMainFrameName):
+        Use tree(). instead of tree()->.
+
 2013-08-23  Brent Fulgham  <bfulgham@apple.com>
 

trunk/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp

@@ -1092 +1092 @@
     RefPtr<Frame> childFrame = webFrame->init(m_webFrame->webView(), coreFrame->page(), ownerElement);
 
-    childFrame->tree()->setName(name);
-    coreFrame->tree()->appendChild(childFrame);
+    childFrame->tree().setName(name);
+    coreFrame->tree().appendChild(childFrame);
     childFrame->init();
 
@@ -1099 +1099 @@
 
     // The frame's onload handler may have removed it from the document.
-    if (!childFrame->tree()->parent())
+    if (!childFrame->tree().parent())
         return 0;
 

trunk/Source/WebKit/win/WebFrame.cpp

@@ -427 +427 @@
         return E_FAIL;
 
-    *frameName = BString(coreFrame->tree()->uniqueName()).release();
+    *frameName = BString(coreFrame->tree().uniqueName()).release();
     return S_OK;
 }
@@ -743 +743 @@
         return E_FAIL;
 
-    Frame* foundFrame = coreFrame->tree()->find(AtomicString(name, SysStringLen(name)));
+    Frame* foundFrame = coreFrame->tree().find(AtomicString(name, SysStringLen(name)));
     if (!foundFrame)
         return S_OK;
@@ -760 +760 @@
     *frame = 0;
     if (Frame* coreFrame = core(this))
-        if (WebFrame* webFrame = kit(coreFrame->tree()->parent()))
+        if (WebFrame* webFrame = kit(coreFrame->tree().parent()))
             hr = webFrame->QueryInterface(IID_IWebFrame, (void**) frame);
 
@@ -769 +769 @@
 {
 public:
-    EnumChildFrames(Frame* f) : m_refCount(1), m_frame(f), m_curChild(f ? f->tree()->firstChild() : 0) { }
+    EnumChildFrames(Frame* f) : m_refCount(1), m_frame(f), m_curChild(f ? f->tree().firstChild() : 0) { }
 
     virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void** ppvObject)
@@ -817 +817 @@
         V_UNKNOWN(rgVar) = unknown;
 
-        m_curChild = m_curChild->tree()->nextSibling();
+        m_curChild = m_curChild->tree().nextSibling();
         if (pCeltFetched)
             *pCeltFetched = 1;
@@ -828 +828 @@
             return S_FALSE;
         for (unsigned i = 0; i < celt && m_curChild; i++)
-            m_curChild = m_curChild->tree()->nextSibling();
+            m_curChild = m_curChild->tree().nextSibling();
         return m_curChild ? S_OK : S_FALSE;
     }
@@ -836 +836 @@
         if (!m_frame)
             return S_FALSE;
-        m_curChild = m_frame->tree()->firstChild();
+        m_curChild = m_frame->tree().firstChild();
         return S_OK;
     }
@@ -2020 +2020 @@
         return S_OK;
 
-    *result = (coreFrame && coreFrame->tree()->isDescendantOf(core(ancestorWebFrame.get()))) ? TRUE : FALSE;
+    *result = (coreFrame && coreFrame->tree().isDescendantOf(core(ancestorWebFrame.get()))) ? TRUE : FALSE;
     return S_OK;
 }
@@ -2073 +2073 @@
 {
     Frame* coreFrame = core(this);
-    for (Frame* frame = coreFrame; frame; frame = frame->tree()->traverseNext(coreFrame)) {
+    for (Frame* frame = coreFrame; frame; frame = frame->tree().traverseNext(coreFrame)) {
         Document *doc = frame->document();
         if (!doc)
@@ -2085 +2085 @@
 {
     Frame* coreFrame = core(this);
-    for (Frame* frame = coreFrame; frame; frame = frame->tree()->traverseNext(coreFrame)) {
+    for (Frame* frame = coreFrame; frame; frame = frame->tree().traverseNext(coreFrame)) {
         Document *doc = frame->document();
         if (!doc)

trunk/Source/WebKit/win/WebView.cpp

@@ -2741 +2741 @@
     webFrame->Release(); // The WebFrame is owned by the Frame, so release our reference to it.
 
-    coreFrame->tree()->setName(toString(frameName));
+    coreFrame->tree().setName(toString(frameName));
     coreFrame->init();
     setGroupName(groupName);
@@ -3443 +3443 @@
 {
     return forward
-        ? curr->tree()->traverseNextWithWrap(wrapFlag)
-        : curr->tree()->traversePreviousWithWrap(wrapFlag);
+        ? curr->tree().traverseNextWithWrap(wrapFlag)
+        : curr->tree().traversePreviousWithWrap(wrapFlag);
 }
 
@@ -3502 +3502 @@
 HRESULT STDMETHODCALLTYPE WebView::clearMainFrameName()
 {
-    m_page->mainFrame()->tree()->clearName();
+    m_page->mainFrame()->tree().clearName();
 
     return S_OK;

trunk/Source/WebKit/wince/ChangeLog

@@ +1 @@
+2013-08-24  Darin Adler  <darin@apple.com>
+
+        Frame::tree should return a reference instead of a pointer
+        https://bugs.webkit.org/show_bug.cgi?id=120259
+
+        Reviewed by Andreas Kling.
+
+        * WebView.cpp:
+        (WebView::createFrame):
+        Use tree(). instead of tree()->.
+
 2013-08-19  Pratik Solanki  <psolanki@apple.com>
 

trunk/Source/WebKit/wince/WebView.cpp

@@ -165 +165 @@
     loaderClient->setFrame(childFrame.get());
 
-    coreFrame->tree()->appendChild(childFrame);
-    childFrame->tree()->setName(name);
+    coreFrame->tree().appendChild(childFrame);
+    childFrame->tree().setName(name);
     childFrame->init();
 
@@ -176 +176 @@
 
     // The frame's onload handler may have removed it from the document.
-    if (!childFrame->tree()->parent())
+    if (!childFrame->tree().parent())
         return 0;
 

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-08-24  Darin Adler  <darin@apple.com>
+
+        Frame::tree should return a reference instead of a pointer
+        https://bugs.webkit.org/show_bug.cgi?id=120259
+
+        Reviewed by Andreas Kling.
+
+        * WebProcess/Plugins/PluginView.cpp:
+        (WebKit::PluginView::performJavaScriptURLRequest):
+        * WebProcess/Storage/StorageAreaMap.cpp:
+        (WebKit::StorageAreaMap::dispatchSessionStorageEvent):
+        (WebKit::StorageAreaMap::dispatchLocalStorageEvent):
+        * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
+        (WebKit::WebFrameLoaderClient::createFrame):
+        * WebProcess/WebCoreSupport/mac/WebContextMenuClientMac.mm:
+        (WebKit::WebContextMenuClient::searchWithSpotlight):
+        * WebProcess/WebPage/FindController.cpp:
+        (WebKit::frameWithSelection):
+        (WebKit::FindController::rectsForTextMatches):
+        * WebProcess/WebPage/WebFrame.cpp:
+        (WebKit::WebFrame::init):
+        (WebKit::WebFrame::contentsAsString):
+        (WebKit::WebFrame::name):
+        (WebKit::WebFrame::childFrames):
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::clearMainFrameName):
+        (WebKit::WebPage::setDrawsBackground):
+        (WebKit::WebPage::setDrawsTransparentBackground):
+        (WebKit::WebPage::setWindowResizerSize):
+        (WebKit::frameWithSelection):
+        (WebKit::WebPage::unmarkAllMisspellings):
+        (WebKit::WebPage::unmarkAllBadGrammar):
+        (WebKit::pageContainsAnyHorizontalScrollbars):
+        * WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm:
+        (WebKit::TiledCoreAnimationDrawingArea::forceRepaint):
+        Use tree(). instead of tree()->.
+
 2013-08-24  Commit Queue  <commit-queue@webkit.org>
 

trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp

@@ -1167 +1167 @@
     if (!request->target().isNull()) {
         // For security reasons, only allow JS requests to be made on the frame that contains the plug-in.
-        if (frame->tree()->find(request->target()) != frame) {
+        if (frame->tree().find(request->target()) != frame) {
             // Let the plug-in know that its frame load failed.
             m_plugin->frameDidFail(request->requestID(), false);

trunk/Source/WebKit2/WebProcess/Storage/StorageAreaMap.cpp

@@ -313 +313 @@
 
     Page* page = webPage->corePage();
-    for (Frame* frame = page->mainFrame(); frame; frame = frame->tree()->traverseNext()) {
+    for (Frame* frame = page->mainFrame(); frame; frame = frame->tree().traverseNext()) {
         Document* document = frame->document();
         if (!document->securityOrigin()->equal(m_securityOrigin.get()))
@@ -343 +343 @@
     const HashSet<Page*>& pages = pageGroup.pages();
     for (HashSet<Page*>::const_iterator it = pages.begin(), end = pages.end(); it != end; ++it) {
-        for (Frame* frame = (*it)->mainFrame(); frame; frame = frame->tree()->traverseNext()) {
+        for (Frame* frame = (*it)->mainFrame(); frame; frame = frame->tree().traverseNext()) {
             Document* document = frame->document();
             if (!document->securityOrigin()->equal(m_securityOrigin.get()))

trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp

@@ -1277 +1277 @@
         return 0;
     ASSERT(subframe->coreFrame() == coreSubframe);
-    if (!coreSubframe->tree()->parent())
+    if (!coreSubframe->tree().parent())
         return 0;
 

trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebContextMenuClientMac.mm

@@ -79 +79 @@
     
     Frame* selectionFrame = mainFrame;
-    for (; selectionFrame; selectionFrame = selectionFrame->tree()->traverseNext(mainFrame)) {
+    for (; selectionFrame; selectionFrame = selectionFrame->tree().traverseNext(mainFrame)) {
         if (selectionFrame->selection().isRange())
             break;

trunk/Source/WebKit2/WebProcess/WebPage/FindController.cpp

@@ -99 +99 @@
 static Frame* frameWithSelection(Page* page)
 {
-    for (Frame* frame = page->mainFrame(); frame; frame = frame->tree()->traverseNext()) {
+    for (Frame* frame = page->mainFrame(); frame; frame = frame->tree().traverseNext()) {
         if (frame->selection().isRange())
             return frame;
@@ -351 +351 @@
     Vector<IntRect> rects;
 
-    for (Frame* frame = m_webPage->corePage()->mainFrame(); frame; frame = frame->tree()->traverseNext()) {
+    for (Frame* frame = m_webPage->corePage()->mainFrame(); frame; frame = frame->tree().traverseNext()) {
         Document* document = frame->document();
         if (!document)

trunk/Source/WebKit2/WebProcess/WebPage/WebFrame.cpp

@@ -165 +165 @@
     m_coreFrame = frame.get();
 
-    frame->tree()->setName(frameName);
+    frame->tree().setName(frameName);
 
     if (ownerElement) {
         ASSERT(ownerElement->document()->frame());
-        ownerElement->document()->frame()->tree()->appendChild(frame);
+        ownerElement->document()->frame()->tree().appendChild(frame);
     }
 
@@ -312 +312 @@
     if (isFrameSet()) {
         StringBuilder builder;
-        for (Frame* child = m_coreFrame->tree()->firstChild(); child; child = child->tree()->nextSibling()) {
+        for (Frame* child = m_coreFrame->tree().firstChild(); child; child = child->tree().nextSibling()) {
             if (!builder.isEmpty())
                 builder.append(' ');
@@ -388 +388 @@
         return String();
 
-    return m_coreFrame->tree()->uniqueName();
+    return m_coreFrame->tree().uniqueName();
 }
 
@@ -428 +428 @@
         return ImmutableArray::create();
 
-    size_t size = m_coreFrame->tree()->childCount();
+    size_t size = m_coreFrame->tree().childCount();
     if (!size)
         return ImmutableArray::create();
@@ -435 +435 @@
     vector.reserveInitialCapacity(size);
 
-    for (Frame* child = m_coreFrame->tree()->firstChild(); child; child = child->tree()->nextSibling()) {
+    for (Frame* child = m_coreFrame->tree().firstChild(); child; child = child->tree().nextSibling()) {
         WebFrameLoaderClient* webFrameLoaderClient = toWebFrameLoaderClient(child->loader().client());
         WebFrame* webFrame = webFrameLoaderClient ? webFrameLoaderClient->webFrame() : 0;

trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp

@@ -791 +791 @@
 {
     if (Frame* frame = mainFrame())
-        frame->tree()->clearName();
+        frame->tree().clearName();
 }
 
@@ -2019 +2019 @@
     m_drawsBackground = drawsBackground;
 
-    for (Frame* coreFrame = m_mainFrame->coreFrame(); coreFrame; coreFrame = coreFrame->tree()->traverseNext()) {
+    for (Frame* coreFrame = m_mainFrame->coreFrame(); coreFrame; coreFrame = coreFrame->tree().traverseNext()) {
         if (FrameView* view = coreFrame->view())
             view->setTransparent(!drawsBackground);
@@ -2036 +2036 @@
 
     Color backgroundColor = drawsTransparentBackground ? Color::transparent : Color::white;
-    for (Frame* coreFrame = m_mainFrame->coreFrame(); coreFrame; coreFrame = coreFrame->tree()->traverseNext()) {
+    for (Frame* coreFrame = m_mainFrame->coreFrame(); coreFrame; coreFrame = coreFrame->tree().traverseNext()) {
         if (FrameView* view = coreFrame->view())
             view->setBaseBackgroundColor(backgroundColor);
@@ -2099 +2099 @@
     m_windowResizerSize = windowResizerSize;
 
-    for (Frame* coreFrame = m_mainFrame->coreFrame(); coreFrame; coreFrame = coreFrame->tree()->traverseNext()) {
+    for (Frame* coreFrame = m_mainFrame->coreFrame(); coreFrame; coreFrame = coreFrame->tree().traverseNext()) {
         FrameView* view = coreFrame->view();
         if (view)
@@ -2287 +2287 @@
 static Frame* frameWithSelection(Page* page)
 {
-    for (Frame* frame = page->mainFrame(); frame; frame = frame->tree()->traverseNext()) {
+    for (Frame* frame = page->mainFrame(); frame; frame = frame->tree().traverseNext()) {
         if (frame->selection().isRange())
             return frame;
@@ -2950 +2950 @@
 void WebPage::unmarkAllMisspellings()
 {
-    for (Frame* frame = m_page->mainFrame(); frame; frame = frame->tree()->traverseNext()) {
+    for (Frame* frame = m_page->mainFrame(); frame; frame = frame->tree().traverseNext()) {
         if (Document* document = frame->document())
             document->markers().removeMarkers(DocumentMarker::Spelling);
@@ -2958 +2958 @@
 void WebPage::unmarkAllBadGrammar()
 {
-    for (Frame* frame = m_page->mainFrame(); frame; frame = frame->tree()->traverseNext()) {
+    for (Frame* frame = m_page->mainFrame(); frame; frame = frame->tree().traverseNext()) {
         if (Document* document = frame->document())
             document->markers().removeMarkers(DocumentMarker::Grammar);
@@ -3685 +3685 @@
     }
 
-    for (Frame* frame = mainFrame; frame; frame = frame->tree()->traverseNext()) {
+    for (Frame* frame = mainFrame; frame; frame = frame->tree().traverseNext()) {
         FrameView* frameView = frame->view();
         if (!frameView)

trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm

@@ -144 +144 @@
         return;
 
-    for (Frame* frame = m_webPage->corePage()->mainFrame(); frame; frame = frame->tree()->traverseNext()) {
+    for (Frame* frame = m_webPage->corePage()->mainFrame(); frame; frame = frame->tree().traverseNext()) {
         FrameView* frameView = frame->view();
         if (!frameView || !frameView->tiledBacking())