Changeset 179398 in webkit

Timestamp:

Jan 30, 2015, 5:56:50 AM (11 years ago)

Author:

Csaba Osztrogonác

Message:

[cairo] Fix #if guards in platform/graphics/cairo directory
​https://bugs.webkit.org/show_bug.cgi?id=141076

Reviewed by Sergio Villar Senin.

• platform/graphics/cairo/BackingStoreBackendCairo.h:
• platform/graphics/cairo/BitmapImageCairo.cpp:
• platform/graphics/cairo/CairoUtilities.cpp:
• platform/graphics/cairo/CairoUtilities.h:
• platform/graphics/cairo/DrawErrorUnderline.h:
• platform/graphics/cairo/DrawingBufferCairo.cpp:
• platform/graphics/cairo/FloatRectCairo.cpp:
• platform/graphics/cairo/FontCairo.cpp:
• platform/graphics/cairo/FontCairoHarfbuzzNG.cpp:
• platform/graphics/cairo/FontCustomPlatformData.h:
• platform/graphics/cairo/GradientCairo.cpp:
• platform/graphics/cairo/GraphicsContext3DCairo.cpp:
• platform/graphics/cairo/GraphicsContextCairo.cpp:
• platform/graphics/cairo/GraphicsContextPlatformPrivateCairo.h:
• platform/graphics/cairo/ImageBufferCairo.cpp:
• platform/graphics/cairo/ImageBufferDataCairo.h:
• platform/graphics/cairo/ImageCairo.cpp:
• platform/graphics/cairo/IntRectCairo.cpp:
• platform/graphics/cairo/OwnPtrCairo.cpp:
• platform/graphics/cairo/OwnPtrCairo.h:
• platform/graphics/cairo/PathCairo.cpp:
• platform/graphics/cairo/PatternCairo.cpp:
• platform/graphics/cairo/PlatformContextCairo.cpp:
• platform/graphics/cairo/PlatformContextCairo.h:
• platform/graphics/cairo/PlatformPathCairo.cpp:
• platform/graphics/cairo/PlatformPathCairo.h:
• platform/graphics/cairo/RefPtrCairo.cpp:
• platform/graphics/cairo/RefPtrCairo.h:
• platform/graphics/cairo/TileCairo.h:
• platform/graphics/cairo/TransformationMatrixCairo.cpp:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/cairo/BackingStoreBackendCairo.h (modified) (1 diff)
• platform/graphics/cairo/BitmapImageCairo.cpp (modified) (2 diffs)
• platform/graphics/cairo/CairoUtilities.cpp (modified) (2 diffs)
• platform/graphics/cairo/CairoUtilities.h (modified) (2 diffs)
• platform/graphics/cairo/DrawErrorUnderline.h (modified) (2 diffs)
• platform/graphics/cairo/DrawingBufferCairo.cpp (modified) (2 diffs)
• platform/graphics/cairo/FloatRectCairo.cpp (modified) (2 diffs)
• platform/graphics/cairo/FontCairo.cpp (modified) (2 diffs)
• platform/graphics/cairo/FontCairoHarfbuzzNG.cpp (modified) (4 diffs)
• platform/graphics/cairo/FontCustomPlatformData.h (modified) (2 diffs)
• platform/graphics/cairo/GradientCairo.cpp (modified) (2 diffs)
• platform/graphics/cairo/GraphicsContext3DCairo.cpp (modified) (2 diffs)
• platform/graphics/cairo/GraphicsContextCairo.cpp (modified) (1 diff)
• platform/graphics/cairo/GraphicsContextPlatformPrivateCairo.h (modified) (2 diffs)
• platform/graphics/cairo/ImageBufferCairo.cpp (modified) (2 diffs)
• platform/graphics/cairo/ImageBufferDataCairo.h (modified) (2 diffs)
• platform/graphics/cairo/ImageCairo.cpp (modified) (1 diff)
• platform/graphics/cairo/IntRectCairo.cpp (modified) (2 diffs)
• platform/graphics/cairo/OwnPtrCairo.cpp (modified) (2 diffs)
• platform/graphics/cairo/OwnPtrCairo.h (modified) (2 diffs)
• platform/graphics/cairo/PathCairo.cpp (modified) (2 diffs)
• platform/graphics/cairo/PatternCairo.cpp (modified) (2 diffs)
• platform/graphics/cairo/PlatformContextCairo.cpp (modified) (2 diffs)
• platform/graphics/cairo/PlatformContextCairo.h (modified) (2 diffs)
• platform/graphics/cairo/PlatformPathCairo.cpp (modified) (2 diffs)
• platform/graphics/cairo/PlatformPathCairo.h (modified) (2 diffs)
• platform/graphics/cairo/RefPtrCairo.cpp (modified) (2 diffs)
• platform/graphics/cairo/RefPtrCairo.h (modified) (2 diffs)
• platform/graphics/cairo/TileCairo.h (modified) (1 diff)
• platform/graphics/cairo/TransformationMatrixCairo.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-01-30  Csaba Osztrogonác  <ossy@webkit.org>
+
+        [cairo] Fix #if guards in platform/graphics/cairo directory
+        https://bugs.webkit.org/show_bug.cgi?id=141076
+
+        Reviewed by Sergio Villar Senin.
+
+        * platform/graphics/cairo/BackingStoreBackendCairo.h:
+        * platform/graphics/cairo/BitmapImageCairo.cpp:
+        * platform/graphics/cairo/CairoUtilities.cpp:
+        * platform/graphics/cairo/CairoUtilities.h:
+        * platform/graphics/cairo/DrawErrorUnderline.h:
+        * platform/graphics/cairo/DrawingBufferCairo.cpp:
+        * platform/graphics/cairo/FloatRectCairo.cpp:
+        * platform/graphics/cairo/FontCairo.cpp:
+        * platform/graphics/cairo/FontCairoHarfbuzzNG.cpp:
+        * platform/graphics/cairo/FontCustomPlatformData.h:
+        * platform/graphics/cairo/GradientCairo.cpp:
+        * platform/graphics/cairo/GraphicsContext3DCairo.cpp:
+        * platform/graphics/cairo/GraphicsContextCairo.cpp:
+        * platform/graphics/cairo/GraphicsContextPlatformPrivateCairo.h:
+        * platform/graphics/cairo/ImageBufferCairo.cpp:
+        * platform/graphics/cairo/ImageBufferDataCairo.h:
+        * platform/graphics/cairo/ImageCairo.cpp:
+        * platform/graphics/cairo/IntRectCairo.cpp:
+        * platform/graphics/cairo/OwnPtrCairo.cpp:
+        * platform/graphics/cairo/OwnPtrCairo.h:
+        * platform/graphics/cairo/PathCairo.cpp:
+        * platform/graphics/cairo/PatternCairo.cpp:
+        * platform/graphics/cairo/PlatformContextCairo.cpp:
+        * platform/graphics/cairo/PlatformContextCairo.h:
+        * platform/graphics/cairo/PlatformPathCairo.cpp:
+        * platform/graphics/cairo/PlatformPathCairo.h:
+        * platform/graphics/cairo/RefPtrCairo.cpp:
+        * platform/graphics/cairo/RefPtrCairo.h:
+        * platform/graphics/cairo/TileCairo.h:
+        * platform/graphics/cairo/TransformationMatrixCairo.cpp:
+
 2015-01-29  Darin Adler  <darin@apple.com>
 

