Changeset 222603 in webkit

Timestamp:

Sep 27, 2017 11:16:52 PM (7 years ago)

Author:

zandobersek@gmail.com

Message:

[Cairo] Drop cairo_matrix_t conversion operators for AffineTransform, TransformationMatrix
​https://bugs.webkit.org/show_bug.cgi?id=177539

Reviewed by Carlos Garcia Campos.

Remove the cairo_matrix_t conversion operators from the AffineTransform
and TransformationMatrix classes. These are rarely used, but enforce
including the cairo.h header in both headers, which leads to the Cairo
headers being included in around 800 build targets.

Instead, the toCairoMatrix() function is added to CairoUtilities.h that
creates a cairo_matrix_t object for the given AffineTransform. No
toCairoMatrix() is needed for TransformationMatrix since objects of
that type aren't converted to cairo_matrix_t anywhere in the codebase.

This patch excludes unnecessary Cairo headers from about 550 build
targets (with those headers being included in the other affected 250
targets by some other header inclusion chain). CairoUtilities.h header
is now included where necessary to make toCairoMatrix() available, and
duplicated cairo.h inclusions are removed.

No new tests -- no change in behavior.

• editing/gtk/EditorGtk.cpp: Explicitly include <cairo.h> since it's

necessary for Cairo operations used there.

• platform/Cairo.cmake:
• platform/graphics/cairo/CairoUtilities.cpp:

(WebCore::drawPatternToCairoContext):
(WebCore::toCairoMatrix):

• platform/graphics/cairo/CairoUtilities.h:
• platform/graphics/cairo/GradientCairo.cpp:

(WebCore::Gradient::platformGradient):
(WebCore::Gradient::setPlatformGradientSpaceTransform):

• platform/graphics/cairo/GraphicsContextCairo.cpp:

(WebCore::GraphicsContext::concatCTM):
(WebCore::GraphicsContext::setCTM):

• platform/graphics/cairo/PathCairo.cpp: No need to include AffineTransform.h.

(WebCore::Path::addPath):
(WebCore::Path::transform):

• platform/graphics/cairo/PatternCairo.cpp: Ditto.

(WebCore::Pattern::createPlatformPattern const):

