Change FrameTree to return Frames instead of LocalFrames.

Source/web/WebViewImpl.cpp

 /*
  * Copyright (C) 2011, 2012 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 2435 matching lines @@
 WebFrame* WebViewImpl::mainFrame()
 {
     return mainFrameImpl();
 }
 
 WebFrame* WebViewImpl::findFrameByName(
     const WebString& name, WebFrame* relativeToFrame)
 {
     if (!relativeToFrame)
         relativeToFrame = mainFrame();
-    LocalFrame* frame = toWebLocalFrameImpl(relativeToFrame)->frame();
+    Frame* frame = toWebLocalFrameImpl(relativeToFrame)->frame();
     frame = frame->tree().find(name);
-    return WebLocalFrameImpl::fromFrame(frame);
+    if (!frame->isLocalFrame())
+        return 0;
+    return WebLocalFrameImpl::fromFrame(toLocalFrame(frame));

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

Ditto--add a FIXME here. Either this should only deal with WebLocalFrames or it
should move to WebFrame.

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

Done.

 }
 
 WebFrame* WebViewImpl::focusedFrame()
 {
     return WebLocalFrameImpl::fromFrame(toLocalFrame(focusedWebCoreFrame()));
 }
 
 void WebViewImpl::setFocusedFrame(WebFrame* frame)
 {
     if (!frame) {
@@ skipping 761 matching lines @@
     UserGestureIndicator gesture(DefinitelyProcessingNewUserGesture);
     m_page->dragController().performDrag(&dragData);
 
     m_dragOperation = WebDragOperationNone;
     m_currentDragData = nullptr;
 }
 
 void WebViewImpl::spellingMarkers(WebVector<uint32_t>* markers)
 {
     Vector<uint32_t> result;
-    for (LocalFrame* frame = m_page->mainFrame(); frame; frame = frame->tree().traverseNext()) {
-        const WillBeHeapVector<DocumentMarker*>& documentMarkers = frame->document()->markers().markers();
+    for (Frame* frame = m_page->mainFrame(); frame; frame = frame->tree().traverseNext()) {
+        if (!frame->isLocalFrame())
+            continue;
+        const WillBeHeapVector<DocumentMarker*>& documentMarkers = toLocalFrame(frame)->document()->markers().markers();
         for (size_t i = 0; i < documentMarkers.size(); ++i)
             result.append(documentMarkers[i]->hash());
     }
     markers->assign(result);
 }
 
 WebDragOperation WebViewImpl::dragTargetDragEnterOrOver(const WebPoint& clientPoint, const WebPoint& screenPoint, DragAction dragAction, int keyModifiers)
 {
     ASSERT(m_currentDragData);
 
@@ skipping 177 matching lines @@
 void WebViewImpl::hidePopups()
 {
     hideSelectPopup();
     if (m_pagePopup)
         closePagePopup(m_pagePopup.get());
 }
 
 void WebViewImpl::setIsTransparent(bool isTransparent)
 {
     // Set any existing frames to be transparent.
-    LocalFrame* frame = m_page->mainFrame();
+    Frame* frame = m_page->mainFrame();
     while (frame) {
-        frame->view()->setTransparent(isTransparent);
+        if (frame->isLocalFrame())
+            toLocalFrame(frame)->view()->setTransparent(isTransparent);
         frame = frame->tree().traverseNext();
     }
 
     // Future frames check this to know whether to be transparent.
     m_isTransparent = isTransparent;
 }
 
 bool WebViewImpl::isTransparent() const
 {
     return m_isTransparent;
@@ skipping 603 matching lines @@
     const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefinedConstraints();
 
     if (!mainFrameImpl() || !mainFrameImpl()->frameView())
         return false;
 
     return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width
         || (constraints.minimumScale == constraints.maximumScale && constraints.minimumScale != -1);
 }
 
 } // namespace blink