trunk/Source/WebCore/platform/graphics/cairo/BackingStoreBackendCairo.h

@@ -52 +52 @@
 };
 
-#endif // USE(CAIRO)
 
 } // namespace WebCore
 
+#endif // USE(CAIRO)
+
 #endif // BackingStoreBackendCairo_h

trunk/Source/WebCore/platform/graphics/cairo/BitmapImageCairo.cpp

@@ -28 +28 @@
 #include "config.h"
 #include "BitmapImage.h"
+
+#if USE(CAIRO)
 
 #include "CairoUtilities.h"
@@ -166 +168 @@
 } // namespace WebCore
 
+#endif // USE(CAIRO)

trunk/Source/WebCore/platform/graphics/cairo/CairoUtilities.cpp

@@ -27 +27 @@
 #include "config.h"
 #include "CairoUtilities.h"
+
+#if USE(CAIRO)
 
 #include "AffineTransform.h"
@@ -308 +310 @@
 
 } // namespace WebCore
+
+#endif // USE(CAIRO)

trunk/Source/WebCore/platform/graphics/cairo/CairoUtilities.h

@@ -27 +27 @@
 #ifndef CairoUtilities_h
 #define CairoUtilities_h
+
+#if USE(CAIRO)
 
 #include "GraphicsTypes.h"