• platform/graphics/cairo/TransformationMatrixCairo.cpp: Removed.
• platform/graphics/transforms/AffineTransform.h:
• platform/graphics/transforms/TransformationMatrix.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• editing/gtk/EditorGtk.cpp (modified) (1 diff)
• platform/Cairo.cmake (modified) (1 diff)
• platform/graphics/cairo/CairoUtilities.cpp (modified) (2 diffs)
• platform/graphics/cairo/CairoUtilities.h (modified) (1 diff)
• platform/graphics/cairo/GradientCairo.cpp (modified) (3 diffs)
• platform/graphics/cairo/GraphicsContextCairo.cpp (modified) (2 diffs)
• platform/graphics/cairo/PathCairo.cpp (modified) (3 diffs)
• platform/graphics/cairo/PatternCairo.cpp (modified) (2 diffs)
• platform/graphics/cairo/TransformationMatrixCairo.cpp (deleted)
• platform/graphics/transforms/AffineTransform.h (modified) (2 diffs)
• platform/graphics/transforms/TransformationMatrix.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-09-27  Zan Dobersek  <zdobersek@igalia.com>
+
+        [Cairo] Drop cairo_matrix_t conversion operators for AffineTransform, TransformationMatrix
+        https://bugs.webkit.org/show_bug.cgi?id=177539
+
+        Reviewed by Carlos Garcia Campos.
+
+        Remove the cairo_matrix_t conversion operators from the AffineTransform
+        and TransformationMatrix classes. These are rarely used, but enforce
+        including the cairo.h header in both headers, which leads to the Cairo
+        headers being included in around 800 build targets.
+
+        Instead, the toCairoMatrix() function is added to CairoUtilities.h that
+        creates a cairo_matrix_t object for the given AffineTransform. No
+        toCairoMatrix() is needed for TransformationMatrix since objects of
+        that type aren't converted to cairo_matrix_t anywhere in the codebase.
+
+        This patch excludes unnecessary Cairo headers from about 550 build
+        targets (with those headers being included in the other affected 250
+        targets by some other header inclusion chain). CairoUtilities.h header
+        is now included where necessary to make toCairoMatrix() available, and
+        duplicated cairo.h inclusions are removed.
+
+        No new tests -- no change in behavior.
+
+        * editing/gtk/EditorGtk.cpp: Explicitly include <cairo.h> since it's
+        necessary for Cairo operations used there.
+        * platform/Cairo.cmake:
+        * platform/graphics/cairo/CairoUtilities.cpp:
+        (WebCore::drawPatternToCairoContext):
+        (WebCore::toCairoMatrix):
+        * platform/graphics/cairo/CairoUtilities.h:
+        * platform/graphics/cairo/GradientCairo.cpp:
+        (WebCore::Gradient::platformGradient):
+        (WebCore::Gradient::setPlatformGradientSpaceTransform):
+        * platform/graphics/cairo/GraphicsContextCairo.cpp:
+        (WebCore::GraphicsContext::concatCTM):
+        (WebCore::GraphicsContext::setCTM):
+        * platform/graphics/cairo/PathCairo.cpp: No need to include AffineTransform.h.
+        (WebCore::Path::addPath):
+        (WebCore::Path::transform):
+        * platform/graphics/cairo/PatternCairo.cpp: Ditto.
+        (WebCore::Pattern::createPlatformPattern const):
+        * platform/graphics/cairo/TransformationMatrixCairo.cpp: Removed.
+        * platform/graphics/transforms/AffineTransform.h:
+        * platform/graphics/transforms/TransformationMatrix.h:
+
 2017-09-27  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebCore/editing/gtk/EditorGtk.cpp

@@ -46 +46 @@
 #include "XLinkNames.h"
 #include "markup.h"
+#include <cairo.h>
 
 namespace WebCore {

trunk/Source/WebCore/platform/Cairo.cmake

@@ -21 +21 @@
     platform/graphics/cairo/PlatformPathCairo.cpp
     platform/graphics/cairo/RefPtrCairo.cpp
-    platform/graphics/cairo/TransformationMatrixCairo.cpp
 )
 

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

@@ -255 +255 @@
     // than sampling it at (x mod w, y mod h), so we transform the translation component of the pattern matrix in that way.
 
-    cairo_matrix_t patternMatrix = cairo_matrix_t(patternTransform);
+    cairo_matrix_t patternMatrix = toCairoMatrix(patternTransform);
     // dx and dy are added here as well to compensate the previous translation of the destination rectangle.
     double phaseOffsetX = phase.x() + tileRect.x() * patternTransform.a() + dx;
@@ -386 +386 @@
 }
 
+cairo_matrix_t toCairoMatrix(const AffineTransform& transform)
+{
+    return cairo_matrix_t { transform.a(), transform.b(), transform.c(), transform.d(), transform.e(), transform.f() };
+}
+
 } // namespace WebCore
 

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

@@ -96 +96 @@
 RefPtr<cairo_region_t> toCairoRegion(const Region&);
 
+cairo_matrix_t toCairoMatrix(const AffineTransform&);
+
 } // namespace WebCore
 

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

@@ -30 +30 @@
 #if USE(CAIRO)
 
+#include "CairoUtilities.h"
 #include "GraphicsContext.h"
 #include "PlatformContextCairo.h"
-#include <cairo.h>
 
 namespace WebCore {
@@ -85 +85 @@
     }
 
-    cairo_matrix_t matrix = m_gradientSpaceTransformation;
+    cairo_matrix_t matrix = toCairoMatrix(m_gradientSpaceTransformation);
     cairo_matrix_invert(&matrix);
     cairo_pattern_set_matrix(m_gradient, &matrix);
