Index: skia/ext/convolver.cc |
=================================================================== |
--- skia/ext/convolver.cc (revision 6142) |
+++ skia/ext/convolver.cc (working copy) |
@@ -4,11 +4,12 @@ |
#include <algorithm> |
+#include "skia/ext/convolver.h" |
+ |
#include "base/basictypes.h" |
-#include "base/gfx/convolver.h" |
#include "base/logging.h" |
-namespace gfx { |
+namespace skia { |
namespace { |
@@ -331,5 +332,5 @@ |
} |
} |
-} // namespace gfx |
+} // namespace skia |
Property changes on: skia\ext\convolver.cc |
___________________________________________________________________ |
Added: svn:mergeinfo |
Merged /branches/chrome_webkit_merge_branch/base/gfx/convolver.cc:r69-2775 |