@@ -66 +68 @@
 } // namespace WebCore
 
+#endif // USE(CAIRO)
+
 #endif // CairoUtilities_h

trunk/Source/WebCore/platform/graphics/cairo/DrawErrorUnderline.h

@@ -22 +22 @@
  */
 
-#if USE(CAIRO)
-
 #ifndef DrawErrorUnderline_h
 #define DrawErrorUnderline_h
+
+#if USE(CAIRO)
 
 #include <cairo.h>
@@ -102 +102 @@
 }
 
+#endif // USE(CAIRO)
+
 #endif // DrawErrorUnderline_h
-
-#endif

trunk/Source/WebCore/platform/graphics/cairo/DrawingBufferCairo.cpp

@@ -25 +25 @@
 
 #include "config.h"
-
-#if ENABLE(ACCELERATED_2D_CANVAS) || USE(3D_GRAPHICS)
-
 #include "DrawingBuffer.h"
 
+#if USE(CAIRO) && (ENABLE(ACCELERATED_2D_CANVAS) || USE(3D_GRAPHICS))
 #include "Extensions3D.h"
 
@@ -45 +43 @@
 }
 
-#endif
+#endif // USE(CAIRO) && (ENABLE(ACCELERATED_2D_CANVAS) || USE(3D_GRAPHICS))

trunk/Source/WebCore/platform/graphics/cairo/FloatRectCairo.cpp

@@ -27 +27 @@
 #include "FloatRect.h"
 
+#if USE(CAIRO)
+
 #include <cairo.h>
 
@@ -44 +46 @@
 
 } // namespace WebCore
+
+#endif // USE(CAIRO)

trunk/Source/WebCore/platform/graphics/cairo/FontCairo.cpp

@@ -32 +32 @@
 #include "FontCascade.h"
 
+#if USE(CAIRO)
+
 #include "AffineTransform.h"
 #include "CairoUtilities.h"
@@ -356 +358 @@
     return result;
 }
-#endif
-
-}
+#endif // ENABLE(CSS3_TEXT_DECORATION_SKIP_INK)
+
+} // namespace WebCore
+
+#endif // USE(CAIRO)

trunk/Source/WebCore/platform/graphics/cairo/FontCairoHarfbuzzNG.cpp

@@ -28 +28 @@
 #include "FontCascade.h"
 
+#if USE(CAIRO)
+
 #include "Font.h"
 #include "GraphicsContext.h"
@@ -38 +40 @@
 
 namespace WebCore {
-
 
 float FontCascade::getGlyphsAndAdvancesForComplexText(const TextRun& run, int, int, GlyphBuffer& glyphBuffer, ForTextEmphasisOrNot /* forTextEmphasis */) const
@@ -51 +52 @@
     return 0;
 }
+
 float FontCascade::drawComplexText(GraphicsContext* context, const TextRun& run, const FloatPoint& point, int from, int to) const
 {
@@ -114 +116 @@
 }
 
-}
+} // namespace WebCore
+
+#endif // USE(CAIRO)

trunk/Source/WebCore/platform/graphics/cairo/FontCustomPlatformData.h

@@ -22 +22 @@
 #ifndef FontCustomPlatformData_h
 #define FontCustomPlatformData_h
