Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1251)

Unified Diff: Source/web/WebFrame.cpp

Issue 398673003: Rename WebCore namespace to blink in bindings and web (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/web/WebFormElement.cpp ('k') | Source/web/WebGeolocationController.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/web/WebFrame.cpp
diff --git a/Source/web/WebFrame.cpp b/Source/web/WebFrame.cpp
index f86da7d2dde61fae82188a974c84e443dea57c7b..db7ad7915e420602a614ccf947aa4c7765424cf5 100644
--- a/Source/web/WebFrame.cpp
+++ b/Source/web/WebFrame.cpp
@@ -15,13 +15,13 @@
namespace blink {
-WebCore::Frame* toWebCoreFrame(const WebFrame* frame)
+blink::Frame* toWebCoreFrame(const WebFrame* frame)
{
if (!frame)
return 0;
return frame->isWebLocalFrame()
- ? static_cast<WebCore::Frame*>(toWebLocalFrameImpl(frame)->frame())
+ ? static_cast<blink::Frame*>(toWebLocalFrameImpl(frame)->frame())
: toWebRemoteFrameImpl(frame)->frame();
}
@@ -31,7 +31,7 @@ void WebFrame::swap(WebFrame* frame)
// All child frames must have been detached first.
ASSERT(!m_firstChild && !m_lastChild);
- // The frame being swapped in should not have a WebCore::Frame associated
+ // The frame being swapped in should not have a blink::Frame associated
// with it yet.
ASSERT(!toWebCoreFrame(frame));
@@ -62,12 +62,12 @@ void WebFrame::swap(WebFrame* frame)
frame->m_openedFrameTracker.reset(m_openedFrameTracker.release());
}
- // Finally, clone the state of the current WebCore::Frame into one matching
+ // 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.
- WebCore::Frame* oldFrame = toWebCoreFrame(this);
- WebCore::FrameOwner* owner = oldFrame->owner();
+ blink::Frame* oldFrame = toWebCoreFrame(this);
+ blink::FrameOwner* owner = oldFrame->owner();
oldFrame->disconnectOwnerElement();
if (frame->isWebLocalFrame()) {
toWebLocalFrameImpl(frame)->initializeWebCoreFrame(oldFrame->host(), owner, oldFrame->tree().name(), nullAtom);
@@ -162,7 +162,7 @@ WebFrame* WebFrame::nextSibling() const
WebFrame* WebFrame::traversePrevious(bool wrap) const
{
- WebCore::Frame* frame = toWebCoreFrame(this);
+ blink::Frame* frame = toWebCoreFrame(this);
if (!frame)
return 0;
return fromFrame(frame->tree().traversePreviousWithWrap(wrap));
@@ -170,7 +170,7 @@ WebFrame* WebFrame::traversePrevious(bool wrap) const
WebFrame* WebFrame::traverseNext(bool wrap) const
{
- WebCore::Frame* frame = toWebCoreFrame(this);
+ blink::Frame* frame = toWebCoreFrame(this);
if (!frame)
return 0;
return fromFrame(frame->tree().traverseNextWithWrap(wrap));
@@ -178,7 +178,7 @@ WebFrame* WebFrame::traverseNext(bool wrap) const
WebFrame* WebFrame::findChildByName(const WebString& name) const
{
- WebCore::Frame* frame = toWebCoreFrame(this);
+ blink::Frame* frame = toWebCoreFrame(this);
if (!frame)
return 0;
// FIXME: It's not clear this should ever be called to find a remote frame.
@@ -186,7 +186,7 @@ WebFrame* WebFrame::findChildByName(const WebString& name) const
return fromFrame(frame->tree().child(name));
}
-WebFrame* WebFrame::fromFrame(WebCore::Frame* frame)
+WebFrame* WebFrame::fromFrame(blink::Frame* frame)
{
if (!frame)
return 0;
« no previous file with comments | « Source/web/WebFormElement.cpp ('k') | Source/web/WebGeolocationController.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698