diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-26 12:12:45 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-26 12:12:45 +0000 |
| commit | 71477a09def22aa4173ce670fc30196d34707775 (patch) | |
| tree | 9c795ac8ffac98a96430915fd1d5e3891a213baf /cc | |
| parent | 5120e6a88a1c418068461c5e49e0d4672bf7382b (diff) | |
| download | chromium_src-71477a09def22aa4173ce670fc30196d34707775.zip chromium_src-71477a09def22aa4173ce670fc30196d34707775.tar.gz chromium_src-71477a09def22aa4173ce670fc30196d34707775.tar.bz2 | |
cc: Get rid of the remaining includes to MathExtras.h.
BUG=154451
TEST=cc_unittests
R=enne@chromium.org,jamesr@chromium.org
Review URL: https://codereview.chromium.org/11267052
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@164325 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc')
| -rw-r--r-- | cc/render_surface_filters.cc | 9 | ||||
| -rw-r--r-- | cc/solid_color_layer_impl.cc | 6 |
2 files changed, 5 insertions, 10 deletions
diff --git a/cc/render_surface_filters.cc b/cc/render_surface_filters.cc index a70bfb7..b544bb1 100644 --- a/cc/render_surface_filters.cc +++ b/cc/render_surface_filters.cc @@ -17,9 +17,8 @@ #include <public/WebFilterOperation.h> #include <public/WebFilterOperations.h> #include <public/WebGraphicsContext3D.h> -#include <wtf/MathExtras.h> -using namespace cc; +namespace cc { namespace { @@ -309,9 +308,7 @@ private: SkAutoTUnref<SkCanvas> m_canvas; }; -} - -namespace cc { +} // namespace WebKit::WebFilterOperations RenderSurfaceFilters::optimize(const WebKit::WebFilterOperations& filters) { @@ -441,4 +438,4 @@ SkBitmap RenderSurfaceFilters::apply(const WebKit::WebFilterOperations& filters, return state.source(); } -} +} // namespace cc diff --git a/cc/solid_color_layer_impl.cc b/cc/solid_color_layer_impl.cc index dcb6e50..3fe8929 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 |