Rename some functions of which names contain 'WebCore.'

Source/web/WebFrame.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 #include "public/web/WebFrame.h"
 
 #include "core/frame/RemoteFrame.h"
 #include "core/html/HTMLFrameOwnerElement.h"
 #include "web/OpenedFrameTracker.h"
 #include "web/WebLocalFrameImpl.h"
 #include "web/WebRemoteFrameImpl.h"
 #include <algorithm>
 
 
 namespace blink {
 
-blink::Frame* toWebCoreFrame(const WebFrame* frame)
+Frame* toCoreFrame(const WebFrame* frame)
 {
     if (!frame)
         return 0;
 
     return frame->isWebLocalFrame()
-        ? static_cast<blink::Frame*>(toWebLocalFrameImpl(frame)->frame())
+        ? static_cast<Frame*>(toWebLocalFrameImpl(frame)->frame())
         : toWebRemoteFrameImpl(frame)->frame();
 }
 
 void WebFrame::swap(WebFrame* frame)
 {
     using std::swap;
 
     // All child frames must have been detached first.
     ASSERT(!m_firstChild && !m_lastChild);
     // The frame being swapped in should not have a blink::Frame associated
     // with it yet.
-    ASSERT(!toWebCoreFrame(frame));
+    ASSERT(!toCoreFrame(frame));
 
     if (m_parent) {
         if (m_parent->m_firstChild == this)
             m_parent->m_firstChild = frame;
         if (m_parent->m_lastChild == this)
             m_parent->m_lastChild = frame;
         swap(m_parent, frame->m_parent);
     }
 
     if (m_previousSibling) {
@@ skipping 12 matching lines @@
     }
     if (!m_openedFrameTracker->isEmpty()) {
         m_openedFrameTracker->updateOpener(frame);
         frame->m_openedFrameTracker.reset(m_openedFrameTracker.release());
     }
 
     // Finally, clone the state of the current blink::Frame into one matching
     // the type of the passed in WebFrame.
     // FIXME: This is a bit clunky; this results in pointless decrements and
     // increments of connected subframes.
-    blink::Frame* oldFrame = toWebCoreFrame(this);
-    blink::FrameOwner* owner = oldFrame->owner();
+    Frame* oldFrame = toCoreFrame(this);
+    FrameOwner* owner = oldFrame->owner();
     oldFrame->disconnectOwnerElement();
     if (frame->isWebLocalFrame()) {
-        toWebLocalFrameImpl(frame)->initializeWebCoreFrame(oldFrame->host(), owner, oldFrame->tree().name(), nullAtom);
+        toWebLocalFrameImpl(frame)->initializeCoreFrame(oldFrame->host(), owner, oldFrame->tree().name(), nullAtom);
     } else {
-        toWebRemoteFrameImpl(frame)->initializeWebCoreFrame(oldFrame->host(), owner, oldFrame->tree().name());
+        toWebRemoteFrameImpl(frame)->initializeCoreFrame(oldFrame->host(), owner, oldFrame->tree().name());
     }
 }
 
 WebFrame* WebFrame::opener() const
 {
     return m_opener;
 }
 
 void WebFrame::setOpener(WebFrame* opener)
 {
@@ skipping 12 matching lines @@
     WebFrame* oldLast = m_lastChild;
     m_lastChild = child;
 
     if (oldLast) {
         child->m_previousSibling = oldLast;
         oldLast->m_nextSibling = child;
     } else {
         m_firstChild = child;
     }
 
-    toWebCoreFrame(this)->tree().invalidateScopedChildCount();
+    toCoreFrame(this)->tree().invalidateScopedChildCount();
 }
 
 void WebFrame::removeChild(WebFrame* child)
 {
     child->m_parent = 0;
 
     if (m_firstChild == child)
         m_firstChild = child->m_nextSibling;
     else
         child->m_previousSibling->m_nextSibling = child->m_nextSibling;
 
     if (m_lastChild == child)
         m_lastChild = child->m_previousSibling;
     else
         child->m_nextSibling->m_previousSibling = child->m_previousSibling;
 
     child->m_previousSibling = child->m_nextSibling = 0;
 
-    toWebCoreFrame(this)->tree().invalidateScopedChildCount();
+    toCoreFrame(this)->tree().invalidateScopedChildCount();
 }
 
 WebFrame* WebFrame::parent() const
 {
     return m_parent;
 }
 
 WebFrame* WebFrame::top() const
 {
     WebFrame* frame = const_cast<WebFrame*>(this);
@@ skipping 17 matching lines @@
     return m_previousSibling;
 }
 
 WebFrame* WebFrame::nextSibling() const
 {
     return m_nextSibling;
 }
 
 WebFrame* WebFrame::traversePrevious(bool wrap) const
 {
-    blink::Frame* frame = toWebCoreFrame(this);
-    if (!frame)
-        return 0;
-    return fromFrame(frame->tree().traversePreviousWithWrap(wrap));
+    if (Frame* frame = toCoreFrame(this))
+        return fromFrame(frame->tree().traversePreviousWithWrap(wrap));
+    return 0;
 }
 
 WebFrame* WebFrame::traverseNext(bool wrap) const
 {
-    blink::Frame* frame = toWebCoreFrame(this);
-    if (!frame)
-        return 0;
-    return fromFrame(frame->tree().traverseNextWithWrap(wrap));
+    if (Frame* frame = toCoreFrame(this))
+        return fromFrame(frame->tree().traverseNextWithWrap(wrap));
+    return 0;
 }
 
 WebFrame* WebFrame::findChildByName(const WebString& name) const
 {
-    blink::Frame* frame = toWebCoreFrame(this);
+    Frame* frame = toCoreFrame(this);
     if (!frame)
         return 0;
     // FIXME: It's not clear this should ever be called to find a remote frame.
     // Perhaps just disallow that completely?
     return fromFrame(frame->tree().child(name));
 }
 
 WebFrame* WebFrame::fromFrame(blink::Frame* frame)
 {
     if (!frame)
@@ skipping 14 matching lines @@
     , m_openedFrameTracker(new OpenedFrameTracker)
 {
 }
 
 WebFrame::~WebFrame()
 {
     m_openedFrameTracker.reset(0);
 }
 
 } // namespace blink