Change FrameTree to return Frames instead of LocalFrames.

Source/core/frame/LocalFrame.cpp

 /*
  * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
  *                     1999 Lars Knoll <knoll@kde.org>
  *                     1999 Antti Koivisto <koivisto@kde.org>
  *                     2000 Simon Hausmann <hausmann@kde.org>
  *                     2000 Stefan Schimanski <1Stein@gmx.de>
  *                     2001 George Staikos <staikos@kde.org>
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2005 Alexey Proskuryakov <ap@nypop.com>
  * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
@@ skipping 56 matching lines @@
 #include "wtf/StdLibExtras.h"
 
 using namespace std;
 
 namespace WebCore {
 
 using namespace HTMLNames;
 
 static inline float parentPageZoomFactor(LocalFrame* frame)
 {
-    LocalFrame* parent = frame->tree().parent();
-    if (!parent)
+    Frame* parent = frame->tree().parent();
+    if (!parent || !parent->isLocalFrame())
         return 1;
-    return parent->pageZoomFactor();
+    return toLocalFrame(parent)->pageZoomFactor();
 }
 
 static inline float parentTextZoomFactor(LocalFrame* frame)
 {
-    LocalFrame* parent = frame->tree().parent();
-    if (!parent)
+    Frame* parent = frame->tree().parent();
+    if (!parent || !parent->isLocalFrame())
         return 1;
-    return parent->textZoomFactor();
+    return toLocalFrame(parent)->textZoomFactor();
 }
 
 inline LocalFrame::LocalFrame(FrameLoaderClient* client, FrameHost* host, FrameOwner* owner)
     : Frame(client, host, owner)
     , m_loader(this)
     , m_navigationScheduler(this)
     , m_script(adoptPtr(new ScriptController(this)))
     , m_editor(Editor::create(*this))
     , m_spellChecker(SpellChecker::create(*this))
     , m_selection(FrameSelection::create(this))
@@ skipping 72 matching lines @@
     if (page()->visibilityState() != PageVisibilityStateVisible)
         return;
 
     DOMWindow* window = domWindow();
     if (!window)
         return;
     window->dispatchEvent(Event::create(EventTypeNames::orientationchange));
 
     // Notify subframes.
     Vector<RefPtr<LocalFrame> > childFrames;
-    for (LocalFrame* child = tree().firstChild(); child; child = child->tree().nextSibling())
-        childFrames.append(child);
+    for (Frame* child = tree().firstChild(); child; child = child->tree().nextSibling()) {
+        if (child->isLocalFrame())
+            childFrames.append(toLocalFrame(child));
+    }
 
     for (size_t i = 0; i < childFrames.size(); ++i)
         childFrames[i]->sendOrientationChangeEvent();
 }
 
 void LocalFrame::setPrinting(bool printing, const FloatSize& pageSize, const FloatSize& originalPageSize, float maximumShrinkRatio)
 {
     // In setting printing, we should not validate resources already cached for the document.
     // See https://bugs.webkit.org/show_bug.cgi?id=43704
     ResourceCacheValidationSuppressor validationSuppressor(document()->fetcher());
 
     document()->setPrinting(printing);
     view()->adjustMediaTypeForPrinting(printing);
 
     document()->styleResolverChanged();
     if (shouldUsePrintingLayout()) {
         view()->forceLayoutForPagination(pageSize, originalPageSize, maximumShrinkRatio);
     } else {
         view()->forceLayout();
         view()->adjustViewSize();
     }
 
     // Subframes of the one we're printing don't lay out to the page size.
-    for (RefPtr<LocalFrame> child = tree().firstChild(); child; child = child->tree().nextSibling())
-        child->setPrinting(printing, FloatSize(), FloatSize(), 0);
+    for (RefPtr<Frame> child = tree().firstChild(); child; child = child->tree().nextSibling()) {
+        if (child->isLocalFrame())
+            toLocalFrame(child.get())->setPrinting(printing, FloatSize(), FloatSize(), 0);
+    }
 }
 
 bool LocalFrame::shouldUsePrintingLayout() const
 {
     // Only top frame being printed should be fit to page size.
     // Subframes should be constrained by parents only.
-    return document()->printing() && (!tree().parent() || !tree().parent()->document()->printing());
+    return document()->printing() && (!tree().parent() || !tree().parent()->isLocalFrame() || !toLocalFrame(tree().parent())->document()->printing());
 }
 
 FloatSize LocalFrame::resizePageRectsKeepingRatio(const FloatSize& originalSize, const FloatSize& expectedSize)
 {
     FloatSize resultSize;
     if (!contentRenderer())
         return FloatSize();
 
     if (contentRenderer()->style()->isHorizontalWritingMode()) {
         ASSERT(fabs(originalSize.width()) > numeric_limits<float>::epsilon());
@@ skipping 16 matching lines @@
         script().clearWindowShell();
     Frame::setDOMWindow(domWindow);
 }
 
 void LocalFrame::didChangeVisibilityState()
 {
     if (document())
         document()->didChangeVisibilityState();
 
     Vector<RefPtr<LocalFrame> > childFrames;
-    for (LocalFrame* child = tree().firstChild(); child; child = child->tree().nextSibling())
-        childFrames.append(child);
+    for (Frame* child = tree().firstChild(); child; child = child->tree().nextSibling()) {
+        if (child->isLocalFrame())
+            childFrames.append(toLocalFrame(child));
+    }
 
     for (size_t i = 0; i < childFrames.size(); ++i)
         childFrames[i]->didChangeVisibilityState();
 }
 
 void LocalFrame::willDetachFrameHost()
 {
     // We should never be detatching the page during a Layout.
     RELEASE_ASSERT(!m_view || !m_view->isInPerformLayout());
 
-    if (LocalFrame* parent = tree().parent())
-        parent->loader().checkLoadComplete();
+    Frame* parent = tree().parent();
+    if (parent && parent->isLocalFrame())
+        toLocalFrame(parent)->loader().checkLoadComplete();
 
     Frame::willDetachFrameHost();
     script().clearScriptObjects();
 
     if (page() && page()->scrollingCoordinator() && m_view)
         page()->scrollingCoordinator()->willDestroyScrollableArea(m_view.get());
 }
 
 void LocalFrame::detachFromFrameHost()
 {
@@ skipping 144 matching lines @@
         if (o->needsLayout())
             ++needsLayoutObjects;
     }
 }
 
 String LocalFrame::layerTreeAsText(LayerTreeFlags flags) const
 {
     TextStream textStream;
     textStream << localLayerTreeAsText(flags);
 
-    for (LocalFrame* child = tree().firstChild(); child; child = child->tree().traverseNext(this)) {
-        String childLayerTree = child->localLayerTreeAsText(flags);
+    for (Frame* child = tree().firstChild(); child; child = child->tree().traverseNext(this)) {
+        if (!child->isLocalFrame())
+            continue;
+        String childLayerTree = toLocalFrame(child)->localLayerTreeAsText(flags);
         if (!childLayerTree.length())
             continue;
 
         textStream << "\n\n--------\nFrame: '";
         textStream << child->tree().uniqueName();
         textStream << "'\n--------\n";
         textStream << childLayerTree;
     }
 
     return textStream.release();
@@ skipping 49 matching lines @@
             // Update the scroll position when doing a full page zoom, so the content stays in relatively the same position.
             LayoutPoint scrollPosition = view->scrollPosition();
             float percentDifference = (pageZoomFactor / m_pageZoomFactor);
             view->setScrollPosition(IntPoint(scrollPosition.x() * percentDifference, scrollPosition.y() * percentDifference));
         }
     }
 
     m_pageZoomFactor = pageZoomFactor;
     m_textZoomFactor = textZoomFactor;
 
-    for (RefPtr<LocalFrame> child = tree().firstChild(); child; child = child->tree().nextSibling())
-        child->setPageAndTextZoomFactors(m_pageZoomFactor, m_textZoomFactor);
+    for (RefPtr<Frame> child = tree().firstChild(); child; child = child->tree().nextSibling()) {
+        if (child->isLocalFrame())
+            toLocalFrame(child.get())->setPageAndTextZoomFactors(m_pageZoomFactor, m_textZoomFactor);
+    }
 
     document->setNeedsStyleRecalc(SubtreeStyleChange);
     document->updateLayoutIgnorePendingStylesheets();
 }
 
 void LocalFrame::deviceOrPageScaleFactorChanged()
 {
     document()->mediaQueryAffectingValueChanged();
-    for (RefPtr<LocalFrame> child = tree().firstChild(); child; child = child->tree().nextSibling())
-        child->deviceOrPageScaleFactorChanged();
+    for (RefPtr<Frame> child = tree().firstChild(); child; child = child->tree().nextSibling()) {
+        if (child->isLocalFrame())
+            toLocalFrame(child.get())->deviceOrPageScaleFactorChanged();
+    }
 }
 
 void LocalFrame::notifyChromeClientWheelEventHandlerCountChanged() const
 {
     // FIXME: No-one is using this information, so remove this code.
     // Ensure that this method is being called on the main frame of the page.
     ASSERT(isMainFrame());
 
     EventHandlerRegistry& registry = m_host->eventHandlerRegistry();
     unsigned count = 0;
     if (const EventTargetSet* targets = registry.eventHandlerTargets(EventHandlerRegistry::WheelEvent)) {
         for (EventTargetSet::const_iterator iter = targets->begin(); iter != targets->end(); ++iter)
             count += iter->value;
     }
 
     m_host->chrome().client().numWheelEventHandlersChanged(count);
 }
 
 bool LocalFrame::isURLAllowed(const KURL& url) const
 {
     // We allow one level of self-reference because some sites depend on that,
     // but we don't allow more than one.
     if (page()->subframeCount() >= Page::maxNumberOfFrames)
         return false;
     bool foundSelfReference = false;
-    for (const LocalFrame* frame = this; frame; frame = frame->tree().parent()) {
-        if (equalIgnoringFragmentIdentifier(frame->document()->url(), url)) {
+    for (const Frame* frame = this; frame; frame = frame->tree().parent()) {
+        if (!frame->isLocalFrame())
+            continue;
+        if (equalIgnoringFragmentIdentifier(toLocalFrame(frame)->document()->url(), url)) {
             if (foundSelfReference)
                 return false;
             foundSelfReference = true;
         }
     }
     return true;
 }
 
 struct ScopedFramePaintingState {
     ScopedFramePaintingState(LocalFrame* frame, Node* node)
@@ skipping 103 matching lines @@
         if (Document* doc = document())
             doc->topDocument().clearAXObjectCache();
     }
     Frame::disconnectOwnerElement();
 }
 
 LocalFrame* LocalFrame::localFrameRoot()
 {
     LocalFrame* curFrame = this;
     while (curFrame && curFrame->tree().parent() && curFrame->tree().parent()->isLocalFrame())
-        curFrame = curFrame->tree().parent();
+        curFrame = toLocalFrame(curFrame->tree().parent());
 
     return curFrame;
 }
 
 } // namespace WebCore