Changeset 47495 in webkit

Timestamp:

Aug 18, 2009 11:31:27 PM (15 years ago)

Author:

eric@webkit.org

Message:

2009-08-18 Mike Fenton <​mike.fenton@torchmobile.com>

Reviewed by Eric Seidel.

Style fixes based on cpp_style.py and WebKit Style guide for
GraphicsContextSkia.cpp

​https://bugs.webkit.org/show_bug.cgi?id=28268

• platform/graphics/skia/GraphicsContextSkia.cpp: (WebCore::GraphicsContext::addInnerRoundedRectClip): (WebCore::GraphicsContext::drawFocusRing): (WebCore::GraphicsContext::roundToDevicePixels): (WebCore::GraphicsContext::setLineDash): (WebCore::GraphicsContext::setPlatformShadow):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/skia/GraphicsContextSkia.cpp (modified) (7 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-08-18  Mike Fenton  <mike.fenton@torchmobile.com>
+
+        Reviewed by Eric Seidel.
+
+        Style fixes based on cpp_style.py and WebKit Style guide for
+        GraphicsContextSkia.cpp
+
+        https://bugs.webkit.org/show_bug.cgi?id=28268
+
+        * platform/graphics/skia/GraphicsContextSkia.cpp:
+        (WebCore::GraphicsContext::addInnerRoundedRectClip):
+        (WebCore::GraphicsContext::drawFocusRing):
+        (WebCore::GraphicsContext::roundToDevicePixels):
+        (WebCore::GraphicsContext::setLineDash):
+        (WebCore::GraphicsContext::setPlatformShadow):
+
 2009-08-18  Alexey Proskuryakov  <ap@webkit.org>
 

trunk/WebCore/platform/graphics/skia/GraphicsContextSkia.cpp

@@ -32 +32 @@
 #include "GraphicsContext.h"
 
-#include "GraphicsContextPlatformPrivate.h"
-#include "GraphicsContextPrivate.h"
 #include "Color.h"
 #include "FloatRect.h"
 #include "Gradient.h"
+#include "GraphicsContextPlatformPrivate.h"
+#include "GraphicsContextPrivate.h"
 #include "ImageBuffer.h"
 #include "IntRect.h"
@@ -47 +47 @@
 #include "SkBlurDrawLooper.h"
 #include "SkCornerPathEffect.h"
+#include "SkShader.h"
+#include "SkiaUtils.h"
 #include "skia/ext/platform_canvas.h"
-#include "SkiaUtils.h"
-#include "SkShader.h"
 
 #include <math.h>
@@ -294 +294 @@
     // only perform the inset if we won't invert r
     if (2 * thickness < rect.width() && 2 * thickness < rect.height()) {
-        r.inset(SkIntToScalar(thickness) ,SkIntToScalar(thickness));
+        r.inset(SkIntToScalar(thickness), SkIntToScalar(thickness));
         path.addOval(r, SkPath::kCCW_Direction);
     }
@@ -488 +488 @@
     const Vector<IntRect>& rects = focusRingRects();
     unsigned rectCount = rects.size();
-    if (0 == rectCount)
+    if (!rectCount)
         return;
 
@@ -845 +845 @@
 
     // Don't let the height or width round to 0 unless either was originally 0
-    if (deviceOrigin.y() == deviceLowerRight.y() && rect.height() != 0)
+    if (deviceOrigin.y() == deviceLowerRight.y() && rect.height())
         deviceLowerRight.move(0, 1);
-    if (deviceOrigin.x() == deviceLowerRight.x() && rect.width() != 0)
+    if (deviceOrigin.x() == deviceLowerRight.x() && rect.width())
         deviceLowerRight.move(1, 0);
 
@@ -920 +920 @@
     }
 
-    size_t count = (dashLength % 2) == 0 ? dashLength : dashLength * 2;
+    size_t count = !(dashLength % 2) ? dashLength : dashLength * 2;
     SkScalar* intervals = new SkScalar[count];
 
@@ -991 +991 @@
 
     // Detect when there's no effective shadow and clear the looper.
-    if (size.width() == 0 && size.height() == 0 && blurInt == 0) {
-        platformContext()->setDrawLooper(NULL);
+    if (!size.width() && !size.height() && !blurInt) {
+        platformContext()->setDrawLooper(0);
         return;
     }