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

Unified Diff: Source/web/WebLocalFrameImpl.cpp

Issue 471503002: Cleanup namespace usage in Source/web/Web[I-Z]*.cpp (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 4 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/WebLeakDetector.cpp ('k') | Source/web/WebMIDIClientMock.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/web/WebLocalFrameImpl.cpp
diff --git a/Source/web/WebLocalFrameImpl.cpp b/Source/web/WebLocalFrameImpl.cpp
index d3e3ec02014102da058006b84672c72eae57d1bf..977db00555275e3c1756cde9115c5154c6bd0ab8 100644
--- a/Source/web/WebLocalFrameImpl.cpp
+++ b/Source/web/WebLocalFrameImpl.cpp
@@ -195,8 +195,6 @@
#include "wtf/HashMap.h"
#include <algorithm>
-using namespace blink;
-
namespace blink {
static int frameCount = 0;
@@ -274,7 +272,7 @@ WebPluginContainerImpl* WebLocalFrameImpl::pluginContainerFromFrame(LocalFrame*
return toWebPluginContainerImpl(pluginDocument->pluginWidget());
}
-WebPluginContainerImpl* WebLocalFrameImpl::pluginContainerFromNode(blink::LocalFrame* frame, const WebNode& node)
+WebPluginContainerImpl* WebLocalFrameImpl::pluginContainerFromNode(LocalFrame* frame, const WebNode& node)
{
WebPluginContainerImpl* pluginContainer = pluginContainerFromFrame(frame);
if (pluginContainer)
@@ -867,7 +865,7 @@ void WebLocalFrameImpl::loadHTMLString(const WebData& data, const WebURL& baseUR
void WebLocalFrameImpl::sendPings(const WebNode& linkNode, const WebURL& destinationURL)
{
ASSERT(frame());
- const blink::Node* node = linkNode.constUnwrap<Node>();
+ const Node* node = linkNode.constUnwrap<Node>();
if (isHTMLAnchorElement(node))
toHTMLAnchorElement(node)->sendPings(destinationURL);
}
@@ -1157,7 +1155,7 @@ void WebLocalFrameImpl::selectRange(const WebPoint& base, const WebPoint& extent
void WebLocalFrameImpl::selectRange(const WebRange& webRange)
{
if (RefPtrWillBeRawPtr<Range> range = static_cast<PassRefPtrWillBeRawPtr<Range> >(webRange))
- frame()->selection().setSelectedRange(range.get(), blink::VP_DEFAULT_AFFINITY, FrameSelection::NonDirectional, NotUserTriggered);
+ frame()->selection().setSelectedRange(range.get(), VP_DEFAULT_AFFINITY, FrameSelection::NonDirectional, NotUserTriggered);
}
void WebLocalFrameImpl::moveRangeSelection(const WebPoint& base, const WebPoint& extent)
@@ -1525,19 +1523,19 @@ WebLocalFrameImpl::WebLocalFrameImpl(WebFrameClient* client)
, m_userMediaClientImpl(this)
, m_geolocationClientProxy(adoptPtr(new GeolocationClientProxy(client ? client->geolocationClient() : 0)))
{
- blink::Platform::current()->incrementStatsCounter(webFrameActiveCount);
+ Platform::current()->incrementStatsCounter(webFrameActiveCount);
frameCount++;
}
WebLocalFrameImpl::~WebLocalFrameImpl()
{
- blink::Platform::current()->decrementStatsCounter(webFrameActiveCount);
+ Platform::current()->decrementStatsCounter(webFrameActiveCount);
frameCount--;
cancelPendingScopingEffort();
}
-void WebLocalFrameImpl::setWebCoreFrame(PassRefPtr<blink::LocalFrame> frame)
+void WebLocalFrameImpl::setWebCoreFrame(PassRefPtr<LocalFrame> frame)
{
m_frame = frame;
@@ -1833,7 +1831,7 @@ WebLocalFrameImpl* WebLocalFrameImpl::activeMatchFrame() const
return 0;
}
-blink::Range* WebLocalFrameImpl::activeMatch() const
+Range* WebLocalFrameImpl::activeMatch() const
{
if (m_textFinder)
return m_textFinder->activeMatch();
« no previous file with comments | « Source/web/WebLeakDetector.cpp ('k') | Source/web/WebMIDIClientMock.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698