Change FrameTree to return Frames instead of LocalFrames.

Source/web/WebLocalFrameImpl.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 218 matching lines @@
                 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.
     const FrameTree& frameTree = frame->tree();
-    for (LocalFrame* curChild = frameTree.firstChild(); curChild; curChild = curChild->tree().nextSibling()) {
+    for (Frame* curChild = frameTree.firstChild(); curChild; curChild = curChild->tree().nextSibling()) {
+        if (!curChild->isLocalFrame())
+            continue;
+        LocalFrame* curLocalChild = toLocalFrame(curChild);
         // Ignore the text of non-visible frames.
-        RenderView* contentRenderer = curChild->contentRenderer();
-        RenderPart* ownerRenderer = curChild->ownerRenderer();
+        RenderView* contentRenderer = curLocalChild->contentRenderer();
+        RenderPart* ownerRenderer = curLocalChild->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
         // it will. The danger is if the separator will make the buffer longer than
         // maxChars. This will cause the computation above:
         //   maxChars - output->size()
         // to be a negative number which will crash when the subframe is added.
         if (output.length() >= maxChars - frameSeparatorLength)
             return;
 
         output.append(frameSeparator, frameSeparatorLength);
-        frameContentAsPlainText(maxChars, curChild, output);
+        frameContentAsPlainText(maxChars, curLocalChild, output);
         if (output.length() >= maxChars)
             return; // Filled up the buffer.
     }
 }
 
 WebPluginContainerImpl* WebLocalFrameImpl::pluginContainerFromFrame(LocalFrame* frame)
 {
     if (!frame)
         return 0;
     if (!frame->document() || !frame->document()->isPluginDocument())
@@ skipping 378 matching lines @@
 }
 
 void WebLocalFrameImpl::removeChild(WebFrame* child)
 {
     WebFrame::removeChild(child);
     frame()->tree().invalidateScopedChildCount();
 }
 
 WebFrame* WebLocalFrameImpl::traversePrevious(bool wrap) const
 {
-    if (!frame())
+    if (!frame() || !frame()->tree().traversePreviousWithWrap(wrap)->isLocalFrame())

[dcheng, 2014/06/04 18:06:37]

Put a FIXME here--this should move to WebFrame anyway and lose the LocalFrame
dependency, once we fix fromFrame().

[kenrb, 2014/06/04 20:34:47]

Ok, I figured this was going to change pretty soon but wasn't sure exactly what
you had in mind to do..

         return 0;
-    return fromFrame(frame()->tree().traversePreviousWithWrap(wrap));
+    return fromFrame(toLocalFrame(frame()->tree().traversePreviousWithWrap(wrap)));
 }
 
 WebFrame* WebLocalFrameImpl::traverseNext(bool wrap) const
 {
-    if (!frame())
+    if (!frame() || !frame()->tree().traverseNextWithWrap(wrap)->isLocalFrame())
         return 0;
-    return fromFrame(frame()->tree().traverseNextWithWrap(wrap));
+    return fromFrame(toLocalFrame(frame()->tree().traverseNextWithWrap(wrap)));
 }
 
 WebFrame* WebLocalFrameImpl::findChildByName(const WebString& name) const
 {
-    if (!frame())
+    if (!frame() || !frame()->tree().child(name)->isLocalFrame())
         return 0;
-    return fromFrame(frame()->tree().child(name));
+    return fromFrame(toLocalFrame(frame()->tree().child(name)));
 }
 
 WebDocument WebLocalFrameImpl::document() const
 {
     if (!frame() || !frame()->document())
         return WebDocument();
     return WebDocument(frame()->document());
 }
 
 WebPerformance WebLocalFrameImpl::performance() const
@@ skipping 1235 matching lines @@
 
 void WebLocalFrameImpl::invalidateAll() const
 {
     ASSERT(frame() && frame()->view());
     FrameView* view = frame()->view();
     view->invalidateRect(view->frameRect());
     invalidateScrollbar();
 }
 
 } // namespace blink