+
+#if USE(CAIRO)
 
 #include "FontOrientation.h"
@@ -51 +53 @@
 std::unique_ptr<FontCustomPlatformData> createFontCustomPlatformData(SharedBuffer&);
 
-}
+} // namespace WebCore
 
-#endif
+#endif // USE(CAIRO)
+
+#endif // FontCustomPlatformData_h

trunk/Source/WebCore/platform/graphics/cairo/GradientCairo.cpp

@@ -27 +27 @@
 #include "config.h"
 #include "Gradient.h"
+
+#if USE(CAIRO)
 
 #include "GraphicsContext.h"
@@ -107 +109 @@
 }
 
-} //namespace
+} // namespace WebCore
+
+#endif // USE(CAIRO)

trunk/Source/WebCore/platform/graphics/cairo/GraphicsContext3DCairo.cpp

@@ -28 +28 @@
 #include "config.h"
 
+#if USE(CAIRO)
+
 #if USE(3D_GRAPHICS)
 #include "GraphicsContext3D.h"
@@ -308 +310 @@
 
 #endif // USE(3D_GRAPHICS)
+
+#endif // USE(CAIRO)

trunk/Source/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp

@@ -1107 +1107 @@
     setCTM(transform.toAffineTransform());
 }
-#endif
+#endif // ENABLE(3D_RENDERING) && USE(TEXTURE_MAPPER)
 
 } // namespace WebCore

trunk/Source/WebCore/platform/graphics/cairo/GraphicsContextPlatformPrivateCairo.h

@@ -30 +30 @@
 
 #include "GraphicsContext.h"
+
+#if USE(CAIRO)
 
 #include "PlatformContextCairo.h"
@@ -115 +117 @@
 } // namespace WebCore
 
+#endif // USE(CAIRO)
+
 #endif // GraphicsContextPlatformPrivateCairo_h

trunk/Source/WebCore/platform/graphics/cairo/ImageBufferCairo.cpp

@@ -30 +30 @@
 #include "ImageBuffer.h"
 
+#if USE(CAIRO)
+
 #include "BitmapImage.h"
 #include "CairoUtilities.h"
@@ -419 +421 @@
 
 } // namespace WebCore
+
+#endif // USE(CAIRO)

trunk/Source/WebCore/platform/graphics/cairo/ImageBufferDataCairo.h

@@ -26 +26 @@
 #ifndef ImageBufferDataCairo_h
 #define ImageBufferDataCairo_h
+
+#if USE(CAIRO)
 
 #include "PlatformContextCairo.h"
@@ -59 +61 @@
 } // namespace WebCore
 
+#endif // USE(CAIRO)
+
 #endif // ImageBufferDataCairo_h

trunk/Source/WebCore/platform/graphics/cairo/ImageCairo.cpp

@@ -56 +56 @@
 }
 
-}
+} // namespace WebCore
 
 #endif // USE(CAIRO)

trunk/Source/WebCore/platform/graphics/cairo/IntRectCairo.cpp

@@ -22 +22 @@
 #include "IntRect.h"
 
+#if USE(CAIRO)
+
 #include <cairo.h>
 
@@ -38 +40 @@
 }
 
-}
+} // namespace WebCore
+
+#endif // USE(CAIRO)

trunk/Source/WebCore/platform/graphics/cairo/OwnPtrCairo.cpp

@@ -20 +20 @@
 #include "config.h"
 #include "OwnPtrCairo.h"
+
+#if USE(CAIRO)
 
 #if USE(FREETYPE)
@@ -51 +53 @@
 
 } // namespace WTF
+
+#endif // USE(CAIRO)

trunk/Source/WebCore/platform/graphics/cairo/OwnPtrCairo.h

@@ -21 +21 @@
 #define OwnPtrCairo_h
 
+#if USE(CAIRO)
+
 #include <wtf/OwnPtr.h>
 #include <wtf/PassOwnPtr.h>
@@ -42 +44 @@
 } // namespace WTF
 
-#endif
+#endif // USE(CAIRO)
+
+#endif // OwnPtrCairo_h

