| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (c) 2006,2007,2008, Google Inc. All rights reserved. | 2 * Copyright (c) 2006,2007,2008, Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 18 matching lines...) Expand all Loading... |
| 29 */ | 29 */ |
| 30 | 30 |
| 31 // All of the functions in this file should move to new homes and this file shou
ld be deleted. | 31 // All of the functions in this file should move to new homes and this file shou
ld be deleted. |
| 32 | 32 |
| 33 #ifndef SkiaUtils_h | 33 #ifndef SkiaUtils_h |
| 34 #define SkiaUtils_h | 34 #define SkiaUtils_h |
| 35 | 35 |
| 36 #include "SkMatrix.h" | 36 #include "SkMatrix.h" |
| 37 #include "SkPath.h" | 37 #include "SkPath.h" |
| 38 #include "SkXfermode.h" | 38 #include "SkXfermode.h" |
| 39 #include "platform/PlatformExport.h" |
| 39 #include "platform/geometry/FloatRect.h" | 40 #include "platform/geometry/FloatRect.h" |
| 40 #include "platform/graphics/Color.h" | 41 #include "platform/graphics/Color.h" |
| 41 #include "platform/graphics/GraphicsTypes.h" | 42 #include "platform/graphics/GraphicsTypes.h" |
| 42 #include "platform/transforms/AffineTransform.h" | 43 #include "platform/transforms/AffineTransform.h" |
| 43 #include "wtf/MathExtras.h" | 44 #include "wtf/MathExtras.h" |
| 44 #include "wtf/PassRefPtr.h" | 45 #include "wtf/PassRefPtr.h" |
| 45 | 46 |
| 46 class SkCanvas; | 47 class SkCanvas; |
| 47 class SkRegion; | 48 class SkRegion; |
| 48 | 49 |
| 49 namespace WebCore { | 50 namespace WebCore { |
| 50 | 51 |
| 51 class GraphicsContext; | 52 class GraphicsContext; |
| 52 | 53 |
| 53 PassRefPtr<SkXfermode> WebCoreCompositeToSkiaComposite(CompositeOperator, blink:
:WebBlendMode = blink::WebBlendModeNormal); | 54 PassRefPtr<SkXfermode> WebCoreCompositeToSkiaComposite(CompositeOperator, blink:
:WebBlendMode = blink::WebBlendModeNormal); |
| 54 | 55 |
| 55 // move this guy into SkColor.h | 56 // move this guy into SkColor.h |
| 56 SkColor SkPMColorToColor(SkPMColor); | 57 SkColor SkPMColorToColor(SkPMColor); |
| 57 | 58 |
| 58 // This should be an operator on Color | |
| 59 Color SkPMColorToWebCoreColor(SkPMColor); | |
| 60 | |
| 61 // Skia has problems when passed infinite, etc floats, filter them to 0. | 59 // Skia has problems when passed infinite, etc floats, filter them to 0. |
| 62 inline SkScalar WebCoreFloatToSkScalar(float f) | 60 inline SkScalar WebCoreFloatToSkScalar(float f) |
| 63 { | 61 { |
| 64 return SkFloatToScalar(std::isfinite(f) ? f : 0); | 62 return SkFloatToScalar(std::isfinite(f) ? f : 0); |
| 65 } | 63 } |
| 66 | 64 |
| 67 inline SkScalar WebCoreDoubleToSkScalar(double d) | 65 inline SkScalar WebCoreDoubleToSkScalar(double d) |
| 68 { | 66 { |
| 69 return SkDoubleToScalar(std::isfinite(d) ? d : 0); | 67 return SkDoubleToScalar(std::isfinite(d) ? d : 0); |
| 70 } | 68 } |
| 71 | 69 |
| 72 inline SkRect WebCoreFloatRectToSKRect(const FloatRect& rect) | 70 inline SkRect WebCoreFloatRectToSKRect(const FloatRect& rect) |
| 73 { | 71 { |
| 74 return SkRect::MakeLTRB(SkFloatToScalar(rect.x()), SkFloatToScalar(rect.y())
, | 72 return SkRect::MakeLTRB(SkFloatToScalar(rect.x()), SkFloatToScalar(rect.y())
, |
| 75 SkFloatToScalar(rect.maxX()), SkFloatToScalar(rect.maxY())); | 73 SkFloatToScalar(rect.maxX()), SkFloatToScalar(rect.maxY())); |
| 76 } | 74 } |
| 77 | 75 |
| 78 // Computes the smallest rectangle that, which when drawn to the given canvas, | 76 // Computes the smallest rectangle that, which when drawn to the given canvas, |
| 79 // will cover the same area as the source rectangle. It will clip to the canvas' | 77 // will cover the same area as the source rectangle. It will clip to the canvas' |
| 80 // clip, doing the necessary coordinate transforms. | 78 // clip, doing the necessary coordinate transforms. |
| 81 // | 79 // |
| 82 // srcRect and destRect can be the same. | 80 // srcRect and destRect can be the same. |
| 83 void ClipRectToCanvas(const GraphicsContext*, const SkRect& srcRect, SkRect* des
tRect); | 81 void ClipRectToCanvas(const GraphicsContext*, const SkRect& srcRect, SkRect* des
tRect); |
| 84 | 82 |
| 85 // Determine if a given WebKit point is contained in a path | 83 // Determine if a given WebKit point is contained in a path |
| 86 bool SkPathContainsPoint(const SkPath&, const FloatPoint&, SkPath::FillType); | 84 bool PLATFORM_EXPORT SkPathContainsPoint(const SkPath&, const FloatPoint&, SkPat
h::FillType); |
| 87 | 85 |
| 88 SkMatrix affineTransformToSkMatrix(const AffineTransform&); | 86 SkMatrix PLATFORM_EXPORT affineTransformToSkMatrix(const AffineTransform&); |
| 89 | 87 |
| 90 } // namespace WebCore | 88 } // namespace WebCore |
| 91 | 89 |
| 92 #endif // SkiaUtils_h | 90 #endif // SkiaUtils_h |
| OLD | NEW |