Rename some functions of which names contain 'WebCore.'

Source/web/WebFrame.cpp

Index: Source/web/WebFrame.cpp
diff --git a/Source/web/WebFrame.cpp b/Source/web/WebFrame.cpp
index db7ad7915e420602a614ccf947aa4c7765424cf5..5037543c6880099b9827ed081b945d1904268898 100644
--- a/Source/web/WebFrame.cpp
+++ b/Source/web/WebFrame.cpp
@@ -15,13 +15,13 @@
 
 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();
 }
 
@@ -33,7 +33,7 @@ void WebFrame::swap(WebFrame* frame)
     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)
@@ -66,13 +66,13 @@ void WebFrame::swap(WebFrame* frame)
     // 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());
     }
 }
 
@@ -105,7 +105,7 @@ void WebFrame::appendChild(WebFrame* child)
         m_firstChild = child;
     }
 
-    toWebCoreFrame(this)->tree().invalidateScopedChildCount();
+    toCoreFrame(this)->tree().invalidateScopedChildCount();
 }
 
 void WebFrame::removeChild(WebFrame* child)
@@ -124,7 +124,7 @@ void WebFrame::removeChild(WebFrame* child)
 
     child->m_previousSibling = child->m_nextSibling = 0;
 
-    toWebCoreFrame(this)->tree().invalidateScopedChildCount();
+    toCoreFrame(this)->tree().invalidateScopedChildCount();
 }
 
 WebFrame* WebFrame::parent() const
@@ -162,23 +162,21 @@ WebFrame* WebFrame::nextSibling() const
 
 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.