Index: skia/ext/convolver_unittest.cc |
=================================================================== |
--- skia/ext/convolver_unittest.cc (revision 6142) |
+++ skia/ext/convolver_unittest.cc (working copy) |
@@ -6,10 +6,11 @@ |
#include <time.h> |
#include <vector> |
-#include "base/gfx/convolver.h" |
+#include "skia/ext/convolver.h" |
+ |
#include "testing/gtest/include/gtest/gtest.h" |
-namespace gfx { |
+namespace skia { |
namespace { |
@@ -123,5 +124,5 @@ |
} |
} |
-} // namespace gfx |
+} // namespace skia |
Property changes on: skia\ext\convolver_unittest.cc |
___________________________________________________________________ |
Added: svn:mergeinfo |
Merged /branches/chrome_webkit_merge_branch/base/gfx/convolver_unittest.cc:r69-2775 |