trunk/Source/WebCore/platform/graphics/cairo/PathCairo.cpp

@@ -26 +26 @@
 #include "config.h"
 #include "Path.h"
+
+#if USE(CAIRO)
 
 #include "AffineTransform.h"
@@ -410 +412 @@
 
 } // namespace WebCore
+
+#endif // USE(CAIRO)

trunk/Source/WebCore/platform/graphics/cairo/PatternCairo.cpp

@@ -27 +27 @@
 #include "Pattern.h"
 
+#if USE(CAIRO)
+
 #include "AffineTransform.h"
 #include "GraphicsContext.h"
@@ -51 +53 @@
 }
 
-}
+} // namespace WebCore
+
+#endif // USE(CAIRO)

trunk/Source/WebCore/platform/graphics/cairo/PlatformContextCairo.cpp

@@ -29 +29 @@
 #include "PlatformContextCairo.h"
 
+#if USE(CAIRO)
+
 #include "CairoUtilities.h"
 #include "Gradient.h"
@@ -340 +342 @@
 
 } // namespace WebCore
+
+#endif // USE(CAIRO)

trunk/Source/WebCore/platform/graphics/cairo/PlatformContextCairo.h

@@ -26 +26 @@
 #ifndef PlatformContextCairo_h
 #define PlatformContextCairo_h
+
+#if USE(CAIRO)
 
 #include "GraphicsContext.h"
@@ -85 +87 @@
 } // namespace WebCore
 
+#endif // USE(CAIRO)
+
 #endif // PlatformContextCairo_h

trunk/Source/WebCore/platform/graphics/cairo/PlatformPathCairo.cpp

@@ -21 +21 @@
 #include "PlatformPathCairo.h"
 
+#if USE(CAIRO)
+
 #include <cairo.h>
 
@@ -37 +39 @@
 }
 
-}
+} // namespace WebCore
+
+#endif // USE(CAIRO)

trunk/Source/WebCore/platform/graphics/cairo/PlatformPathCairo.h

@@ -22 +22 @@
 #define PlatformPathCairo_h
 
+#if USE(CAIRO)
+
 #include "RefPtrCairo.h"
 
@@ -41 +43 @@
 } // namespace WebCore
 
+#endif // USE(CAIRO)
+
 #endif // PlatformPathCairo_h

trunk/Source/WebCore/platform/graphics/cairo/RefPtrCairo.cpp

@@ -19 +19 @@
 #include "config.h"
 #include "RefPtrCairo.h"
+
+#if USE(CAIRO)
 
 #include <cairo.h>
@@ -116 +118 @@
 #endif
 
-}
+} // namespace WTF
+
+#endif // USE(CAIRO)

trunk/Source/WebCore/platform/graphics/cairo/RefPtrCairo.h

@@ -20 +20 @@
 #ifndef RefPtrCairo_h
 #define RefPtrCairo_h
+
+#if USE(CAIRO)
 
 #include <wtf/RefPtr.h>
@@ -59 +61 @@
 #endif
 
-}
+} // namespace WTF
+
+#endif // USE(CAIRO)
 
 #endif // RefPtrCairo_h

trunk/Source/WebCore/platform/graphics/cairo/TileCairo.h

@@ -71 +71 @@
 };
 
-}
-#endif
-#endif
+} // namespace WebCore
 
+#endif // USE(TILED_BACKING_STORE) && USE(CAIRO)
+
+#endif // TileCairo_h

trunk/Source/WebCore/platform/graphics/cairo/TransformationMatrixCairo.cpp

@@ -24 +24 @@
 
 #include "config.h"
-#include "AffineTransform.h"
 #include "TransformationMatrix.h"
 
+#if USE(CAIRO)
+
+#include "AffineTransform.h"
 #include "FloatRect.h"
 #include "IntRect.h"
-
 #include <cairo.h>
 
@@ -62 +63 @@
 }
 
-}
+} // namespace WebCore
 
-// vim: ts=4 sw=4 et
+#endif // USE(CAIRO)