Changeset 116806 in webkit

Timestamp:

May 11, 2012 2:40:50 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

ImageSkia.cpp does not conform to style guidelines
​https://bugs.webkit.org/show_bug.cgi?id=86219

Patch by Keyar Hood <​keyar@chromium.org> on 2012-05-11
Reviewed by Stephen White.

No tests as this is purely style changees.

• platform/graphics/skia/ImageSkia.cpp:

(WebCore::TransformDimensions):
(WebCore::BitmapImage::draw):
(WebCore::BitmapImageSingleFrameSkia::draw):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/skia/ImageSkia.cpp (modified) (5 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-05-11  Keyar Hood  <keyar@chromium.org>
+
+        ImageSkia.cpp does not conform to style guidelines
+        https://bugs.webkit.org/show_bug.cgi?id=86219
+
+        Reviewed by Stephen White.
+
+        No tests as this is purely style changees.
+
+        * platform/graphics/skia/ImageSkia.cpp:
+        (WebCore::TransformDimensions):
+        (WebCore::BitmapImage::draw):
+        (WebCore::BitmapImageSingleFrameSkia::draw):
+
 2012-05-11  Tim Horton  <timothy_horton@apple.com>
 

trunk/Source/WebCore/platform/graphics/skia/ImageSkia.cpp

@@ -254 +254 @@
 // Transforms the given dimensions with the given matrix. Used to see how big
 // images will be once transformed.
-static void TransformDimensions(const SkMatrix& matrix, float srcWidth, float srcHeight, float* destWidth, float* destHeight) {
+static void TransformDimensions(const SkMatrix& matrix, float srcWidth, float srcHeight, float* destWidth, float* destHeight)
+{
     // Transform 3 points to see how long each side of the bitmap will be.
-    SkPoint src_points[3];  // (0, 0), (width, 0), (0, height).
-    src_points[0].set(0, 0);
-    src_points[1].set(SkFloatToScalar(srcWidth), 0);
-    src_points[2].set(0, SkFloatToScalar(srcHeight));
+    SkPoint srcPoints[3]; // (0, 0), (width, 0), (0, height).
+    srcPoints[0].set(0, 0);
+    srcPoints[1].set(SkFloatToScalar(srcWidth), 0);
+    srcPoints[2].set(0, SkFloatToScalar(srcHeight));
 
     // Now measure the length of the two transformed vectors relative to the
     // transformed origin to see how big the bitmap will be. Note: for skews,
     // this isn't the best thing, but we don't have skews.
-    SkPoint dest_points[3];
-    matrix.mapPoints(dest_points, src_points, 3);
-    *destWidth = SkScalarToFloat((dest_points[1] - dest_points[0]).length());
-    *destHeight = SkScalarToFloat((dest_points[2] - dest_points[0]).length());
+    SkPoint destPoints[3];
+    matrix.mapPoints(destPoints, srcPoints, 3);
+    *destWidth = SkScalarToFloat((destPoints[1] - destPoints[0]).length());
+    *destHeight = SkScalarToFloat((destPoints[2] - destPoints[0]).length());
 }
 
@@ -429 +430 @@
     NativeImageSkia* bm = nativeImageForCurrentFrame();
     if (!bm)
-        return;  // It's too early and we don't have an image yet.
+        return; // It's too early and we don't have an image yet.
 
     FloatRect normDstRect = normalizeRect(dstRect);
@@ -435 +436 @@
 
     if (normSrcRect.isEmpty() || normDstRect.isEmpty())
-        return;  // Nothing to draw.
+        return; // Nothing to draw.
 
     paintSkBitmap(ctxt->platformContext(),
@@ -459 +460 @@
 
     if (normSrcRect.isEmpty() || normDstRect.isEmpty())
-        return;  // Nothing to draw.
+        return; // Nothing to draw.
 
     paintSkBitmap(ctxt->platformContext(),
@@ -487 +488 @@
 }
 
-}  // namespace WebCore
+} // namespace WebCore