Remove most remaining webcore points and sizes.

cc/render_surface_filters.cc

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 
 #include "cc/render_surface_filters.h"
 
-#include "FloatSize.h"
 #include "base/logging.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/effects/SkBlurImageFilter.h"
 #include "third_party/skia/include/effects/SkColorMatrixFilter.h"
 #include "third_party/skia/include/effects/SkMagnifierImageFilter.h"
 #include "third_party/skia/include/gpu/SkGpuDevice.h"
 #include "third_party/skia/include/gpu/SkGrPixelRef.h"
+#include "ui/gfx/size_f.h"
 #include <public/WebFilterOperation.h>
 #include <public/WebFilterOperations.h>
 #include <public/WebGraphicsContext3D.h>
 
 namespace cc {
 
 namespace {
 
 void getBrightnessMatrix(float amount, SkScalar matrix[20])
 {
@@ skipping 33 matching lines @@
     matrix[10] = 0.213f - 0.213f * amount;
     matrix[11] = 0.715f - 0.715f * amount;
     matrix[12] = 1.f - (matrix[10] + matrix[11]);
     matrix[13] = matrix[14] = 0;
     matrix[15] = matrix[16] = matrix[17] = matrix[19] = 0;
     matrix[18] = 1;
 }
 
 void getHueRotateMatrix(float hue, SkScalar matrix[20])
 {
-    float cosHue = cosf(hue * piFloat / 180); 
-    float sinHue = sinf(hue * piFloat / 180); 
+    const float kPi = 3.1415926535897932384626433832795f;
+
+    float cosHue = cosf(hue * kPi / 180);
+    float sinHue = sinf(hue * kPi / 180);
     matrix[0] = 0.213f + cosHue * 0.787f - sinHue * 0.213f;
     matrix[1] = 0.715f - cosHue * 0.715f - sinHue * 0.715f;
     matrix[2] = 0.072f - cosHue * 0.072f + sinHue * 0.928f;
     matrix[3] = matrix[4] = 0;
     matrix[5] = 0.213f - cosHue * 0.213f + sinHue * 0.143f;
     matrix[6] = 0.715f + cosHue * 0.285f + sinHue * 0.140f;
     matrix[7] = 0.072f - cosHue * 0.072f - sinHue * 0.283f;
     matrix[8] = matrix[9] = 0;
     matrix[10] = 0.213f - cosHue * 0.213f - sinHue * 0.787f;
     matrix[11] = 0.715f - cosHue * 0.715f + sinHue * 0.715f;
@@ skipping 147 matching lines @@
         memcpy(matrix, op.matrix(), sizeof(SkScalar[20]));
         return true;
     }
     default:
         return false;
     }
 }
 
 class FilterBufferState {
 public:
-    FilterBufferState(GrContext* grContext, const FloatSize& size, unsigned textureId)
+    FilterBufferState(GrContext* grContext, const gfx::SizeF& size, unsigned textureId)
         : m_grContext(grContext)
         , m_currentTexture(0)
     {
         // Wrap the source texture in a Ganesh platform texture.
         GrPlatformTextureDesc platformTextureDescription;
         platformTextureDescription.fWidth = size.width();
         platformTextureDescription.fHeight = size.height();
         platformTextureDescription.fConfig = kSkia8888_GrPixelConfig;
         platformTextureDescription.fTextureHandle = textureId;
         SkAutoTUnref<GrTexture> texture(grContext->createPlatformTexture(platformTextureDescription));
@@ skipping 108 matching lines @@
         case WebKit::WebFilterOperation::FilterTypeOpacity:
         case WebKit::WebFilterOperation::FilterTypeColorMatrix:
             break;
         }
     }
     if (haveAccumulatedColorMatrix)
         newList.append(WebKit::WebFilterOperation::createColorMatrixFilter(accumulatedColorMatrix));
     return newList;
 }
 
-SkBitmap RenderSurfaceFilters::apply(const WebKit::WebFilterOperations& filters, unsigned textureId, const FloatSize& size, WebKit::WebGraphicsContext3D* context3D, GrContext* grContext)
+SkBitmap RenderSurfaceFilters::apply(const WebKit::WebFilterOperations& filters, unsigned textureId, const gfx::SizeF& size, WebKit::WebGraphicsContext3D* context3D, GrContext* grContext)
 {
     if (!context3D || !grContext)
         return SkBitmap();
 
     WebKit::WebFilterOperations optimizedFilters = optimize(filters);
     FilterBufferState state(grContext, size, textureId);
     if (!state.init(optimizedFilters.size()))
         return SkBitmap();
 
     for (unsigned i = 0; i < optimizedFilters.size(); ++i) {
@@ skipping 53 matching lines @@
             NOTREACHED();
             break;
         }
         state.swap();
     }
     context3D->flush();
     return state.source();
 }
 
 }  // namespace cc