Revert my skia file moves because of layout test failures.

Review URL: http://codereview.chromium.org/12892

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6266 0039d316-1c4b-4281-b951-d872f2087c98

6 files changed, 19 insertions, 24 deletions

diff --git a/webkit/port/platform/graphics/FontWin.cpp b/webkit/port/platform/graphics/FontWin.cpp
index 0fa5a26..ac28623 100644
--- a/webkit/port/platform/graphics/FontWin.cpp
+++ b/webkit/port/platform/graphics/FontWin.cpp
@@ -35,8 +35,8 @@
 #include "SkiaUtils.h"
 #include "UniscribeHelperTextRun.h"
 
+#include "base/gfx/skia_utils.h"  // TODO(brettw) remove this dependency.
 #include "skia/ext/platform_canvas_win.h"
-#include "skia/ext/skia_utils_win.h"
 
 namespace WebCore {
 
@@ -69,7 +69,7 @@ void Font::drawGlyphs(GraphicsContext* graphicsContext,
     color = SkColorSetRGB(SkColorGetR(color),
                           SkColorGetG(color),
                           SkColorGetB(color));
-    SetTextColor(hdc, skia::SkColorToCOLORREF(color));
+    SetTextColor(hdc, gfx::SkColorToCOLORREF(color));
     SetBkMode(hdc, TRANSPARENT);
 
     // Windows needs the characters and the advances in nice contiguous
@@ -168,7 +168,7 @@ void Font::drawComplexText(GraphicsContext* graphicsContext,
     color = SkColorSetRGB(SkColorGetR(color),
                           SkColorGetG(color),
                           SkColorGetB(color));
-    SetTextColor(hdc, skia::SkColorToCOLORREF(color));
+    SetTextColor(hdc, gfx::SkColorToCOLORREF(color));
     SetBkMode(hdc, TRANSPARENT);
 
     // Uniscribe counts the coordinates from the upper left, while WebKit uses
diff --git a/webkit/port/platform/graphics/ImageSkia.cpp b/webkit/port/platform/graphics/ImageSkia.cpp
index 12d5ae9..cfdc739 100644
--- a/webkit/port/platform/graphics/ImageSkia.cpp
+++ b/webkit/port/platform/graphics/ImageSkia.cpp
@@ -43,7 +43,7 @@
 #include "SkiaUtils.h"
 #include "SkShader.h"
 
-#include "skia/ext/image_operations.h"
+#include "base/gfx/image_operations.h"  // TODO(brettw) remove this dependency.
 #include "skia/ext/platform_canvas.h"
 
 namespace WebCore {
@@ -217,8 +217,8 @@ void drawResampledBitmap(SkCanvas& canvas,
                                    destBitmapSubsetSkI.height());
 
         // Resample the needed part of the image.
-        SkBitmap resampled = skia::ImageOperations::Resize(subset,
-            skia::ImageOperations::RESIZE_LANCZOS3,
+        SkBitmap resampled = gfx::ImageOperations::Resize(subset,
+            gfx::ImageOperations::RESIZE_LANCZOS3,
             gfx::Size(destRectRounded.width(), destRectRounded.height()),
             destBitmapSubset);
 
@@ -350,8 +350,8 @@ void Image::drawPattern(GraphicsContext* context,
 
     if (resampling == RESAMPLE_AWESOME) {
         // Do nice resampling.
-        SkBitmap resampled = skia::ImageOperations::Resize(src_subset,
-            skia::ImageOperations::RESIZE_LANCZOS3,
+        SkBitmap resampled = gfx::ImageOperations::Resize(src_subset,
+            gfx::ImageOperations::RESIZE_LANCZOS3,
             gfx::Size(static_cast<int>(dest_bitmap_width),
                       static_cast<int>(dest_bitmap_height)));
         shader = SkShader::CreateBitmapShader(
diff --git a/webkit/port/platform/graphics/NativeImageSkia.cpp b/webkit/port/platform/graphics/NativeImageSkia.cpp
index 7158d06..fb765eb 100644
--- a/webkit/port/platform/graphics/NativeImageSkia.cpp
+++ b/webkit/port/platform/graphics/NativeImageSkia.cpp
@@ -28,11 +28,11 @@
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "config.h"
-#include "NativeImageSkia.h"
 
-#include "SkiaUtils.h"
+#include "base/gfx/image_operations.h"
 
-#include "skia/ext/image_operations.h"
+#include "NativeImageSkia.h"
+#include "SkiaUtils.h"
 
 NativeImageSkia::NativeImageSkia()
     : SkBitmap(),
@@ -61,8 +61,8 @@ bool NativeImageSkia::hasResizedBitmap(int w, int h) const {
 
 SkBitmap NativeImageSkia::resizedBitmap(int w, int h) const {
     if (m_resizedImage.width() != w || m_resizedImage.height() != h) {
-        m_resizedImage = skia::ImageOperations::Resize(*this,
-            skia::ImageOperations::RESIZE_LANCZOS3, gfx::Size(w, h));
+        m_resizedImage = gfx::ImageOperations::Resize(*this,
+            gfx::ImageOperations::RESIZE_LANCZOS3, gfx::Size(w, h));
     }
     return m_resizedImage;
 }
diff --git a/webkit/port/platform/graphics/PlatformContextSkia.cpp b/webkit/port/platform/graphics/PlatformContextSkia.cpp
index 1c63927..06b3c0a 100644
--- a/webkit/port/platform/graphics/PlatformContextSkia.cpp
+++ b/webkit/port/platform/graphics/PlatformContextSkia.cpp
@@ -34,6 +34,8 @@
 #include "SkiaUtils.h"
 #include "wtf/MathExtras.h"
 
+#include "base/gfx/image_operations.h"  // TODO(brettw) remove this depencency.
+#include "base/gfx/skia_utils.h"  // TODO(brettw) remove this depencency.
 #include "skia/ext/platform_canvas.h"
 
 #include "SkBitmap.h"
diff --git a/webkit/port/rendering/RenderThemeWin.cpp b/webkit/port/rendering/RenderThemeWin.cpp
index 48a8947..907a6e4 100644
--- a/webkit/port/rendering/RenderThemeWin.cpp
+++ b/webkit/port/rendering/RenderThemeWin.cpp
@@ -37,8 +37,9 @@
 #include "SkiaUtils.h"
 #include "ThemeHelperWin.h"
 
-#include "base/gfx/native_theme.h"  // TODO(brettw) fix this dependency.
-#include "base/win_util.h"  // TODO(brettw) fix this dependency.
+#include "base/gfx/native_theme.h"
+#include "base/gfx/skia_utils.h"
+#include "base/win_util.h"
 
 namespace {
 
@@ -571,7 +572,7 @@ bool RenderThemeWin::paintTextFieldInternal(RenderObject* o,
     gfx::PlatformCanvas* canvas = helper.context()->platformContext()->canvas();
 
     HDC hdc = canvas->beginPlatformPaint();
-    COLORREF clr = o->style()->backgroundColor().rgb() & 0xFFFFFF;
+    COLORREF clr = gfx::SkColorToCOLORREF(o->style()->backgroundColor().rgb());
     RECT renderRect = helper.rect();
 
     gfx::NativeTheme::instance()->PaintTextField(hdc,
diff --git a/webkit/tools/test_shell/test_shell_tests.vcproj b/webkit/tools/test_shell/test_shell_tests.vcproj
index cebf759..4f6a036 100644
--- a/webkit/tools/test_shell/test_shell_tests.vcproj
+++ b/webkit/tools/test_shell/test_shell_tests.vcproj
@@ -307,10 +307,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\skia\ext\convolver_unittest.cc"
-				>
-			</File>
-			<File
 				RelativePath="..\..\glue\cpp_bound_class_unittest.cc"
 				>
 			</File>
@@ -343,10 +339,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\skia\ext\image_operations_unittest.cc"
-				>
-			</File>
-			<File
 				RelativePath=".\keyboard_unittest.cc"
 				>
 			</File>