@@ -95 +95 @@
 {
     if (m_gradient) {
-        cairo_matrix_t matrix = gradientSpaceTransformation;
+        cairo_matrix_t matrix = toCairoMatrix(gradientSpaceTransformation);
         cairo_matrix_invert(&matrix);
         cairo_pattern_set_matrix(m_gradient, &matrix);

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

@@ -823 +823 @@
 
     cairo_t* cr = platformContext()->cr();
-    const cairo_matrix_t matrix = cairo_matrix_t(transform);
+    const cairo_matrix_t matrix = toCairoMatrix(transform);
     cairo_transform(cr, &matrix);
     m_data->concatCTM(transform);
@@ -839 +839 @@
 
     cairo_t* cr = platformContext()->cr();
-    const cairo_matrix_t matrix = cairo_matrix_t(transform);
+    const cairo_matrix_t matrix = toCairoMatrix(transform);
     cairo_set_matrix(cr, &matrix);
     m_data->setCTM(transform);

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

@@ -29 +29 @@
 #if USE(CAIRO)
 
-#include "AffineTransform.h"
+#include "CairoUtilities.h"
 #include "FloatRect.h"
 #include "GraphicsContext.h"
 #include "PlatformPathCairo.h"
 #include "StrokeStyleApplier.h"
-#include <cairo.h>
 #include <math.h>
 #include <wtf/MathExtras.h>
@@ -318 +317 @@
         return;
 
-    cairo_matrix_t matrix(transform);
+    cairo_matrix_t matrix = toCairoMatrix(transform);
     if (cairo_matrix_invert(&matrix) != CAIRO_STATUS_SUCCESS)
         return;
@@ -432 +431 @@
 }
 
-void Path::transform(const AffineTransform& trans)
-{
-    cairo_t* cr = ensurePlatformPath()->context();
-    cairo_matrix_t c_matrix = cairo_matrix_t(trans);
-    cairo_matrix_invert(&c_matrix);
-    cairo_transform(cr, &c_matrix);
+void Path::transform(const AffineTransform& transform)
+{
+    cairo_t* cr = ensurePlatformPath()->context();
+    cairo_matrix_t matrix = toCairoMatrix(transform);
+    cairo_matrix_invert(&matrix);
+    cairo_transform(cr, &matrix);
 }
 

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

@@ -29 +29 @@
 #if USE(CAIRO)
 
-#include "AffineTransform.h"
+#include "CairoUtilities.h"
 #include "GraphicsContext.h"
-#include <cairo.h>
 
 namespace WebCore {
@@ -44 +43 @@
 
     // cairo merges patter space and user space itself
-    cairo_matrix_t matrix = m_patternSpaceTransformation;
+    cairo_matrix_t matrix = toCairoMatrix(m_patternSpaceTransformation);
     cairo_matrix_invert(&matrix);
     cairo_pattern_set_matrix(pattern, &matrix);

trunk/Source/WebCore/platform/graphics/transforms/AffineTransform.h

@@ -35 +35 @@
 #if USE(CG)
 typedef struct CGAffineTransform CGAffineTransform;
-#elif USE(CAIRO)
-#include <cairo.h>
 #endif
 
@@ -182 +180 @@
 #if USE(CG)
     WEBCORE_EXPORT operator CGAffineTransform() const;
-#elif USE(CAIRO)
-    operator cairo_matrix_t() const;
 #endif
 

trunk/Source/WebCore/platform/graphics/transforms/TransformationMatrix.h

@@ -38 +38 @@
 #if USE(CG)
 typedef struct CGAffineTransform CGAffineTransform;
-#elif USE(CAIRO)
-#include <cairo.h>
 #endif
 
@@ -361 +359 @@
     WEBCORE_EXPORT TransformationMatrix(const CGAffineTransform&);
     WEBCORE_EXPORT operator CGAffineTransform() const;
-#elif USE(CAIRO)
-    operator cairo_matrix_t() const;
 #endif