From ba47a183328a3ea283702004cf40310452b4a731 Mon Sep 17 00:00:00 2001 From: "tfarina@chromium.org" Date: Thu, 3 Jan 2013 16:26:26 +0000 Subject: cc: Remove all uses of "using namespace std". BUG=82078,144576,144577 R=danakj@chromium.org Review URL: https://chromiumcodereview.appspot.com/11753004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@174966 0039d316-1c4b-4281-b951-d872f2087c98 --- cc/layer_tree_host.cc | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'cc/layer_tree_host.cc') diff --git a/cc/layer_tree_host.cc b/cc/layer_tree_host.cc index 91276de..12ab72b 100644 --- a/cc/layer_tree_host.cc +++ b/cc/layer_tree_host.cc @@ -29,8 +29,6 @@ #include "cc/thread_proxy.h" #include "cc/tree_synchronizer.h" -using namespace std; - namespace { static int numLayerTreeInstances; } @@ -159,7 +157,7 @@ void LayerTreeHost::initializeRenderer() // Update m_settings based on partial update capability. size_t maxPartialTextureUpdates = 0; if (m_proxy->rendererCapabilities().allowPartialTextureUpdates) - maxPartialTextureUpdates = min(m_settings.maxPartialTextureUpdates, m_proxy->maxPartialTextureUpdates()); + maxPartialTextureUpdates = std::min(m_settings.maxPartialTextureUpdates, m_proxy->maxPartialTextureUpdates()); m_settings.maxPartialTextureUpdates = maxPartialTextureUpdates; m_contentsTextureManager = PrioritizedResourceManager::create(m_proxy.get()); @@ -167,10 +165,10 @@ void LayerTreeHost::initializeRenderer() m_rendererInitialized = true; - m_settings.defaultTileSize = gfx::Size(min(m_settings.defaultTileSize.width(), m_proxy->rendererCapabilities().maxTextureSize), - min(m_settings.defaultTileSize.height(), m_proxy->rendererCapabilities().maxTextureSize)); - m_settings.maxUntiledLayerSize = gfx::Size(min(m_settings.maxUntiledLayerSize.width(), m_proxy->rendererCapabilities().maxTextureSize), - min(m_settings.maxUntiledLayerSize.height(), m_proxy->rendererCapabilities().maxTextureSize)); + m_settings.defaultTileSize = gfx::Size(std::min(m_settings.defaultTileSize.width(), m_proxy->rendererCapabilities().maxTextureSize), + std::min(m_settings.defaultTileSize.height(), m_proxy->rendererCapabilities().maxTextureSize)); + m_settings.maxUntiledLayerSize = gfx::Size(std::min(m_settings.maxUntiledLayerSize.width(), m_proxy->rendererCapabilities().maxTextureSize), + std::min(m_settings.maxUntiledLayerSize.height(), m_proxy->rendererCapabilities().maxTextureSize)); } LayerTreeHost::RecreateResult LayerTreeHost::recreateOutputSurface() @@ -847,7 +845,7 @@ void LayerTreeHost::rateLimit() bool LayerTreeHost::bufferedUpdates() { - return m_settings.maxPartialTextureUpdates != numeric_limits::max(); + return m_settings.maxPartialTextureUpdates != std::numeric_limits::max(); } bool LayerTreeHost::requestPartialTextureUpdate() -- cgit v1.1