diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-10 00:46:16 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-10 00:46:16 +0000 |
| commit | 8392ccddddf7f355d57871a5e9af37750f7139f8 (patch) | |
| tree | 90fad5b03f607fcabea23fb3756005c50da970cd /skia/ext/image_operations.cc | |
| parent | 5e992fa6227a36da5cb705bfca39ebb785027b61 (diff) | |
| download | chromium_src-8392ccddddf7f355d57871a5e9af37750f7139f8.zip chromium_src-8392ccddddf7f355d57871a5e9af37750f7139f8.tar.gz chromium_src-8392ccddddf7f355d57871a5e9af37750f7139f8.tar.bz2 | |
Move stack_container and linked_list to the new containers subdirectory.
This also replaces the StackWString with StackString16 and adds a char traits definition to the string16 header file to make this possible without ifdefs.
BUG=
Review URL: https://codereview.chromium.org/11360174
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@167022 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia/ext/image_operations.cc')
| -rw-r--r-- | skia/ext/image_operations.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/skia/ext/image_operations.cc b/skia/ext/image_operations.cc index 191f6a9..b048f30 100644 --- a/skia/ext/image_operations.cc +++ b/skia/ext/image_operations.cc @@ -10,10 +10,10 @@ #include "skia/ext/image_operations.h" // TODO(pkasting): skia/ext should not depend on base/! +#include "base/containers/stack_container.h" #include "base/debug/trace_event.h" #include "base/logging.h" #include "base/metrics/histogram.h" -#include "base/stack_container.h" #include "base/time.h" #include "build/build_config.h" #include "skia/ext/convolver.h" @@ -232,8 +232,8 @@ void ResizeFilter::ComputeFilters(int src_size, // Speed up the divisions below by turning them into multiplies. float inv_scale = 1.0f / scale; - StackVector<float, 64> filter_values; - StackVector<int16, 64> fixed_filter_values; + base::StackVector<float, 64> filter_values; + base::StackVector<int16, 64> fixed_filter_values; // Loop over all pixels in the output range. We will generate one set of // filter values for each one. Those values will tell us how to blend the |