diff options
| author | Ben Murdoch <benm@google.com> | 2010-10-22 13:02:20 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-10-26 15:21:41 +0100 |
| commit | a94275402997c11dd2e778633dacf4b7e630a35d (patch) | |
| tree | e66f56c67e3b01f22c9c23cd932271ee9ac558ed /WebCore/platform/graphics/gpu/LoopBlinnMathUtils.cpp | |
| parent | 09e26c78506587b3f5d930d7bc72a23287ffbec0 (diff) | |
| download | external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.zip external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.tar.gz external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.tar.bz2 | |
Merge WebKit at r70209: Initial merge by Git
Change-Id: Id23a68efa36e9d1126bcce0b137872db00892c8e
Diffstat (limited to 'WebCore/platform/graphics/gpu/LoopBlinnMathUtils.cpp')
| -rw-r--r-- | WebCore/platform/graphics/gpu/LoopBlinnMathUtils.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/WebCore/platform/graphics/gpu/LoopBlinnMathUtils.cpp b/WebCore/platform/graphics/gpu/LoopBlinnMathUtils.cpp index 61ebc9b..5b155a5 100644 --- a/WebCore/platform/graphics/gpu/LoopBlinnMathUtils.cpp +++ b/WebCore/platform/graphics/gpu/LoopBlinnMathUtils.cpp @@ -25,12 +25,13 @@ #include "config.h" +#if ENABLE(ACCELERATED_2D_CANVAS) + #include "LoopBlinnMathUtils.h" #include "FloatPoint.h" -#include "MathExtras.h" #include <algorithm> -#include <string.h> // for memcpy +#include <wtf/MathExtras.h> namespace WebCore { namespace LoopBlinnMathUtils { @@ -563,3 +564,5 @@ int numXRayCrossingsForCubic(const XRay& xRay, const FloatPoint cubic[4], bool& } // namespace LoopBlinnMathUtils } // namespace WebCore + +#endif |