| Index: skia/ext/image_operations.cc
|
| ===================================================================
|
| --- skia/ext/image_operations.cc (revision 6267)
|
| +++ skia/ext/image_operations.cc (working copy)
|
| @@ -7,14 +7,14 @@
|
| #include <limits>
|
| #include <vector>
|
|
|
| -#include "base/gfx/image_operations.h"
|
| +#include "skia/ext/image_operations.h"
|
|
|
| -#include "base/gfx/convolver.h"
|
| #include "base/gfx/rect.h"
|
| #include "base/gfx/size.h"
|
| #include "base/logging.h"
|
| #include "base/stack_container.h"
|
| #include "SkBitmap.h"
|
| +#include "skia/ext/convolver.h"
|
|
|
| namespace gfx {
|
|
|
|
|
| Property changes on: skia\ext\image_operations.cc
|
| ___________________________________________________________________
|
| Added: svn:mergeinfo
|
| Merged /branches/chrome_webkit_merge_branch/base/gfx/image_operations.cc:r69-2775
|
|
|
|
|