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

Unified Diff: cc/solid_color_layer_impl.cc

Issue 11267052: cc: Get rid of the remaining includes to MathExtras.h. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 2 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 | « cc/render_surface_filters.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/solid_color_layer_impl.cc
diff --git a/cc/solid_color_layer_impl.cc b/cc/solid_color_layer_impl.cc
index dcb6e5038ea6aeba29308ce7a88f7dfce18d0347..3fe8929d2ebf5dd7093fe6b0dc4d99edc2943748 100644
--- a/cc/solid_color_layer_impl.cc
+++ b/cc/solid_color_layer_impl.cc
@@ -8,9 +8,7 @@
#include "cc/quad_sink.h"
#include "cc/solid_color_draw_quad.h"
-#include <wtf/MathExtras.h>
-using namespace std;
using WebKit::WebTransformationMatrix;
namespace cc {
@@ -36,7 +34,7 @@ void SolidColorLayerImpl::appendQuads(QuadSink& quadSink, AppendQuadsData& appen
int height = contentBounds().height();
for (int x = 0; x < width; x += m_tileSize) {
for (int y = 0; y < height; y += m_tileSize) {
- IntRect solidTileRect(x, y, min(width - x, m_tileSize), min(height - y, m_tileSize));
+ IntRect solidTileRect(x, y, std::min(width - x, m_tileSize), std::min(height - y, m_tileSize));
quadSink.append(SolidColorDrawQuad::create(sharedQuadState, solidTileRect, backgroundColor()).PassAs<DrawQuad>(), appendQuadsData);
}
}
@@ -47,4 +45,4 @@ const char* SolidColorLayerImpl::layerTypeAsString() const
return "SolidColorLayer";
}
-} // namespace cc
+} // namespace cc
« no previous file with comments | « cc/render_surface_filters.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698