WebKit merge 41660:41709 (WebKit side)....

third_party/WebKit/WebCore/platform/graphics/skia/GraphicsContextSkia.cpp

 /*
  * Copyright (c) 2006, Google Inc. All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  * 
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 653 matching lines @@
     if (paintingDisabled())
         return;
 
     SkRect r = rect;
     /*
     r.fLeft++;
     r.fRight--;
     r.fTop++;
     r.fBottom--;
     */
-    if (!isRectSkiaSafe(getCTM(), r))
+    if (!isRectSkiaSafe(getCTM(), r)) {
         // See the fillRect below.
         ClipRectToCanvas(*platformContext()->canvas(), r, &r);
+    }
 
     platformContext()->drawRect(r);
 }
 
 void GraphicsContext::fillPath()
 {
     if (paintingDisabled())
         return;
 
     SkPath path = platformContext()->currentPathInLocalCoordinates();
@@ skipping 21 matching lines @@
 
     platformContext()->canvas()->drawPath(path, paint);
 }
 
 void GraphicsContext::fillRect(const FloatRect& rect)
 {
     if (paintingDisabled())
         return;
 
     SkRect r = rect;
-    if (!isRectSkiaSafe(getCTM(), r))
+    if (!isRectSkiaSafe(getCTM(), r)) {
         // See the other version of fillRect below.
         ClipRectToCanvas(*platformContext()->canvas(), r, &r);
+    }
 
     const GraphicsContextState& state = m_common->state;
     ColorSpace colorSpace = state.fillColorSpace;
 
     if (colorSpace == SolidColorSpace && !fillColor().alpha())
         return;
 
     SkPaint paint;
     platformContext()->setupPaintForFilling(&paint);
 
@@ skipping 405 matching lines @@
 void GraphicsContext::translate(float w, float h)
 {
     if (paintingDisabled())
         return;
 
     platformContext()->canvas()->translate(WebCoreFloatToSkScalar(w),
                                            WebCoreFloatToSkScalar(h));
 }
 
 }  // namespace WebCore