Have Frame::tree() return a reference

Source/web/WebFrameImpl.cpp

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 223 matching lines @@
             if (output.length() >= maxChars)
                 return; // Filled up the buffer.
         }
     }
 
     // The separator between frames when the frames are converted to plain text.
     const LChar frameSeparator[] = { '\n', '\n' };
     const size_t frameSeparatorLength = WTF_ARRAY_LENGTH(frameSeparator);
 
     // Recursively walk the children.
-    FrameTree* frameTree = frame->tree();
-    for (Frame* curChild = frameTree->firstChild(); curChild; curChild = curChild->tree()->nextSibling()) {
+    const FrameTree& frameTree = frame->tree();
+    for (Frame* curChild = frameTree.firstChild(); curChild; curChild = curChild->tree().nextSibling()) {
         // Ignore the text of non-visible frames.
         RenderView* contentRenderer = curChild->contentRenderer();
         RenderPart* ownerRenderer = curChild->ownerRenderer();
         if (!contentRenderer || !contentRenderer->width() || !contentRenderer->height()
             || (contentRenderer->x() + contentRenderer->width() <= 0) || (contentRenderer->y() + contentRenderer->height() <= 0)
             || (ownerRenderer && ownerRenderer->style() && ownerRenderer->style()->visibility() != VISIBLE)) {
             continue;
         }
 
         // Make sure the frame separator won't fill up the buffer, and give up if
@@ skipping 266 matching lines @@
 }
 
 void WebFrameImpl::close()
 {
     m_client = 0;
     deref(); // Balances ref() acquired in WebFrame::create
 }
 
 WebString WebFrameImpl::uniqueName() const
 {
-    return frame()->tree()->uniqueName();
+    return frame()->tree().uniqueName();
 }
 
 WebString WebFrameImpl::assignedName() const
 {
-    return frame()->tree()->name();
+    return frame()->tree().name();
 }
 
 void WebFrameImpl::setName(const WebString& name)
 {
-    frame()->tree()->setName(name);
+    frame()->tree().setName(name);
 }
 
 long long WebFrameImpl::embedderIdentifier() const
 {
     return m_embedderIdentifier;
 }
 
 WebVector<WebIconURL> WebFrameImpl::iconURLs(int iconTypesMask) const
 {
     // The URL to the icon may be in the header. As such, only
@@ skipping 72 matching lines @@
 
 void WebFrameImpl::setOpener(const WebFrame* webFrame)
 {
     frame()->loader()->setOpener(webFrame ? toWebFrameImpl(webFrame)->frame() : 0);
 }
 
 WebFrame* WebFrameImpl::parent() const
 {
     if (!frame())
         return 0;
-    return fromFrame(frame()->tree()->parent());
+    return fromFrame(frame()->tree().parent());
 }
 
 WebFrame* WebFrameImpl::top() const
 {
     if (!frame())
         return 0;
-    return fromFrame(frame()->tree()->top());
+    return fromFrame(frame()->tree().top());
 }
 
 WebFrame* WebFrameImpl::firstChild() const
 {
     if (!frame())
         return 0;
-    return fromFrame(frame()->tree()->firstChild());
+    return fromFrame(frame()->tree().firstChild());
 }
 
 WebFrame* WebFrameImpl::lastChild() const
 {
     if (!frame())
         return 0;
-    return fromFrame(frame()->tree()->lastChild());
+    return fromFrame(frame()->tree().lastChild());
 }
 
 WebFrame* WebFrameImpl::nextSibling() const
 {
     if (!frame())
         return 0;
-    return fromFrame(frame()->tree()->nextSibling());
+    return fromFrame(frame()->tree().nextSibling());
 }
 
 WebFrame* WebFrameImpl::previousSibling() const
 {
     if (!frame())
         return 0;
-    return fromFrame(frame()->tree()->previousSibling());
+    return fromFrame(frame()->tree().previousSibling());
 }
 
 WebFrame* WebFrameImpl::traverseNext(bool wrap) const
 {
     if (!frame())
         return 0;
-    return fromFrame(frame()->tree()->traverseNextWithWrap(wrap));
+    return fromFrame(frame()->tree().traverseNextWithWrap(wrap));
 }
 
 WebFrame* WebFrameImpl::traversePrevious(bool wrap) const
 {
     if (!frame())
         return 0;
-    return fromFrame(frame()->tree()->traversePreviousWithWrap(wrap));
+    return fromFrame(frame()->tree().traversePreviousWithWrap(wrap));
 }
 
 WebFrame* WebFrameImpl::findChildByName(const WebString& name) const
 {
     if (!frame())
         return 0;
-    return fromFrame(frame()->tree()->child(name));
+    return fromFrame(frame()->tree().child(name));
 }
 
 WebFrame* WebFrameImpl::findChildByExpression(const WebString& xpath) const
 {
     if (xpath.isEmpty())
         return 0;
 
     Document* document = frame()->document();
 
     RefPtr<XPathResult> xpathResult = DocumentXPathEvaluator::evaluate(document, xpath, document, 0, XPathResult::ORDERED_NODE_ITERATOR_TYPE, 0, IGNORE_EXCEPTION);
@@ skipping 1123 matching lines @@
         viewImpl()->mainFrameImpl()->m_findMatchMarkersVersion++;
 
     m_findMatchesCache.clear();
     m_findMatchRectsAreValid = false;
 }
 
 bool WebFrameImpl::isActiveMatchFrameValid() const
 {
     WebFrameImpl* mainFrameImpl = viewImpl()->mainFrameImpl();
     WebFrameImpl* activeMatchFrame = mainFrameImpl->activeMatchFrame();
-    return activeMatchFrame && activeMatchFrame->m_activeMatch && activeMatchFrame->frame()->tree()->isDescendantOf(mainFrameImpl->frame());
+    return activeMatchFrame && activeMatchFrame->m_activeMatch && activeMatchFrame->frame()->tree().isDescendantOf(mainFrameImpl->frame());
 }
 
 void WebFrameImpl::updateFindMatchRects()
 {
     IntSize currentContentsSize = contentsSize();
     if (m_contentsSizeForCurrentFindMatchRects != currentContentsSize) {
         m_contentsSizeForCurrentFindMatchRects = currentContentsSize;
         m_findMatchRectsAreValid = false;
     }
 
@@ skipping 320 matching lines @@
     }
 
     // Add an extra ref on behalf of the page/FrameLoader, which references the
     // WebFrame via the FrameLoaderClient interface. See the comment at the top
     // of this file for more info.
     webframe->ref();
 
     RefPtr<Frame> childFrame = Frame::create(frame()->page(), ownerElement, &webframe->m_frameLoaderClient);
     webframe->setWebCoreFrame(childFrame.get());
 
-    childFrame->tree()->setName(request.frameName());
+    childFrame->tree().setName(request.frameName());
 
-    frame()->tree()->appendChild(childFrame);
+    frame()->tree().appendChild(childFrame);
 
     // FIXME: Remove once all embedders return non-null from createChildFrame().
     if (mustCallDidCreateFrame)
         m_client->didCreateFrame(this, webframe);
 
     // Frame::init() can trigger onload event in the parent frame,
     // which may detach this frame and trigger a null-pointer access
     // in FrameTree::removeChild. Move init() after appendChild call
     // so that webframe->mFrame is in the tree before triggering
     // onload event handler.
     // Because the event handler may set webframe->mFrame to null,
     // it is necessary to check the value after calling init() and
     // return without loading URL.
     // NOTE: m_client will be null if this frame has been detached.
     // (b:791612)
     childFrame->init(); // create an empty document
-    if (!childFrame->tree()->parent())
+    if (!childFrame->tree().parent())
         return 0;
 
     HistoryItem* parentItem = frame()->loader()->history()->currentItem();
     HistoryItem* childItem = 0;
     // If we're moving in the back/forward list, we might want to replace the content
     // of this child frame with whatever was there at that point.
     if (parentItem && parentItem->children().size() && isBackForwardLoadType(frame()->loader()->loadType()) && !frame()->document()->loadEventFinished())
-        childItem = parentItem->childItemWithTarget(childFrame->tree()->uniqueName());
+        childItem = parentItem->childItemWithTarget(childFrame->tree().uniqueName());
 
     if (childItem)
         childFrame->loader()->loadHistoryItem(childItem);
     else
         childFrame->loader()->load(FrameLoadRequest(0, request.resourceRequest(), "_self"));
 
     // A synchronous navigation (about:blank) would have already processed
     // onload, so it is possible for the frame to have already been destroyed by
     // script in the page.
     // NOTE: m_client will be null if this frame has been detached.
-    if (!childFrame->tree()->parent())
+    if (!childFrame->tree().parent())
         return 0;
 
     return childFrame.release();
 }
 
 void WebFrameImpl::didChangeContentsSize(const IntSize& size)
 {
     // This is only possible on the main frame.
     if (m_totalMatchCount > 0) {
         ASSERT(!parent());
@@ skipping 292 matching lines @@
 
         // There is a possibility that the frame being detached was the only
         // pending one. We need to make sure final replies can be sent.
         flushCurrentScopingEffort(m_findRequestIdentifier);
 
         cancelPendingScopingEffort();
     }
 }
 
 } // namespace WebKit